1636 Commits

Author SHA1 Message Date
疯狂的狮子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
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
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
疯狂的狮子Li
02ce9868a7 fix 自动生成代码漏掉 this.#[[$modal]]#.msgError 2021-09-24 05:41:55 +00:00
疯狂的狮子li
6f870e11ff update 优化空校验处理 2021-09-24 11:17:25 +08:00
若依
a8f2ff4531 !331 update 代码生成编辑页面 拼写错误修正
Merge pull request !331 from 疯狂的狮子Li/master
2021-09-24 02:07:44 +00:00
疯狂的狮子li
eaa3baab3c update 代码生成编辑页面 拼写错误修正 2021-09-24 10:06:23 +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
若依
6197ad5090 !330 优化 记录登录信息,移除不必要的修改
Merge pull request !330 from lihy2021/N/A
2021-09-24 01:27:57 +00:00
lihy2021
b477e40d3c 优化 记录登录信息,移除不必要的修改 2021-09-24 00:41:43 +00:00
疯狂的狮子li
7c8eae3735 update 更新 satoken分支 相关介绍 2021-09-23 19:25:01 +08:00
RuoYi
f8cc7ce328 限流返回类型转换数值型的格式 2021-09-23 19:15:33 +08:00
RuoYi
1a5881b1d0 修正服务监控磁盘变量 2021-09-23 19:09:22 +08:00
疯狂的狮子li
071c4c1412 update 同步ruoyi适配改动 2021-09-23 19:04:09 +08:00
疯狂的狮子li
03b31652a2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/layout/components/Settings/index.vue
	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/online/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/monitor/server/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/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
	ruoyi-ui/src/views/tool/gen/importTable.vue
2021-09-23 18:53:17 +08:00
疯狂的狮子li
852bc4887a remove 移除无用字段 2021-09-23 14:58:48 +08:00
RuoYi
fa124aeb8b 新增通用方法简化模态/缓存使用 2021-09-23 09:57:29 +08:00
RuoYi
258335cc65 新增通用方法简化模态/缓存使用 2021-09-23 09:38:16 +08:00
疯狂的狮子li
bdebca94b3 remove 移除无用合并 2021-09-22 12:38:52 +08:00
疯狂的狮子li
f85bad3388 update 调整依赖结构 解决依赖冲突 2021-09-22 11:10:10 +08:00
疯狂的狮子li
e9b0289eff update 优化代码生成 根据MP生成特性 调整导入表结构默认值合理化 2021-09-22 11:09:42 +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
3b42abef44 Excel注解支持自定义数据处理器 2021-09-22 09:03:01 +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
54bfa627f0 防止Excel导入图片可能出现的异常 2021-09-20 19:04:57 +08:00
RuoYi
36c058188a 防止记录日志转换出现的异常 2021-09-20 19:04:40 +08:00
疯狂的狮子Li
5306a45093 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.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
2021-09-20 17:53:25 +08:00
RuoYi
a292cccb63 代码生成点击预览重置激活tab 2021-09-18 18:58:03 +08:00
若依
5ccd9877b4 !325 update 优化aop语法 使用spring自动注入注解 基于注解拦截的aop注解不可能为空
Merge pull request !325 from 疯狂的狮子Li/master
2021-09-18 10:47:06 +00:00
若依
7108ec41b5 !322 Cron表达式生成器关闭时销毁,避免再次打开时存在上一次修改的数据
Merge pull request !322 from muyi/master
2021-09-18 10:43:59 +00:00
若依
5188d56b4a !321 修复 全局限流key会多出一个"-" 将其移动到IP后面 去除多余的空格
Merge pull request !321 from 疯狂的狮子Li/N/A
2021-09-18 10:41:03 +00:00
疯狂的狮子li
8f7ed66544 update 优化aop语法 使用spring自动注入注解 基于注解拦截的aop注解不可能为空 2021-09-18 18:20:21 +08:00
疯狂的狮子li
c99b9262a8 update 优化aop写法 使用spring自动注入注解参数 2021-09-18 18:05:50 +08:00
疯狂的狮子li
2ccbaf9143 update 补全 @Override 注解 2021-09-18 18:05:28 +08:00