xiaozhi/xiaozhi-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,783 Commits 1 Branch 0 Tags
f5f16aac96772c109658b5ae1b48874008e0959a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子li f5f16aac96 Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	ruoyi-common/pom.xml
 2021-10-28 10:56:21 +08:00
疯狂的狮子li 3353ead5d3 update 搜索框 更新文本域生成 用于模糊查询 2021-10-28 09:45:29 +08:00
疯狂的狮子li 160beb8e1c update jdk11 适配依赖 调整到 common 包 2021-10-28 09:44:57 +08:00
疯狂的狮子li 3f0d3ffb8a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
 2021-10-28 09:40:02 +08:00
疯狂的狮子li d1037c6c9a Merge remote-tracking branch 'origin/dev' into satoken 2021-10-27 13:43:17 +08:00
疯狂的狮子li bb205a5cdb update 注释掉原定时任务相关sql 下个版本移除 2021-10-27 13:42:51 +08:00
疯狂的狮子li 6e73d8b3ab update 同步 dev 分支 更新最新改动 2021-10-27 13:28:26 +08:00
疯狂的狮子li 82a2dd8732 Merge remote-tracking branch 'origin/dev' into satoken 2021-10-27 13:26:46 +08:00
疯狂的狮子li 7e3c9c1094 update 删除无用setUsername 使用自动注入 2021-10-27 13:26:24 +08:00
疯狂的狮子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
 2021-10-27 13:16:19 +08:00
疯狂的狮子li dbb2d8462b update 迁移所有脚本文件至script目录 2021-10-26 19:42:27 +08:00
疯狂的狮子li 3bf96c6cd7 update 删除重复依赖 补全演示demo注解参数 2021-10-26 19:09:50 +08:00
疯狂的狮子li 61375c4bbb Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/pom.xml
 2021-10-26 18:57:55 +08:00
疯狂的狮子li 2e4689d557 update 更新xxl-job执行器开关功能 2021-10-26 18:30:02 +08:00
疯狂的狮子Li 3117080be3 !105 1:升级springboot版本到2.5.6。 2:升级hutool版本到5.7.15。 
Merge pull request !105 from shenxinquan/auto-480232-dev-1635232384088
 2021-10-26 07:14:18 +00: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
疯狂的狮子Li 42a3117e2a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/plugins/download.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/monitor/server/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ry.bat
 2021-10-25 18:24:55 +08:00
疯狂的狮子Li e47dcb10de fix 修复原生 任务调度中心 集成之后 字体图标被过滤问题 2021-10-25 18:03:44 +08:00
疯狂的狮子Li 2173ed504d update 更新关于全局路径设置与文档链接 2021-10-24 17:23:15 +08:00
疯狂的狮子Li 4583787759 fix 跨域访问之后 下载无法获取 download-filename 2021-10-24 17:13:04 +08:00
疯狂的狮子li b8a8b76c38 fix 修复跨域访问无权限获取请求头 download-filename 导致文件名为空问题 2021-10-22 12:38:33 +08:00
疯狂的狮子li 296e6171a1 update 补全国际化文件 2021-10-22 11:22:31 +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 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
 2021-10-21 18:10:45 +08:00
疯狂的狮子li 6c9dc9ae51 update 修正pr 不规范写法 2021-10-21 17:40:44 +08:00
疯狂的狮子li 6ab575cd49 update 优化处理过期方法 采用新写法 2021-10-21 15:59:34 +08:00
疯狂的狮子Li c9274307f2 !104 修复在swagger配置类中无法读取到satoken配置文件的问题 
Merge pull request !104 from 大灰灰大/satoken
 2021-10-21 07:38:26 +00:00
疯狂的狮子li f4b619d1d1 update 修正注释错误 2021-10-21 10:10:30 +08:00
疯狂的狮子li 255c8a083e add 增加 RedisUtils 测试设置过期时间 案例 2021-10-21 09:33:13 +08:00
疯狂的狮子li d0700172fa update 合并oss.sql至主sql 2021-10-20 15:30:39 +08:00
疯狂的狮子li 83ce927d16 add 前端增加 任务调度中心页面 与环境及nginx配置 2021-10-20 15:25:14 +08:00
疯狂的狮子li 809774d87c update 更新xxljob配置类 增加配置注解 2021-10-20 15:24:41 +08:00
疯狂的狮子li 6f3f89a0d3 update 更新xxljob默认sql执行器名称 2021-10-20 15:24:09 +08:00
疯狂的狮子li a870a1c6bc update sql文件更新 xxljob控制台菜单 2021-10-20 15:23:51 +08:00
疯狂的狮子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 1ae369855b update 优化 多账号体系用户行为监听逻辑 2021-10-19 17:23:14 +08: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 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 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 bc6db547d6 fix 修复密码校验错误 2021-10-04 16:41:11 +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 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 29163a41c2 update 更新 Admin 监控 注释 避免错误使用 2021-09-28 18:04:09 +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 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 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 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
疯狂的狮子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