疯狂的狮子li
|
bf98ee3c93
|
Merge remote-tracking branch 'origin/dev' into satoken
|
4 years ago |
|
疯狂的狮子li
|
52673152cc
|
发布 v3.4.0
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
dawn9117
|
a9e21702aa
|
接口重复鉴权BUG修复: ResourceConfig中已经配置鉴权拦截器, 添加sa-token-spring-aop会导致重复鉴权BUG
|
4 years ago |
|
疯狂的狮子li
|
e2d370bd9d
|
update 移除 satoken 自带集成 redis 改为使用 框架自身 Redission 实现 统一方案 性能优异
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
疯狂的狮子li
|
7546ef649c
|
update springboot 2.5.6 => 2.5.7
|
4 years ago |
RuoYi
|
16734b1d88
|
升级velocity到最新版本2.3
|
4 years ago |
|
疯狂的狮子li
|
40c9559d9e
|
update springboot-admin 2.5.3 => 2.5.4
|
4 years ago |
|
疯狂的狮子li
|
53cb0826bc
|
update 升级 swagger 配置 使用 knife4j 增强模式
|
4 years ago |
|
疯狂的狮子li
|
7079a4e7e4
|
update satoken 1.27.0 => 1.28.0 使用 jwt 插件代理 token 生成逻辑
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
疯狂的狮子li
|
8a93371baa
|
remove 移除 feign 相关代码与依赖
|
4 years ago |
|
疯狂的狮子li
|
95dcae1a85
|
remove 移除 quartz 相关代码与依赖
|
4 years ago |
|
疯狂的狮子li
|
24ebc73ee5
|
Merge remote-tracking branch 'origin/dev' into satoken
|
4 years ago |
|
疯狂的狮子li
|
d6e080d546
|
发布 v3.3.0
|
4 years ago |
|
疯狂的狮子li
|
f5f16aac96
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# ruoyi-common/pom.xml
|
4 years ago |
|
疯狂的狮子li
|
e8e8ae9fd7
|
update minio 8.3.1 => 8.3.3
|
4 years ago |
|
疯狂的狮子li
|
160beb8e1c
|
update jdk11 适配依赖 调整到 common 包
|
4 years ago |
|
RuoYi
|
2eb55528ec
|
升级spring-boot到最新版本2.5.6
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
sxq
|
16d6e11e94
|
1:升级springboot版本到2.5.6。
2:升级hutool版本到5.7.15。
|
4 years ago |
|
疯狂的狮子li
|
336adbd056
|
update 统一格式化代码结构
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
疯狂的狮子li
|
6c9dc9ae51
|
update 修正pr 不规范写法
|
4 years ago |
|
疯狂的狮子li
|
f4b619d1d1
|
update 修正注释错误
|
4 years ago |
|
疯狂的狮子li
|
b6443e0c01
|
update quartz改为保留一个版本
|
4 years ago |
|
疯狂的狮子li
|
aaa15b403a
|
add [重大更新]增加 ruoyi-job 任务调度模块(基于xxl-job)
|
4 years ago |
|
疯狂的狮子li
|
82f1f5d0cf
|
update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
|
4 years ago |
|
sxq
|
3eeeb27d70
|
集成xxl-job-admin控制台。
|
4 years ago |
|
疯狂的狮子li
|
37a8addf52
|
update feign 标记过期
|
4 years ago |
|
疯狂的狮子li
|
6684812014
|
update 标记过期 推荐迁移至新框架 xxl-job
|
4 years ago |
|
RuoYi
|
e7afea4cb7
|
升级oshi到最新版本v5.8.2
|
4 years ago |
|
疯狂的狮子li
|
91c4253f06
|
update satoken 1.26.0 => 1.27.0
|
4 years ago |
|
疯狂的狮子li
|
cbb0c98f98
|
add [重磅更新] 增加分布式日志框架 TLog
|
4 years ago |
|
疯狂的狮子li
|
2006e5e51e
|
update springboot-admin 2.5.1 => 2.5.2
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
RuoYi
|
b1e5ebab8f
|
升级spring-boot-mybatis到最新版2.2.0
|
4 years ago |
|
RuoYi
|
8bd6296721
|
升级pagehelper到最新版1.4.0
|
4 years ago |
|
RuoYi
|
ae5c68368b
|
升级SpringBoot到最新版本2.5.5
|
4 years ago |
|
RuoYi
|
f6e477b4f5
|
升级druid到最新版1.2.8
|
4 years ago |
|
RuoYi
|
f1fed76273
|
升级element-ui到最新版本2.15.6
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
疯狂的狮子li
|
3f142dd0fa
|
发布 v3.2.0
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
疯狂的狮子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版本
|
4 years ago |
|
RuoYi
|
6480282826
|
升级fastjson到最新版1.2.78
|
4 years ago |
|
疯狂的狮子li
|
553c29ab8a
|
update 整合 satoken 权限、鉴权一体化框架
|
4 years ago |
|
疯狂的狮子li
|
f85bad3388
|
update 调整依赖结构 解决依赖冲突
|
4 years ago |
|
疯狂的狮子li
|
41c75a808a
|
update easyexcel 2.2.10 => 2.2.11
update hutool 5.7.11 => 5.7.13
|
4 years ago |
