疯狂的狮子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 |
xx2yy
|
01fef0b9e1
|
同步菜单新增、修改界面“功能权限”maxlength为100（保持与数据库字段长度一致），避免因超过50后不能录入问题
|
2021-05-31 10:31:50 +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
|
4bca89f072
|
fix 修复数据权限编写错误
|
2021-05-29 21:48:26 +08:00 |
|
疯狂的狮子li
|
fcfc5c85c7
|
update 还原数据权限修改
|
2021-05-29 19:51:08 +08:00 |
|
疯狂的狮子li
|
06513446a0
|
update 还原数据权限修改
|
2021-05-29 19:44:33 +08:00 |
|
疯狂的狮子li
|
2d53896f92
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
|
2021-05-29 19:17:58 +08:00 |
|
疯狂的狮子li
|
e523764b0f
|
发布 2.2.1
|
2021-05-29 19:14:45 +08:00 |
|
疯狂的狮子li
|
8e7d9e1bc7
|
Merge remote-tracking branch 'origin/master'
|
2021-05-29 19:03:51 +08:00 |
|
疯狂的狮子li
|
38d2a97582
|
update 优化参数&字典缓存操作
|
2021-05-29 19:03:31 +08:00 |
|
疯狂的狮子li
|
01d2b6ded9
|
update 优化dataScope参数防止注入
|
2021-05-29 19:03:11 +08:00 |
|
疯狂的狮子li
|
080770a493
|
update 文档增加演示图例
|
2021-05-29 19:03:04 +08:00 |
|
疯狂的狮子li
|
3aaa219d5e
|
fix 修复sql符号错误
|
2021-05-29 19:03:03 +08:00 |
|
疯狂的狮子li
|
df8a6bbaa2
|
remove 删除提交错误文件
|
2021-05-29 19:03:02 +08:00 |
|
疯狂的狮子li
|
08d82bb12f
|
配置文件错误
|
2021-05-29 19:03:01 +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
|
454a07b775
|
update 文档增加演示图例
|
2021-05-26 16:45:17 +08:00 |
|
疯狂的狮子li
|
8a6bc41938
|
update 文档增加演示图例
|
2021-05-26 16:44:59 +08:00 |
|
疯狂的狮子li
|
f793ee395d
|
fix 修复sql符号错误
|
2021-05-26 13:00:48 +08:00 |
|
疯狂的狮子li
|
d2f0ea6fa0
|
fix 修复sql符号错误
|
2021-05-26 09:23:56 +08:00 |
|
疯狂的狮子li
|
c94756f8a2
|
remove 删除提交错误文件
|
2021-05-25 14:33:00 +08:00 |
|
疯狂的狮子li
|
a42c1e4711
|
remove 删除提交错误文件
|
2021-05-25 14:32:41 +08:00 |
|
疯狂的狮子li
|
25264faf37
|
配置文件错误
|
2021-05-25 14:28:58 +08:00 |
|
疯狂的狮子li
|
380b4e5f3a
|
配置文件错误
|
2021-05-25 14:28:38 +08:00 |
|
疯狂的狮子li
|
9bd78a8c22
|
!41 发布 v2.2.0
Merge pull request !41 from 疯狂的狮子li/dev
|
2021-05-25 14:18:21 +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 |