408 Commits

Author SHA1 Message Date
疯狂的狮子li
3bf96c6cd7 update 删除重复依赖 补全演示demo注解参数 2021-10-26 19:09:50 +08:00
疯狂的狮子li
c9a3164a29 fix swagger 单接口缺少 Authorization 参数 2021-10-26 12:53:21 +08:00
疯狂的狮子Li
d254340b9b fix 修正错别字 2021-10-25 18:33:26 +08:00
RuoYi
8a7dcf8a80 修正错别字 2021-10-25 10:26:00 +08:00
疯狂的狮子li
336adbd056 update 统一格式化代码结构 2021-10-22 10:04:15 +08:00
疯狂的狮子li
32bfe334c0 update 整理删除无用注释 保证代码整洁 2021-10-21 18:41:56 +08:00
疯狂的狮子li
6ab575cd49 update 优化处理过期方法 采用新写法 2021-10-21 15:59:34 +08:00
602003139@qq.com
2489c46a7f 修复在swagger配置类中无法读取到satoken配置文件的问题 2021-10-21 14:44:53 +08:00
抓蛙师
ce7097b498 更新时间和用户注入问题 2021-10-20 09:40:04 +08:00
疯狂的狮子li
1ae369855b update 优化 多账号体系用户行为监听逻辑 2021-10-19 17:23:14 +08:00
疯狂的狮子li
36e501b457 update 通用数据注入改为适配通用实体类 2021-10-15 16:20:16 +08:00
疯狂的狮子li
37a8addf52 update feign 标记过期 2021-10-15 15:55:44 +08:00
疯狂的狮子li
14f6249031 update 包重命名 规范化 2021-10-15 11:30:39 +08:00
疯狂的狮子li
ea249c33fd update 包重命名 规范化 2021-10-15 11:30:24 +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
aaf9f57459 update 去除登录警告 2021-10-11 16:49:21 +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
ae5c68368b 升级SpringBoot到最新版本2.5.5 2021-10-10 11:24:16 +08:00
疯狂的狮子li
6e67e1a849 fix 修复 多数据源aop语法错误 2021-09-28 14:38:21 +08:00
疯狂的狮子li
3401f38edc fix 修复 多数据源aop语法错误 2021-09-28 14:37:03 +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
75b22e9a23 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/job/log.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/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/build/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
2021-09-27 16:50:26 +08:00
RuoYi
ded99502ae 新增通用方法简化下载使用 2021-09-27 10:38:29 +08:00
疯狂的狮子li
6976c7f386 update security 路径配置抽取到配置文件 2021-09-26 17:26:45 +08:00
疯狂的狮子li
7702175130 update 修复合并异常 2021-09-26 17:18:09 +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
3434610349 update 接口文档 支持分组配置 2021-09-26 17:02:28 +08:00
疯狂的狮子li
bcac70b2ab update 扩展 security 配置属性 2021-09-26 17:02:08 +08:00
疯狂的狮子li
369438a46d update 回滚配置 2021-09-26 16:42:42 +08:00
疯狂的狮子li
aed8969498 remove 移除无用配置类 2021-09-26 15:37:40 +08:00
疯狂的狮子li
4a8781f4d9 fix jwt过滤编写问题 2021-09-26 15:18:05 +08:00
疯狂的狮子li
bff9d0560d fix jwt过滤编写问题 2021-09-26 15:17:27 +08:00
疯狂的狮子li
36f8eb71f3 fix jwt过滤编写问题 2021-09-26 14:39:51 +08:00
疯狂的狮子li
f7982ede73 fix jwt过滤编写问题 2021-09-26 14:35:25 +08:00
疯狂的狮子li
92804151a3 update 优化匿名路径jwt放行 2021-09-26 14:08:48 +08:00
疯狂的狮子li
0f2caf1cb6 update security 路径配置抽取到配置文件 2021-09-26 14:08:28 +08:00
疯狂的狮子li
06442d5aa2 update 修正拦截路径 2021-09-26 13:29:51 +08:00
疯狂的狮子li
6f870e11ff update 优化空校验处理 2021-09-24 11:17:25 +08:00
lihy2021
b477e40d3c 优化 记录登录信息,移除不必要的修改 2021-09-24 00:41:43 +00:00
RuoYi
f8cc7ce328 限流返回类型转换数值型的格式 2021-09-23 19:15:33 +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
40984e201e update 同步ruoyi修改命名 2021-09-22 10:12:49 +08:00
疯狂的狮子li
76bf987203 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
2021-09-22 10:09:15 +08:00
RuoYi
26f0737c60 防重提交注解支持配置间隔时间/提示消息 2021-09-20 19:09:25 +08:00
RuoYi
ac94242875 reset dataSourceAspect 2021-09-20 19:08:50 +08:00
RuoYi
36c058188a 防止记录日志转换出现的异常 2021-09-20 19:04:40 +08:00
若依
5ccd9877b4 !325 update 优化aop语法 使用spring自动注入注解 基于注解拦截的aop注解不可能为空
Merge pull request !325 from 疯狂的狮子Li/master
2021-09-18 10:47:06 +00:00