162 Commits

Author SHA1 Message Date
疯狂的狮子li
91c4253f06 update satoken 1.26.0 => 1.27.0 2021-10-12 11:47:46 +08:00
疯狂的狮子li
76a2e7f8e5 Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
2021-09-28 09:46:56 +08:00
疯狂的狮子li
3f142dd0fa 发布 v3.2.0 2021-09-28 09:41:37 +08:00
疯狂的狮子li
6f6a3566ac Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
#	pom.xml
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
2021-09-26 17:15:40 +08:00
疯狂的狮子li
77bce8b1e8 update springboot 2.5.4 => 2.5.5 bugfix版本
update mybatis-plus 3.4.3.3 => 3.4.3.4 bugfix版本
update redisson 3.16.2 => 3.16.3 bugfix版本
2021-09-24 09:59:28 +08:00
疯狂的狮子li
553c29ab8a update 整合 satoken 权限、鉴权一体化框架 2021-09-23 19:13:58 +08:00
疯狂的狮子li
f85bad3388 update 调整依赖结构 解决依赖冲突 2021-09-22 11:10:10 +08:00
疯狂的狮子li
41c75a808a update easyexcel 2.2.10 => 2.2.11
update hutool 5.7.11 => 5.7.13
2021-09-18 15:48:43 +08:00
疯狂的狮子li
9bc5414b44 update 更新 Actuator prod 默认暴漏端点 增加暴漏 logfile 日志端点 2021-09-14 12:17:16 +08:00
疯狂的狮子li
6e28683411 update 默认适配jdk11 2021-09-14 12:07:42 +08:00
疯狂的狮子li
2af534eea4 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/core/domain/entity/SysMenu.java
	ruoyi-framework/pom.xml
	ruoyi-generator/pom.xml
	ruoyi-quartz/pom.xml
	ruoyi-system/pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/components/ThemePicker/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Link.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	sql/ry_20210908.sql
2021-09-13 13:03:58 +08:00
RuoYi
db193a46e8 若依 3.7.0 2021-09-13 09:36:38 +08:00
疯狂的狮子li
ddf8d6ad6b 发布 v3.1.0 2021-09-07 13:48:22 +08:00
疯狂的狮子li
38f03855eb update redisson 3.16.1 => 3.16.2 2021-09-07 09:53:14 +08:00
疯狂的狮子li
e7f83fb695 update mybatis-plus 3.4.3 => 3.4.3.3 适配升级 (包含不兼容升级) 请详细阅读 mybatis-plus 官方升级文档 2021-09-06 10:19:58 +08:00
疯狂的狮子li
b461c8cc99 update spring-boot-admin 2.5.0 => 2.5.1
update aliyun.oss 3.13.0 => 3.13.1
update qcloud.cos 5.6.47 => 5.6.51
update hutool 5.7.9 => 5.7.11
update maven-jar-plugin 3.1.1 => 3.2.0
2021-09-01 15:38:08 +08:00
疯狂的狮子li
33c16e562b update springboot 2.5.3 => 2.5.4
update hutool 5.7.7 => 5.7.9
update feign-okhttp 11.2 => 11.6
2021-08-20 14:47:49 +08:00
疯狂的狮子Li
b19111b9bf Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev 2021-08-18 03:11:04 +00:00
疯狂的狮子li
a937e3f268 发布 v3.0.0 2021-08-18 11:09:14 +08:00
疯狂的狮子li
881edb3e62 update springboot admin 2.4.3 => 2.5.0 (新增 Quartz 专属监控页) 2021-08-14 14:53:25 +08:00
疯狂的狮子li
0883b9eff1 update hutool 5.7.6 => 5.7.7 2021-08-11 14:42:58 +08:00
疯狂的狮子li
2c2dad24d5 update 更新 阿里云 maven源 新地址 2021-08-11 14:28:05 +08:00
疯狂的狮子li
cec4e083ef update 更改多数据源框架更清晰的依赖名 2021-08-11 14:27:40 +08:00
疯狂的狮子li
8c912a8133 add 集成 性能分析插件 p6spy 更强劲的 SQL 分析 2021-08-05 13:30:36 +08:00
疯狂的狮子li
ffd3dc335f update 将 Actuator 配置 移动到全局配置 2021-08-05 13:30:04 +08:00
疯狂的狮子li
70b77d9801 add 增加 easyexcel 依赖 2021-08-03 19:27:48 +08:00
疯狂的狮子li
1cb79223ff update feign-okhttp 11.0 => 11.2
update okhttp 3.19.4 => 4.9.1
update minio 8.2.0 => 8.3.0
2021-08-01 11:03:56 +08:00
RuoYi
68ae4df2dc 升级commons.io到最新版本v2.11.0 2021-07-31 17:52:06 +08:00
疯狂的狮子li
a6bde3c5da update 降级 minio 依赖版本 2021-07-30 14:17:15 +08:00
疯狂的狮子li
39783f2b19 update 降级 minio 依赖版本 2021-07-30 14:14:21 +08:00
疯狂的狮子li
973471c63b 发布 v2.6.0 2021-07-28 10:45:01 +08:00
疯狂的狮子li
79766fa8c2 update springboot 2.4.9 => 2.5.3
update hutool 5.7.5 => 5.7.6
update redisson 3.16.0 => 3.16.1
update datasource 3.4.0 => 3.4.1
2021-07-28 10:18:05 +08:00
RuoYi
3803ac78e2 升级oshi到最新版本v5.8.0 2021-07-27 11:53:59 +08:00
疯狂的狮子li
2d17123b74 update springboot 2.4.8 => 2.4.9
update hutool 5.7.4 => 5.7.5
update minio 8.2.2 => 8.3.0
update docker plugin 1.2.0 => 1.2.2
2021-07-23 10:50:03 +08:00
疯狂的狮子li
eea8f33cf9 发布 v2.5.2 bug修复版
(cherry picked from commit b12bdd1f15c562c7f99ce1588d9f950aaee79bbe)
2021-07-19 19:44:18 +08:00
疯狂的狮子li
7e90d84598 add 增加 OSS 对象存储模块 相关代码(未完成) 2021-07-17 20:44:27 +08:00
RuoYi
60abdf1dbc 升级oshi到最新版本v5.7.5 2021-07-14 09:53:26 +08:00
疯狂的狮子li
55546dfc80 发布 v2.5.1 针对 v2.5.0 版本新特性bug修复 2021-07-13 13:49:47 +08:00
疯狂的狮子li
e085ec9418 发布 v2.5.0 2021-07-12 09:53:46 +08:00
疯狂的狮子li
aac20ca789 update hutool 5.7.4 2021-07-12 09:46:05 +08:00
RuoYi
170cfb356c 若依 3.6.0 2021-07-12 08:42:11 +08:00
疯狂的狮子li
43486f2f41 update 配置 monitor-admin docker编排 2021-07-09 17:15:09 +08:00
疯狂的狮子li
1c11d7ccc1 update 转移 springboot-admin 到扩展模块项目 2021-07-09 15:30:40 +08:00
疯狂的狮子li
282f3b0632 add 增加 docker 配置 2021-07-06 14:06:25 +08:00
疯狂的狮子li
99051916eb update 升级 springboot 2.4.8 2021-07-04 13:24:19 +08:00
疯狂的狮子li
b9128b6074 update 依赖升级 2021-07-03 23:52:39 +08:00
疯狂的狮子li
5647cf7a7e update 规范maven写法 2021-07-01 10:42:24 +08:00
RuoYi
04f5a93aa8 升级pagehelper到最新版1.3.1 2021-06-25 17:25:49 +08:00
疯狂的狮子li
8195e948a1 发布 v2.4.0 2021-06-24 09:34:06 +08:00
sxq
645c926bbd 集成lock4j框架,删除redisson锁,使用lock4j的锁。 2021-06-22 16:06:02 +08:00