1671 Commits

Author SHA1 Message Date
602003139@qq.com
2489c46a7f 修复在swagger配置类中无法读取到satoken配置文件的问题 2021-10-21 14:44:53 +08:00
疯狂的狮子li
1ae369855b update 优化 多账号体系用户行为监听逻辑 2021-10-19 17:23:14 +08:00
疯狂的狮子li
1f1d4e2def Merge remote-tracking branch 'origin/satoken' into satoken 2021-10-12 11:47:54 +08:00
疯狂的狮子li
91c4253f06 update satoken 1.26.0 => 1.27.0 2021-10-12 11:47:46 +08:00
疯狂的狮子Li
bc6db547d6 fix 修复密码校验错误 2021-10-04 16:41:11 +08:00
疯狂的狮子li
e2de22bdce update 优化 代码生成常量 关于 BO VO 注释 2021-09-28 18:26:08 +08:00
疯狂的狮子li
100f6603f2 update 优化 代码生成常量 关于 BO VO 注释 2021-09-28 18:24:11 +08:00
疯狂的狮子li
5382a2a15e update 优化代码生成 导入表 列表返回 主键默认选中 2021-09-28 18:23:43 +08:00
疯狂的狮子li
0a9d4ea17b update 适配单体系与多体系用户权限 2021-09-28 17:56:19 +08:00
疯狂的狮子li
f05138df62 update 适配单体系与多体系用户权限 2021-09-28 17:55:01 +08:00
疯狂的狮子li
6e67e1a849 fix 修复 多数据源aop语法错误 2021-09-28 14:38:21 +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
22b4f87232 Merge remote-tracking branch 'origin/dev' into dev 2021-09-28 09:32:56 +08:00
疯狂的狮子li
ca5823fcdf Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-ui/package.json
2021-09-28 09:30:34 +08:00
疯狂的狮子Li
49fc74be5d fix 修复更新问题 导出文件名乱码 2021-09-27 21:30:07 +08:00
RuoYi
25f50d74c5 升级sass-loader到最新版本10.1.1 2021-09-27 18:54:43 +08:00
RuoYi
266f4d6806 升级dart-sass到版本1.32.13 2021-09-27 18:54:10 +08:00
疯狂的狮子li
a6a9814c06 update 更新 service 注解 2021-09-27 17:58:36 +08:00
疯狂的狮子li
5a8d3ddef0 update 回退 dart-sass 新版报大量警告 2021-09-27 17:58:10 +08:00
疯狂的狮子li
b082da73a1 Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
2021-09-27 17:27:32 +08:00
疯狂的狮子li
99dcbe0207 update 封装通用下载方法简化下载使用 2021-09-27 17:24: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
疯狂的狮子li
c4f8c1b296 update 更新线程池策略说明 2021-09-27 15:00:36 +08:00
疯狂的狮子li
eecefdc4fa update 测试 jdk17 无异常 文档说明 2021-09-27 14:14:57 +08:00
RuoYi
ded99502ae 新增通用方法简化下载使用 2021-09-27 10:38:29 +08:00
RuoYi
02b95f95a8 升级file-saver到最新版本2.0.5 2021-09-27 10:36:43 +08:00
RuoYi
2a6d2d733e 升级dart-sass到最新版本1.42.1 2021-09-27 10:32:03 +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
c2e43cc781 update 修复合并异常 2021-09-26 17:16:55 +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
8a81f37d22 update 同步ruoyi 2021-09-26 10:08:24 +08:00
疯狂的狮子li
125547f08f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
	ruoyi-ui/src/views/monitor/server/index.vue
2021-09-26 10:05:29 +08:00
疯狂的狮子li
0d24be4c05 update 更新satoken配置 设置从header读取鉴权token 2021-09-26 09:49:32 +08:00
RuoYi
30c89b33fe Excel注解支持导入导出标题信息 2021-09-26 09:03:01 +08:00
RuoYi
7479ff4b06 修复xss过滤后格式出现的异常 2021-09-25 17:12:37 +08:00
疯狂的狮子li
9801e9c29a remove 移除过期工具 2021-09-24 15:13:11 +08:00
若依
821f40882f !332 fix 自动生成代码漏掉 this.#[[$modal]]#.msgError
Merge pull request !332 from 疯狂的狮子Li/N/A
2021-09-24 06:50:50 +00:00