疯狂的狮子li
|
8231953e29
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-generator/pom.xml
ruoyi-quartz/pom.xml
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/layout/components/AppMain.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/index.vue
|
2021-07-12 09:37:23 +08:00 |
RuoYi
|
5879c2484a
|
菜单路由配置支持内链访问
|
2021-07-11 16:31:10 +08:00 |
疯狂的狮子li
|
aa14085746
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/api/system/role.js
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-07-06 12:01:05 +08:00 |
疯狂的狮子li
|
54688ce7c7
|
update 优化批量插入执行器 增加主键类型枚举对应生成策略
|
2021-07-05 18:17:49 +08:00 |
RuoYi
|
90c41d498c
|
角色管理新增分配用户功能
|
2021-07-05 14:54:09 +08:00 |
疯狂的狮子li
|
de194880ae
|
update 关闭默认二级缓存 推荐使用 spring-cache 注解手动缓存
|
2021-07-04 02:21:04 +08:00 |
sxq
|
945b6c1e59
|
redis获取map属性bug修复。
|
2021-07-01 14:03:29 +08:00 |
疯狂的狮子li
|
d92560b64b
|
fix 修复 hutool StrUtil.containsAny 传入参数后返回结果不一致问题
|
2021-06-29 15:22:45 +08:00 |
陆继保
|
200170e5f3
|
update ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java.
|
2021-06-29 07:04:25 +00:00 |
RuoYi
|
04f5a93aa8
|
升级pagehelper到最新版1.3.1
|
2021-06-25 17:25:49 +08:00 |
稚屿
|
1dfeae6a03
|
修复日志列表取消字段排序时的报错问题
|
2021-06-24 00:27:37 +00:00 |
sxq
|
715abe1140
|
删除redislockmanager
|
2021-06-22 16:31:41 +08:00 |
sxq
|
645c926bbd
|
集成lock4j框架,删除redisson锁,使用lock4j的锁。
|
2021-06-22 16:06:02 +08:00 |
疯狂的狮子li
|
1790c81603
|
fix 修复地址ip地址特殊回环问题
|
2021-06-22 14:12:51 +08:00 |
疯狂的狮子li
|
40bba563d6
|
update 优化多数据源aop顺序问题
|
2021-06-22 13:43:05 +08:00 |
疯狂的狮子li
|
f48d708e28
|
fix 修复 insertAll sql拼接无主键问题
|
2021-06-21 20:03:31 +08:00 |
疯狂的狮子li
|
9c55b83dea
|
fix 修复 insertAll sql拼接无主键问题
|
2021-06-21 17:53:18 +08:00 |
疯狂的狮子li
|
46b67fef7a
|
add 增加 ServicePlusImpl 自动以实现类 重写移除事务注解方法 防止多数据源失效
|
2021-06-18 15:28:43 +08:00 |
疯狂的狮子li
|
c98ab8fb51
|
add 增加 自定义 批量insert方法
|
2021-06-18 15:27:47 +08:00 |
疯狂的狮子li
|
281b6b6d2b
|
update 调整 core mp 包结构
|
2021-06-18 15:25:37 +08:00 |
疯狂的狮子li
|
44bbe8b307
|
update 同步更新 ruoyi 适配新功能
|
2021-06-17 19:22:49 +08:00 |
疯狂的狮子li
|
a8c1d02ee1
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/.env.development
ruoyi-ui/.env.production
ruoyi-ui/.env.staging
ruoyi-ui/package.json
ruoyi-ui/src/App.vue
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/Pagination/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/permission.js
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/vue.config.js
|
2021-06-17 18:15:34 +08:00 |
RuoYi
|
090ad5323a
|
日志列表支持排序操作
|
2021-06-17 12:30:43 +08:00 |
疯狂的狮子li
|
7bdce848e7
|
update 升级 hutool 5.7.1 适配工具类
|
2021-06-16 15:36:45 +08:00 |
疯狂的狮子li
|
2cdc12055d
|
fix 修复 JsonUtils 参数为空报错
|
2021-06-16 13:15:18 +08:00 |
RuoYi
|
462862ba65
|
升级commons.io到最新版本v2.10.0
|
2021-06-16 09:52:38 +08:00 |
RuoYi
|
7ab14ff293
|
定时任务屏蔽rmi远程调用
|
2021-06-15 10:26:02 +08:00 |
疯狂的狮子li
|
d98faaffee
|
update 移除 fastjson 增加 jackson 工具类 重写相关业务
|
2021-06-13 15:39:35 +08:00 |
疯狂的狮子li
|
5311937b69
|
update 增加 jackson 配置 默认序列化时间格式
|
2021-06-12 23:41:56 +08:00 |
疯狂的狮子li
|
b3541e9758
|
update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题
|
2021-06-12 20:13:35 +08:00 |
疯狂的狮子li
|
24da85fea3
|
update MybatisPlus整合Redis二级缓存
|
2021-06-10 21:18:58 +08:00 |
疯狂的狮子li
|
48d9fc10ea
|
update 增加分页对象注释
|
2021-06-10 16:21:44 +08:00 |
疯狂的狮子li
|
f6ccfe6ed3
|
update 独立 CountDownLatch 方法
|
2021-06-10 14:04:41 +08:00 |
疯狂的狮子li
|
1bf9dd1217
|
update 优化redis锁工具代码结构
|
2021-06-10 13:32:50 +08:00 |
疯狂的狮子li
|
2103731f10
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/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
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/src/views/tool/swagger/index.vue
|
2021-06-10 09:44:56 +08:00 |
sxq
|
f45b50a796
|
update redis锁工具类编写
|
2021-06-09 23:30:46 +08:00 |
RuoYi
|
fd33fe869d
|
修复导出角色数据范围翻译缺少仅本人
|
2021-06-08 16:27:24 +08:00 |
疯狂的狮子li
|
00d024ff86
|
fix 修复相对路径上传异常问题
|
2021-06-04 18:11:46 +08:00 |
疯狂的狮子li
|
f087b37cb3
|
update 优化 锁切面代码 key到常量类
|
2021-06-04 16:46:28 +08:00 |
疯狂的狮子li
|
dcf125a08a
|
update 优化 redis锁pr 代码
|
2021-06-04 16:09:43 +08:00 |
sxq
|
ad6386a618
|
redis分布式锁(基于注解形势)。
|
2021-06-04 15:00:56 +08:00 |
疯狂的狮子li
|
6fc141497a
|
update 优化分页默认值 默认查全部
|
2021-06-04 10:48:35 +08:00 |
sxq
|
0fe064b8a2
|
修复reddison不能批量删除的bug。
|
2021-06-02 15:14:04 +08:00 |
疯狂的狮子li
|
a961fff69d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
|
2021-06-02 12:42:18 +08:00 |
RuoYi
|
b7f3c68eca
|
优化图片工具类读取文件
|
2021-06-02 11:45:40 +08:00 |
疯狂的狮子li
|
99c4692a0d
|
update 升级 luttuce 为 redisson 性能更强 工具更全
|
2021-05-31 23:21:14 +08:00 |
疯狂的狮子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
|
6d5a0d8a7e
|
update 完美修复 数据权限功能(支持单表多表过滤)
|
2021-05-30 02:20:21 +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 |