xiaozhi/xiaozhi-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,705 Commits 1 Branch 0 Tags
e04938666cb44a52330c92e2630c6481556b3418
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子li e04938666c fix 修复 xxl-admin 部分文件被忽略问题 2021-10-20 14:37:20 +08:00
疯狂的狮子li c0eb3c53c1 update swagger组 顺序配置 2021-10-20 14:18:26 +08:00
疯狂的狮子li b6443e0c01 update quartz改为保留一个版本 2021-10-20 13:53:36 +08:00
疯狂的狮子li 83922c5737 update 更新关于xxl-job说明 2021-10-20 13:44:10 +08:00
疯狂的狮子li 78cd6f36ef add 增加 ruoyi-xxl-job-admin 多环境配置 2021-10-20 13:32:53 +08:00
疯狂的狮子li eed4e09282 update 从总输出模块剔除 ruoyi-quartz 切换至 ruoyi-job 2021-10-20 13:27:05 +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
疯狂的狮子li 2b0452207e update admin监控增加日志文件输出 2021-10-20 13:06:42 +08:00
疯狂的狮子Li bc67d0b7b7 !103 集成xxl-job-admin控制台。 
Merge pull request !103 from shenxinquan/auto-480232-dev-1634700780703
 2021-10-20 04:43:32 +00:00
疯狂的狮子Li 8b6f7b4e4c !101 更新时间和用户注入问题 
Merge pull request !101 from 抓蛙师/auto-7465549-dev-1634694016583
 2021-10-20 01:41:24 +00:00
疯狂的狮子li 60404a6564 update 调整不规范导包 2021-10-15 19:30:42 +08:00
疯狂的狮子li 9e0ec2b03c update 修改测试代码 测试通用实体通过 删除树实体不通用属性 2021-10-15 16:21:00 +08:00
疯狂的狮子li 36e501b457 update 通用数据注入改为适配通用实体类 2021-10-15 16:20:16 +08:00
疯狂的狮子li 284f47e76c update 代码生成 改为生成抽象实体 2021-10-15 16:19:51 +08:00
疯狂的狮子li b47f8fd784 update 代码生成 改为生成抽象实体 2021-10-15 16:19:42 +08:00
疯狂的狮子li 37a8addf52 update feign 标记过期 2021-10-15 15:55:44 +08:00
疯狂的狮子li a6fb88d74c update [重大更新]全业务 增加 接口文档注解 格式化代码 2021-10-15 15:19:42 +08:00
疯狂的狮子li bb43b2853d update 前端增加默认国际化参数 2021-10-15 11:45:43 +08:00
疯狂的狮子li ba1585de34 Merge remote-tracking branch 'origin/dev' into dev 2021-10-15 11:31:39 +08:00
疯狂的狮子li 6684812014 update 标记过期 推荐迁移至新框架 xxl-job 2021-10-15 11:31:26 +08:00
疯狂的狮子li 1419700c43 update 标记过期 推荐使用 spring-cache 2021-10-15 11:31:00 +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 1c0b410f55 !97 fix 修改oss配置删除时删除缓存bug 
Merge pull request !97 from 孤舟烟雨/auto-494979-dev-1634217979662
 2021-10-14 14:21:52 +00:00
疯狂的狮子li 64ec206ecb update 更改上传数据回填 2021-10-14 17:28:13 +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 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
疯狂的狮子Li a006904724 fix 2021-09-30 03:18:41 +00:00
疯狂的狮子li f38d7811e3 update 优化 代码生成常量 关于 BO VO 注释 2021-09-28 18:26:32 +08:00
疯狂的狮子li a09f1b8666 update 优化 代码生成常量 关于 BO VO 注释 2021-09-28 18:26:31 +08:00
疯狂的狮子li c7071752a7 update 优化代码生成 导入表 列表返回 主键默认选中 2021-09-28 18:26:30 +08:00
疯狂的狮子li 29163a41c2 update 更新 Admin 监控 注释 避免错误使用 2021-09-28 18:04:09 +08:00
疯狂的狮子li 3401f38edc fix 修复 多数据源aop语法错误 2021-09-28 14:37:03 +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
疯狂的狮子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 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
疯狂的狮子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
疯狂的狮子li 9801e9c29a remove 移除过期工具 2021-09-24 15:13:11 +08: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
疯狂的狮子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
疯狂的狮子li 7c8eae3735 update 更新 satoken分支 相关介绍 2021-09-23 19:25:01 +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
疯狂的狮子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
疯狂的狮子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
疯狂的狮子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
疯狂的狮子li d54ab2733c update 简化数据字典使用 2021-09-18 17:04:25 +08:00
疯狂的狮子li 2f18d0d709 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-09-18 16:01:52 +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 1e55853036 update 更新 分布式幂等 文档说明 2021-09-18 15:47:52 +08:00
疯狂的狮子li 931ed0eb00 update [重大改动]重写 防重提交实现 使用分布式锁 解决并发问题 压测通过 2021-09-18 15:44:36 +08:00
疯狂的狮子Li 9342bbef56 fix 修复合并错误 2021-09-17 15:39:27 +00:00
疯狂的狮子Li f3a8b4625f 修复 全局限流key会多出一个"-" 将其移动到IP后面 去除多余的空格 2021-09-17 09:32:43 +00:00
疯狂的狮子li 4021020d3b update 更新 集群限流说明 2021-09-17 17:23:07 +08:00
疯狂的狮子li 2569e8c0a4 add 增加 集群限流演示案例 2021-09-17 17:22:55 +08:00
疯狂的狮子li dcaeb18870 add 增加 集群限流功能 2021-09-17 17:22:45 +08:00
疯狂的狮子li 30fe14c0ff add 增加 获取redis客户端实例id工具 2021-09-17 17:22:25 +08:00
疯狂的狮子li 089b3d6e6d update 更新限流 README.md 说明 2021-09-17 16:20:46 +08:00
疯狂的狮子li 17b90f8381 add 增加 限流演示案例 2021-09-17 16:20:26 +08:00
疯狂的狮子li f9c62fc23b update 使用 Redisson 限流工具 重写限流实现 2021-09-17 16:20:05 +08:00
疯狂的狮子li 900867df02 add RedisUtils 增加限流工具 2021-09-17 16:19:12 +08:00
疯狂的狮子li 50599487f8 update [重大改动] 将 framework 与 system 模块 解耦 2021-09-17 14:48:36 +08:00
疯狂的狮子li 2b53e9d86a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
 2021-09-17 11:12:43 +08:00
疯狂的狮子li d71e35893d update 重写框架 README.md 格式更友好 通俗易懂 2021-09-15 12:05:24 +08:00
疯狂的狮子li efd277e7ed update 用户未登录日志改为 warn 级别 2021-09-15 10:53:14 +08:00
疯狂的狮子li d3d3972bea update OSS模块 关于下载403报错信息优化 2021-09-14 17:52:19 +08:00
疯狂的狮子li 5285735c7a add 增加 redis redisson 集群配置 2021-09-14 16:57:07 +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 b27a8afc3b fix 修复多主键代码生成bug 2021-09-14 12:03:58 +08:00