疯狂的狮子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
|
5 years ago |
|
疯狂的狮子li
|
54688ce7c7
|
update 优化批量插入执行器 增加主键类型枚举对应生成策略
|
5 years ago |
RuoYi
|
90c41d498c
|
角色管理新增分配用户功能
|
5 years ago |
|
疯狂的狮子li
|
de194880ae
|
update 关闭默认二级缓存 推荐使用 spring-cache 注解手动缓存
|
5 years ago |
sxq
|
945b6c1e59
|
redis获取map属性bug修复。
|
5 years ago |
|
疯狂的狮子li
|
5647cf7a7e
|
update 规范maven写法
|
5 years ago |
|
疯狂的狮子li
|
d92560b64b
|
fix 修复 hutool StrUtil.containsAny 传入参数后返回结果不一致问题
|
5 years ago |
陆继保
|
200170e5f3
|
update ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java.
|
5 years ago |
|
RuoYi
|
04f5a93aa8
|
升级pagehelper到最新版1.3.1
|
5 years ago |
稚屿
|
1dfeae6a03
|
修复日志列表取消字段排序时的报错问题
|
5 years ago |
|
sxq
|
715abe1140
|
删除redislockmanager
|
5 years ago |
|
sxq
|
645c926bbd
|
集成lock4j框架，删除redisson锁，使用lock4j的锁。
|
5 years ago |
|
疯狂的狮子li
|
1790c81603
|
fix 修复地址ip地址特殊回环问题
|
5 years ago |
|
疯狂的狮子li
|
40bba563d6
|
update 优化多数据源aop顺序问题
|
5 years ago |
|
疯狂的狮子li
|
c950daf301
|
update 优化 多数据源集成 相关pr
|
5 years ago |
|
疯狂的狮子li
|
f48d708e28
|
fix 修复 insertAll sql拼接无主键问题
|
5 years ago |
|
疯狂的狮子li
|
9c55b83dea
|
fix 修复 insertAll sql拼接无主键问题
|
5 years ago |
|
疯狂的狮子li
|
46b67fef7a
|
add 增加 ServicePlusImpl 自动以实现类 重写移除事务注解方法 防止多数据源失效
|
5 years ago |
|
疯狂的狮子li
|
c98ab8fb51
|
add 增加 自定义 批量insert方法
|
5 years ago |
|
疯狂的狮子li
|
281b6b6d2b
|
update 调整 core mp 包结构
|
5 years ago |
|
疯狂的狮子li
|
44bbe8b307
|
update 同步更新 ruoyi 适配新功能
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
090ad5323a
|
日志列表支持排序操作
|
5 years ago |
|
疯狂的狮子li
|
0140965a30
|
update 优化 jdk11 相关 pr
|
5 years ago |
|
疯狂的狮子li
|
d10099d9e9
|
update 适配 jdk11
|
5 years ago |
朱杰
|
ac3f9e5f33
|
【update】JDK11支持
|
5 years ago |
|
疯狂的狮子li
|
7bdce848e7
|
update 升级 hutool 5.7.1 适配工具类
|
5 years ago |
|
疯狂的狮子li
|
2cdc12055d
|
fix 修复 JsonUtils 参数为空报错
|
5 years ago |
|
RuoYi
|
462862ba65
|
升级commons.io到最新版本v2.10.0
|
5 years ago |
|
RuoYi
|
7ab14ff293
|
定时任务屏蔽rmi远程调用
|
5 years ago |
|
疯狂的狮子li
|
d98faaffee
|
update 移除 fastjson 增加 jackson 工具类 重写相关业务
|
5 years ago |
|
疯狂的狮子li
|
5311937b69
|
update 增加 jackson 配置 默认序列化时间格式
|
5 years ago |
|
疯狂的狮子li
|
b3541e9758
|
update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题
|
5 years ago |
|
疯狂的狮子li
|
24da85fea3
|
update MybatisPlus整合Redis二级缓存
|
5 years ago |
|
疯狂的狮子li
|
48d9fc10ea
|
update 增加分页对象注释
|
5 years ago |
|
疯狂的狮子li
|
f6ccfe6ed3
|
update 独立 CountDownLatch 方法
|
5 years ago |
|
疯狂的狮子li
|
1bf9dd1217
|
update 优化redis锁工具代码结构
|
5 years ago |
|
疯狂的狮子li
|
524683eabd
|
update swagger 升级为 3.0.0 使用 OAS_30 协议
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
sxq
|
f45b50a796
|
update redis锁工具类编写
|
5 years ago |
|
RuoYi
|
fd33fe869d
|
修复导出角色数据范围翻译缺少仅本人
|
5 years ago |
|
疯狂的狮子li
|
00d024ff86
|
fix 修复相对路径上传异常问题
|
5 years ago |
|
疯狂的狮子li
|
f087b37cb3
|
update 优化 锁切面代码 key到常量类
|
5 years ago |
|
疯狂的狮子li
|
dcf125a08a
|
update 优化 redis锁pr 代码
|
5 years ago |
|
sxq
|
ad6386a618
|
redis分布式锁（基于注解形势）。
|
5 years ago |
|
疯狂的狮子li
|
6fc141497a
|
update 优化分页默认值 默认查全部
|
5 years ago |
|
sxq
|
0fe064b8a2
|
修复reddison不能批量删除的bug。
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
b7f3c68eca
|
优化图片工具类读取文件
|
5 years ago |
|
疯狂的狮子li
|
99c4692a0d
|
update 升级 luttuce 为 redisson 性能更强 工具更全
|
5 years ago |
