GTsoft/RuoYi-Vue-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,987 Commits 2 Branches 25 Tags 125 MiB
9d6b0b35a3
Commit Graph

341 Commits

Author SHA1 Message Date
RuoYi
f05aa674ab 升级oshi到最新版本6.1.2 2022-02-20 16:04:25 +08:00
疯狂的狮子li
7f305962f2 发布 4.0.0 2022-02-18 10:31:13 +08:00
疯狂的狮子li
04c36018d6 update sa-token 1.28.0 => 1.29.0 2022-02-10 11:14:10 +08:00
疯狂的狮子li
e6bcced213 update mybatis-plus 3.5.0 => 3.5.1 2022-01-26 10:44:37 +08:00
疯狂的狮子li
0c8f727bd8 update maven-jar-plugin 3.2.0 => 3.2.2 
update maven-war-plugin 3.2.0 => 3.2.2
update maven-compiler-plugin 3.1 => 3.9.0
update hutool 5.7.18 => 5.7.20
update springboot-admin 2.6.0 => 2.6.2
update redisson 3.16.7 => 3.16.8
update qiniu 7.9.0 => 7.9.2
update aliyun 3.13.1 => 3.14.0
update qcloud 5.6.58 => 5.6.68
update minio 8.3.4 => 8.3.5
 2022-01-24 13:03:42 +08:00
RuoYi
1fe08f49c7 升级spring-boot到最新版本2.5.9 2022-01-23 10:56:41 +08:00
疯狂的狮子li
b5b1b94a9d update springboot 2.6.2 => 2.6.3 2022-01-21 14:55:44 +08:00
疯狂的狮子li
a43e6e06e0 update 优化多用户体系处理 更名 LoginUtils 为 LoginHelper 支持 LoginUser 多级缓存 2022-01-17 12:03:15 +08:00
疯狂的狮子Li
dc0af0a419 fix 修复 banner 显示版本号不正确 2022-01-16 18:03:05 +08:00
疯狂的狮子li
6ca8535166 Merge remote-tracking branch 'origin/satoken' into dev 
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.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
#	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
 2022-01-13 11:14:33 +08:00
疯狂的狮子li
ff4a429136 update 升级 springboot 2.6.X 解决 springfox 兼容性问题 2022-01-13 11:07:09 +08:00
疯狂的狮子li
a0bed51d96 update 格式化代码 统一间隔符 
update 格式化代码 统一间隔符
 2022-01-13 09:58:16 +08:00
疯狂的狮子Li
29cc9da934 update hutool 引入改为 bom 依赖项引入 2022-01-08 19:15:16 +08:00
疯狂的狮子Li
eaeb324c74 update 指定 maven 资源过滤为具体文件 防止错误过滤 2022-01-08 18:41:42 +08:00
疯狂的狮子Li
09b03465d8 update mybatis-plus 3.4.3.4 => 3.5.0 2022-01-02 13:14:16 +08:00
RuoYi
6353f4ff09 若依 3.8.1 2021-12-31 00:00:06 +08:00
RuoYi
bb1af390a7 升级log4j2到2.17.1，防止漏洞风险 2021-12-30 14:41:25 +08:00
疯狂的狮子li
948ad86049 Merge remote-tracking branch 'origin/dev' into satoken 2021-12-28 10:37:43 +08:00
疯狂的狮子li
ed659da488 发布 v3.5.0-release 正式版 2021-12-28 10:35:52 +08:00
RuoYi
0e771a6c1b 升级spring-boot到最新版本2.5.8 2021-12-27 12:38:59 +08:00
疯狂的狮子li
a8227453fc update hutool 5.7.17 => 5.7.18 bugfix 
update redisson 3.16.6 => 3.16.7 bugfix
 2021-12-27 11:43:59 +08:00
疯狂的狮子li
dd37247e65 Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
#	ruoyi-common/pom.xml
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
#	ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.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/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
 2021-12-27 09:50:42 +08:00
RuoYi
7b23b6db6f 升级oshi到最新版本v5.8.6 2021-12-24 12:00:29 +08:00
疯狂的狮子li
619a80228f update springboot 2.5.7 => 2.5.8 升级预防 log4j2 问题 
update springboot-admin 2.5.4 => 2.5.5
update hutool 5.7.16 => 5.7.17
 2021-12-22 10:22:00 +08:00
RuoYi
be412faf6c 升级fastjson到最新版1.2.79 2021-12-21 13:32:40 +08:00
RuoYi
ca2405c104 升级log4j2到安全版本，防止漏洞风险 2021-12-19 19:56:53 +08:00
疯狂的狮子Li
ffde310d30 update qiniu 7.8.0 => 7.9.0 
update minio 8.3.3 => 8.3.4
 2021-12-16 00:13:04 +08:00
疯狂的狮子li
877a9d510b update tlog 1.3.5 => 1.3.6 修复 jdk17 不兼容问题 2021-12-15 15:33:31 +08:00
疯狂的狮子li
5e38e054a7 update hutool 工具 改为单包引入 减少无用依赖 2021-12-15 10:44:50 +08:00
RuoYi
e1c7115d8c 升级log4j2到安全版本，防止漏洞风险 2021-12-14 12:09:57 +08:00
RuoYi
bb4d75aff0 升级log4j2到安全版本，防止漏洞风险 2021-12-14 10:33:25 +08:00
疯狂的狮子li
be13e3494a update redisson 3.16.4 => 3.16.6 
update dynamic-ds 3.4.1 => 3.5.0
 2021-12-09 11:49:00 +08:00
疯狂的狮子li
8f8e796c77 update tlog 1.3.4 => 1.3.5 启用 tlog 自动配置 2021-12-06 14:36:38 +08:00
疯狂的狮子li
90ba39593a update 声明 cglib 依赖 控制版本 2021-12-06 12:12:20 +08:00
RuoYi
6bfae2652f 若依 3.8.0 2021-12-01 08:53:11 +08:00
疯狂的狮子li
9036370d67 remove 删除 jjwt 无用依赖 2021-11-30 17:34:31 +08:00
疯狂的狮子li
4f0e73ba97 update 使用 hutool-jwt 替换老旧 jjwt 依赖 2021-11-30 10:33:35 +08:00
疯狂的狮子li
bf98ee3c93 Merge remote-tracking branch 'origin/dev' into satoken 2021-11-29 14:03:25 +08:00
疯狂的狮子li
52673152cc 发布 v3.4.0 2021-11-29 13:58:42 +08:00
疯狂的狮子li
42295ef2ac Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.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-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	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/model/LoginUser.java
#	ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
#	ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
 2021-11-29 13:56:25 +08:00
dawn9117
a9e21702aa 接口重复鉴权BUG修复: ResourceConfig中已经配置鉴权拦截器, 添加sa-token-spring-aop会导致重复鉴权BUG 2021-11-26 05:55:32 +00:00
疯狂的狮子li
e2d370bd9d update 移除 satoken 自带集成 redis 改为使用 框架自身 Redission 实现 统一方案 性能优异 2021-11-26 13:42:20 +08:00
疯狂的狮子li
af25588b88 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
#	ruoyi-generator/pom.xml
#	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
#	ruoyi-generator/src/main/resources/vm/js/api.js.vm
#	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
#	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
#	ruoyi-ui/package.json
#	ruoyi-ui/src/api/monitor/server.js
#	ruoyi-ui/src/components/RuoYi/Doc/index.vue
#	ruoyi-ui/src/components/RuoYi/Git/index.vue
#	ruoyi-ui/src/components/SizeSelect/index.vue
#	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
#	ruoyi-ui/src/layout/components/TagsView/index.vue
#	ruoyi-ui/src/layout/index.vue
#	ruoyi-ui/src/main.js
#	ruoyi-ui/src/plugins/download.js
#	ruoyi-ui/src/router/index.js
#	ruoyi-ui/src/store/modules/permission.js
#	ruoyi-ui/src/store/modules/settings.js
#	ruoyi-ui/src/store/modules/tagsView.js
#	ruoyi-ui/src/store/modules/user.js
#	ruoyi-ui/src/views/login.vue
#	ruoyi-ui/src/views/monitor/job/log.vue
#	ruoyi-ui/src/views/system/dict/data.vue
#	ruoyi-ui/src/views/system/role/index.vue
#	ruoyi-ui/src/views/system/user/authRole.vue
#	ruoyi-ui/src/views/system/user/index.vue
#	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
#	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
#	ruoyi-ui/src/views/system/user/profile/userInfo.vue
 2021-11-25 19:39:53 +08:00
疯狂的狮子li
7546ef649c update springboot 2.5.6 => 2.5.7 2021-11-25 19:14:52 +08:00
RuoYi
16734b1d88 升级velocity到最新版本2.3 2021-11-24 15:03:04 +08:00
疯狂的狮子li
40c9559d9e update springboot-admin 2.5.3 => 2.5.4 2021-11-17 20:11:56 +08:00
疯狂的狮子li
53cb0826bc update 升级 swagger 配置 使用 knife4j 增强模式 2021-11-12 13:15:32 +08:00
疯狂的狮子li
7079a4e7e4 update satoken 1.27.0 => 1.28.0 使用 jwt 插件代理 token 生成逻辑 2021-11-10 13:31:54 +08:00
疯狂的狮子li
3b574875cb update hutool 5.7.15 => 5.7.16 
update okhttp 4.9.1 => 4.9.2
update spring-boot-admin 2.5.2 => 2.5.3
update redisson 3.16.3 => 3.16.4
update tlog 1.3.3 => 1.3.4
 2021-11-10 10:07:28 +08:00
疯狂的狮子li
8a93371baa remove 移除 feign 相关代码与依赖 2021-11-03 15:02:29 +08:00
疯狂的狮子li
95dcae1a85 remove 移除 quartz 相关代码与依赖 2021-11-03 14:46:12 +08:00
疯狂的狮子li
24ebc73ee5 Merge remote-tracking branch 'origin/dev' into satoken 2021-10-29 09:15:31 +08:00
疯狂的狮子li
d6e080d546 发布 v3.3.0 2021-10-29 09:14:49 +08:00
疯狂的狮子li
f5f16aac96 Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	ruoyi-common/pom.xml
 2021-10-28 10:56:21 +08:00
疯狂的狮子li
e8e8ae9fd7 update minio 8.3.1 => 8.3.3 2021-10-28 10:43:02 +08:00
疯狂的狮子li
160beb8e1c update jdk11 适配依赖 调整到 common 包 2021-10-28 09:44:57 +08:00
RuoYi
2eb55528ec 升级spring-boot到最新版本2.5.6 2021-10-27 16:23:35 +08:00
疯狂的狮子li
695cb6d76b Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.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-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	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/constant/GenConstants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
 2021-10-27 13:16:19 +08:00
sxq
16d6e11e94 1:升级springboot版本到2.5.6。 
2:升级hutool版本到5.7.15。
 2021-10-26 15:12:58 +08:00
疯狂的狮子li
336adbd056 update 统一格式化代码结构 2021-10-22 10:04:15 +08:00
疯狂的狮子li
c1c4fb2ca4 update hutool 5.7.13 => 5.7.14 
update qcloud.cos 5.6.55 => 5.6.58
update minio 8.3.0 => 8.3.1
 2021-10-21 18:10:45 +08:00
疯狂的狮子li
6c9dc9ae51 update 修正pr 不规范写法 2021-10-21 17:40:44 +08:00
疯狂的狮子li
f4b619d1d1 update 修正注释错误 2021-10-21 10:10:30 +08:00
疯狂的狮子li
b6443e0c01 update quartz改为保留一个版本 2021-10-20 13:53:36 +08:00
疯狂的狮子li
aaa15b403a add [重大更新]增加 ruoyi-job 任务调度模块(基于xxl-job) 2021-10-20 13:22:45 +08:00
疯狂的狮子li
82f1f5d0cf update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像 2021-10-20 13:07:16 +08:00
sxq
3eeeb27d70 集成xxl-job-admin控制台。 2021-10-20 11:32:53 +08:00
疯狂的狮子li
37a8addf52 update feign 标记过期 2021-10-15 15:55:44 +08:00
疯狂的狮子li
6684812014 update 标记过期 推荐迁移至新框架 xxl-job 2021-10-15 11:31:26 +08:00
RuoYi
e7afea4cb7 升级oshi到最新版本v5.8.2 2021-10-14 16:20:18 +08:00
疯狂的狮子li
91c4253f06 update satoken 1.26.0 => 1.27.0 2021-10-12 11:47:46 +08:00
疯狂的狮子li
cbb0c98f98 add [重磅更新] 增加分布式日志框架 TLog 2021-10-11 17:59:27 +08:00
疯狂的狮子li
2006e5e51e update springboot-admin 2.5.1 => 2.5.2 2021-10-11 09:43:03 +08:00
疯狂的狮子li
741a5b275b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
	ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/views/monitor/server/index.vue
 2021-10-11 09:37:06 +08:00
RuoYi
b1e5ebab8f 升级spring-boot-mybatis到最新版2.2.0 2021-10-10 11:26:50 +08:00
RuoYi
8bd6296721 升级pagehelper到最新版1.4.0 2021-10-10 11:25:37 +08:00
RuoYi
ae5c68368b 升级SpringBoot到最新版本2.5.5 2021-10-10 11:24:16 +08:00
RuoYi
f6e477b4f5 升级druid到最新版1.2.8 2021-10-10 09:44:14 +08:00
RuoYi
f1fed76273 升级element-ui到最新版本2.15.6 2021-10-09 12:22:48 +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
RuoYi
6480282826 升级fastjson到最新版1.2.78 2021-09-24 09:28:46 +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 b12bdd1f15)
 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
dingzhongyuan
cf16e31632 多数据源替换成dynamic-datasource 2021-06-22 11:31:04 +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
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
0140965a30 update 优化 jdk11 相关 pr 2021-06-17 09:42:00 +08:00
疯狂的狮子li
d10099d9e9 update 适配 jdk11 2021-06-16 23:46:26 +08:00
朱杰
ac3f9e5f33 【update】JDK11支持 2021-06-16 23:33:01 +08:00
疯狂的狮子li
9f856e9ec2 update 回滚 Mybatis-Plus 到 3.4.3 版本(3.4.3.1 官方代码有bug https://gitee.com/baomidou/mybatis-plus/issues/I3VS3L) 2021-06-16 18:44:06 +08:00
疯狂的狮子li
7bdce848e7 update 升级 hutool 5.7.1 适配工具类 2021-06-16 15:36:45 +08:00
疯狂的狮子li
feb7c85d57 update mybatis-plus 升级 3.4.3.1 fixbug 版本 2021-06-16 13:29:33 +08:00
RuoYi
3e90fd010d 升级commons.fileupload到最新版本v1.4 2021-06-16 09:53:00 +08:00
RuoYi
462862ba65 升级commons.io到最新版本v2.10.0 2021-06-16 09:52:38 +08:00
疯狂的狮子li
d98faaffee update 移除 fastjson 增加 jackson 工具类 重写相关业务 2021-06-13 15:39:35 +08:00
RuoYi
200106df39 升级oshi到最新版本v5.7.4 2021-06-11 10:29:14 +08:00
疯狂的狮子li
bf3a88ff1a 发版 v2.3.2 2021-06-11 09:23:34 +08:00
疯狂的狮子li
524683eabd update swagger 升级为 3.0.0 使用 OAS_30 协议 2021-06-10 09:57:34 +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
RuoYi
2ace3257f9 升级swagger到最新版本v3.0.0 2021-06-09 20:07:36 +08:00
RuoYi
c16ee7fc2c 升级swagger到最新版本v3.0.0 2021-06-08 16:34:36 +08:00
疯狂的狮子li
450c6759eb 发布 2.3.1 2021-06-04 16:11:17 +08:00
疯狂的狮子li
d815317d7c 发布 v2.3.0 2021-06-01 10:21:56 +08:00