wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
938 Commits 2 Branches 0 Tags 6 MiB
Commit Graph

938 Commits

Author SHA1 Message Date
疯狂的狮子li d7359122b4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
	ry.sh
 2021-05-31 13:21:29 +08:00
RuoYi c105a63c8b 添加bat脚本执行应用 2021-05-31 12:16:27 +08:00
疯狂的狮子li 7b7f098dee update 文档更新数据权限使用 2021-05-30 02:25:56 +08:00
疯狂的狮子li a02aeb468e add 增加demo模块 树表演示案例(包含数据权限) 2021-05-30 02:25:14 +08:00
疯狂的狮子li a3a682eeb1 add 增加demo模块 单表演示案例(包含数据权限) 2021-05-30 02:24:10 +08:00
疯狂的狮子li 456f31901c add 增加测试数据sql文件 2021-05-30 02:22:19 +08:00
疯狂的狮子li 6d5a0d8a7e update 完美修复 数据权限功能(支持单表多表过滤) 2021-05-30 02:20:21 +08:00
疯狂的狮子li 6192d42564 update 优化代码生成模板 2021-05-30 02:18:34 +08:00
疯狂的狮子li 8cc2aee13e fix 修复单表数据权限问题 2021-05-29 21:54:20 +08:00
疯狂的狮子li 0860934888 update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 21:52:15 +08:00
疯狂的狮子Li d2b077af35 fix 修复数据权限编写错误 2021-05-29 21:48:56 +08:00
疯狂的狮子li 06513446a0 update 还原数据权限修改 2021-05-29 19:44:33 +08:00
疯狂的狮子li 57e071fe6b 发布 2.2.1 2021-05-29 18:57:56 +08:00
疯狂的狮子li 8d761fa60c update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 18:54:35 +08:00
疯狂的狮子li b7bd67b4cb update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 18:41:32 +08:00
疯狂的狮子li ead1136e31 add 增加 security 权限框架 @Async 异步注解配置 2021-05-28 14:24:45 +08:00
疯狂的狮子li 3d54400163 update 增加修改包名文档 2021-05-28 11:08:51 +08:00
疯狂的狮子li 7779cbca4d update 优化参数&字典缓存操作 2021-05-28 10:30:11 +08:00
疯狂的狮子li 8d6c9e116d Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
 2021-05-28 10:07:48 +08:00
疯狂的狮子li d0b2166525 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-ui/src/api/system/config.js
	ruoyi-ui/src/api/system/dict/type.js
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dict/index.vue
 2021-05-28 10:07:15 +08:00
疯狂的狮子li b4f9d3a8f2 update 优化dataScope参数防止注入 2021-05-27 22:06:36 +08:00
RuoYi af9cfb40a4 优化参数&字典缓存操作 2021-05-27 17:38:44 +08:00
RuoYi 6fa3bfe051 修复两处存在SQL注入漏洞问题 2021-05-27 17:38:27 +08:00
疯狂的狮子li 8a6bc41938 update 文档增加演示图例 2021-05-26 16:44:59 +08:00
疯狂的狮子li d2f0ea6fa0 fix 修复sql符号错误 2021-05-26 09:23:56 +08:00
疯狂的狮子li a42c1e4711 remove 删除提交错误文件 2021-05-25 14:32:41 +08:00
疯狂的狮子li 380b4e5f3a 配置文件错误 2021-05-25 14:28:38 +08:00
疯狂的狮子li a570589dcc 发布 v2.2.0 2021-05-25 14:11:32 +08:00
疯狂的狮子li 2885ced2c7 add 增加验证码开关 2021-05-25 14:02:50 +08:00
朱杰 5dc873209e add 增加验证码开关 2021-05-25 14:02:34 +08:00
疯狂的狮子li 3131b7ea9d fix redis反序列化异常问题 2021-05-25 13:40:18 +08:00
疯狂的狮子li ca903ebd1f update 更新捐献二维码 2021-05-25 10:32:19 +08:00
疯狂的狮子li a2ca46004b update 更新捐献码 2021-05-25 10:17:43 +08:00
疯狂的狮子li 5795958a18 update 同步升级 ruoyi-vue 3.5.0 2021-05-25 10:14:18 +08:00
疯狂的狮子li 6c195af2a3 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-generator/pom.xml
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-quartz/pom.xml
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
	ruoyi-system/pom.xml
	ruoyi-ui/package.json
	ruoyi-ui/public/index.html
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-05-25 10:00:36 +08:00
RuoYi 5e64a93d11 若依 3.5.0 2021-05-25 09:37:55 +08:00
疯狂的狮子li caa81d1f4d Merge remote-tracking branch 'origin/dev' into dev 2021-05-24 16:12:46 +08:00
疯狂的狮子li 5f584e683a update redis序列化修改为使用jackson 2021-05-24 16:12:40 +08:00
RuoYi 4aabf5d8be Redis设置HashKey序列化 2021-05-24 15:10:55 +08:00
RuoYi cf6254a8d5 用户登录后记录最后登录IP&时间 2021-05-24 14:21:29 +08:00
RuoYi 883cff5de9 新增IE浏览器版本过低提示页面 2021-05-24 14:15:41 +08:00
RuoYi 7e79c4f249 生成vue模板导出按钮点击后添加遮罩 2021-05-24 11:34:03 +08:00
若依 504638eb41 !234 【轻量级 PR】：删去两处冗余代码 
Merge pull request !234 from xivLi/master
 2021-05-24 11:30:21 +08:00
RuoYi 2adac4a899 升级fastjson到最新版1.2.76 2021-05-24 11:25:17 +08:00
RuoYi 56a943bf48 升级druid到最新版本v1.2.6 2021-05-24 11:24:54 +08:00
RuoYi 77ebca264a 修复请求形参未传值记录日志异常问题 2021-05-23 19:22:30 +08:00
RuoYi 7b94ae3a9a xss校验json条件优化 2021-05-23 19:20:36 +08:00
若依 bd1edc6dcc !233 修正方法名单词拼写错误 
Merge pull request !233 from lyqwer/N/A
 2021-05-23 17:15:18 +08:00
若依 09d166e97d !231 修正注释 
Merge pull request !231 from 刘立伟/N/A
 2021-05-23 17:14:52 +08:00
疯狂的狮子li a272ea07a9 !38 修改bo代码生成器，修改无法更新代码生成器是否必填为否问题 
Merge pull request !38 from Yjoioooo/master
 2021-05-22 23:40:26 +08:00