Commit Graph

1211 Commits

Author SHA1 Message Date
疯狂的狮子li 3eee19c9a2 Merge remote-tracking branch 'origin/dev' into dev 2021-06-24 09:34:16 +08:00
疯狂的狮子li 8195e948a1 发布 v2.4.0 2021-06-24 09:34:06 +08:00
稚屿 1dfeae6a03 修复日志列表取消字段排序时的报错问题 2021-06-24 00:27:37 +00:00
疯狂的狮子li ae43edeb4f update 更新 初始化项目 文档地址 2021-06-23 21:24:13 +08:00
疯狂的狮子li 1488a09b8e Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-06-23 18:08:17 +08:00
疯狂的狮子li 152a386ac1 add 增加 Swagger3 用法示例 2021-06-23 17:01:30 +08:00
疯狂的狮子li c4712bcb52 Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-06-23 15:31:22 +08:00
疯狂的狮子li 4545beab51 update 更新文档 增加 GitHub 地址 与其他小标签 2021-06-23 15:30:26 +08:00
疯狂的狮子li f48e807cee remove 删除无用测试类 2021-06-23 09:51:44 +08:00
疯狂的狮子li c12dc71ece Merge remote-tracking branch 'origin/dev'
# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java
2021-06-23 09:44:04 +08:00
疯狂的狮子li ce3562b3ea Merge remote-tracking branch 'origin/dev' 2021-06-23 09:43:31 +08:00
疯狂的狮子li d05458aa3a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
2021-06-23 09:38:53 +08:00
RuoYi 1ed60c79c0 用户信息长度校验限制 2021-06-22 20:45:19 +08:00
RuoYi aee1e53140 全局挂载字典标签组件 2021-06-22 20:44:40 +08:00
疯狂的狮子li c822e2f6cc Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-ui/src/views/monitor/druid/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/tool/swagger/index.vue
2021-06-22 16:56:38 +08:00
疯狂的狮子li f098222a43 update 集成 Lock4j 分布式锁 2021-06-22 16:45:37 +08: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
sxq 56eba9cded Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts. 2021-06-22 15:35:52 +08:00
Ricky 253e2b2de1 增加字典标签样式回显 2021-06-22 14:24:26 +08:00
疯狂的狮子li 1790c81603 fix 修复地址ip地址特殊回环问题 2021-06-22 14:12:51 +08:00
Ricky b1413f021e 增加字典标签样式回显 2021-06-22 14:04:14 +08:00
疯狂的狮子li fef57cb312 update 更新文档说明 2021-06-22 14:01:35 +08:00
疯狂的狮子li a129fafb69 update 更新多数据源与缓存 注意事项 2021-06-22 13:57:36 +08:00
疯狂的狮子li 81897d0b04 update 更新多数据源演示案例 2021-06-22 13:43:20 +08:00
疯狂的狮子li 40bba563d6 update 优化多数据源aop顺序问题 2021-06-22 13:43:05 +08:00
疯狂的狮子li 1caf76f64b update 更新多数据源文档介绍 2021-06-22 11:52:29 +08:00
疯狂的狮子li 8338913ac5 update 更新动态数据源 默认数据源配置 与文档链接 2021-06-22 11:38:33 +08:00
疯狂的狮子li c950daf301 update 优化 多数据源集成 相关pr 2021-06-22 11:31:27 +08:00
dingzhongyuan cf16e31632 多数据源替换成dynamic-datasource 2021-06-22 11:31:04 +08:00
疯狂的狮子li f48d708e28 fix 修复 insertAll sql拼接无主键问题 2021-06-21 20:03:31 +08:00
疯狂的狮子li f585992c6f Merge remote-tracking branch 'origin/dev' into dev 2021-06-21 19:41:11 +08:00
疯狂的狮子li 9c55b83dea fix 修复 insertAll sql拼接无主键问题 2021-06-21 17:53:18 +08:00
疯狂的狮子li ff5edc44ed update 注释主子表选项 不推荐使用 2021-06-21 12:52:21 +08:00
疯狂的狮子li dcd95d013f update springboot 2.3.11 => 2.4.7
update springboot-admin 2.3.1 => 2.4.1
update feign 2.2.6 => 3.0.3
update hutool 5.7.1 => 5.7.2
2021-06-21 12:43:23 +08:00
疯狂的狮子li d507111008 update 更新 jackson 时区配置 2021-06-19 00:34:57 +08:00
疯狂的狮子li 3ff6339e29 add 增加测试批量新增演示案例 2021-06-18 15:32:55 +08:00
疯狂的狮子li 3cc028fa29 update 根据改动调整测试类 2021-06-18 15:32:23 +08:00
疯狂的狮子li 85ae3a9420 update 对相关代码改动 进行调整 2021-06-18 15:31:38 +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
RuoYi 60c22b6a43 update ry.sh. 2021-06-17 21:29:00 +08:00
RuoYi 3f05ed6ffa 封装iframe组件 2021-06-17 20:17:42 +08:00
疯狂的狮子li e87f2dda85 update 更新 redisson 文档说明 以免造成误解 2021-06-17 19:27:00 +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
疯狂的狮子li a2e4f747e0 update 优化 jdk11 依赖全部转移到选项配置 2021-06-17 13:48:00 +08:00
疯狂的狮子li 7dd18c75b0 update 更新 jackson 相关文档 2021-06-17 12:43:00 +08:00
RuoYi 090ad5323a 日志列表支持排序操作 2021-06-17 12:30:43 +08:00