xiaozhi/xiaozhi-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,502 Commits 1 Branch 0 Tags
4dd235124dae878fbeb9338fc88724b5fc536797
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子li 4dd235124d add 增加 发布订阅 演示案例 2021-09-03 16:22:04 +08:00
疯狂的狮子li 04c03d7ab7 add RedisCache 工具类 增加 发布订阅工具 2021-09-03 16:21:50 +08:00
疯狂的狮子li fd8affdc8a update 补全演示案例 接口文档 2021-09-03 16:21:23 +08:00
疯狂的狮子li 237b598264 update 更新feign关于熔断注释 2021-09-03 11:43:34 +08:00
疯狂的狮子li f566c39026 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/views/monitor/job/index.vue
	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
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-09-03 10:55:58 +08:00
疯狂的狮子li 80784433b8 remove 移除分页合理化参数 使用 MP 全局配置分页溢出 2021-09-02 15:59:42 +08:00
疯狂的狮子li ab9bc35f9f update MP字段验证策略更改为 NOT_NULL 个别特殊字段使用注解单独处理 2021-09-02 15:45:57 +08:00
疯狂的狮子li f3d6d1e43b update 优化全局线程池配置 使用泛型 防止错误输入 2021-09-02 15:20:31 +08:00
疯狂的狮子li 8b2f7f0e64 update 优化验证码配置 使用泛型 防止错误输入 2021-09-02 15:19:18 +08:00
疯狂的狮子li 76710e453e update 分页合理化 2021-09-02 13:46:11 +08:00
疯狂的狮子li 6801490e3b update 分页合理化 2021-09-02 11:29:50 +08:00
疯狂的狮子li 1a695159e3 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
	ruoyi-ui/src/api/login.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
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-09-02 10:49:56 +08:00
疯狂的狮子li b461c8cc99 update spring-boot-admin 2.5.0 => 2.5.1 
update aliyun.oss 3.13.0 => 3.13.1
update qcloud.cos 5.6.47 => 5.6.51
update hutool 5.7.9 => 5.7.11
update maven-jar-plugin 3.1.1 => 3.2.0
 2021-09-01 15:38:08 +08:00
疯狂的狮子li adb31b71f8 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/views/monitor/job/index.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/dept/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue
 2021-09-01 09:40:36 +08:00
疯狂的狮子li 52ca1e7d06 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
 2021-08-31 09:42:55 +08:00
疯狂的狮子li 1370d4a43c add 优化 增加 redis 配置文件 2021-08-30 14:18:22 +08:00
疯狂的狮子li f22aa6d94a update 更新容器名 2021-08-30 13:46:49 +08:00
疯狂的狮子li bdfd2f0787 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi-ui/src/api/login.js
 2021-08-30 12:49:19 +08:00
疯狂的狮子li 673d10c6c4 update 优化 saveAll 空列表校验 2021-08-30 12:36:01 +08:00
疯狂的狮子li e54033f4e4 update 优化 saveOrUpdateAll 空列表校验 2021-08-30 12:24:24 +08:00
疯狂的狮子Li bfeca2cd7c !84 全量保存或更新之前判断addList长度和updateList长度 
Merge pull request !84 from 抓蛙师/dev
 2021-08-30 04:20:46 +00:00
疯狂的狮子li dc0f655781 remove 移除docker镜像无用路径配置 2021-08-27 12:07:16 +08:00
疯狂的狮子li a5acc3b27e update java 代码格式统一使用4个空格 2021-08-26 13:06:27 +08:00
疯狂的狮子Li ee927ad6dc !83 update 优化生成的业务名 
Merge pull request !83 from 友杰/auto-8071125-dev-1629950351765
 2021-08-26 04:33:02 +00:00
疯狂的狮子li 0c438ad8e9 update 修改时检查用户数据权限范围 2021-08-26 11:15:07 +08:00
疯狂的狮子li 31c2cfa53c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.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-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
 2021-08-26 11:10:42 +08:00
疯狂的狮子li 23ce0af2e8 update 优化 ServicePlusImpl 的 vo 泛型 由K改成V 增加可读性 增加注释 2021-08-26 10:56:36 +08:00
疯狂的狮子li 0014be5242 update 优化代码生成 导入与同步 批处理效率 2021-08-26 10:23:01 +08:00
疯狂的狮子li 7c6fe5f244 add 新增 saveOrUpdateAll 方法 可完美替代 saveOrUpdateBatch 高性能 2021-08-26 09:58:57 +08:00
疯狂的狮子Li 3e5ae811bf !82 saveAll支持有id更新,无id插入 
Merge pull request !82 from 抓蛙师/dev
 2021-08-26 01:24:20 +00:00
疯狂的狮子li 5df5e63afe update 解决 logout 写死 无法扩展路径问题 2021-08-25 21:50:38 +08:00
疯狂的狮子li 8ffe111086 update 重写 InsertAll 方法实现 可完美替代 saveBatch 秒级插入上万数据 2021-08-25 18:01:52 +08:00
疯狂的狮子li 1cd64a1c4e fix minio Prefix 空问题 2021-08-25 10:03:39 +08:00
疯狂的狮子li fc98a260d6 update 优化spy配置文件为 UTF8编码 解决中文注释乱码问题 2021-08-24 16:00:33 +08:00
疯狂的狮子li 613fe5d35a update 更改OSS上传通用路径生成 按照年月日分三级目录 2021-08-24 15:51:23 +08:00
疯狂的狮子li f5b90af6d0 add 增加 导出雪花id excel失真问题 2021-08-24 14:28:39 +08:00
疯狂的狮子li bf86e5979b update 重构 将下载excel工具提取到全局 2021-08-24 14:28:20 +08:00
疯狂的狮子li dae8ee4afc update 增加验证码开关注释 2021-08-24 14:27:14 +08:00
疯狂的狮子li 72f3971ca2 update 重构 将下载excel工具提取到全局 2021-08-24 13:38:15 +08:00
疯狂的狮子li f91ebd93d2 update 重构 将下载excel工具提取到全局 2021-08-23 18:28:33 +08:00
疯狂的狮子li dea627f02c update 更改用户注册页面标题名 2021-08-23 18:21:05 +08:00
疯狂的狮子li 3c0f992e76 fix 解决搜索校验不通过问题 2021-08-23 18:20:07 +08:00
疯狂的狮子li 5f2f4bb7ef add 增加查询校验组 2021-08-23 18:17:45 +08:00
疯狂的狮子Li 92a32fe380 fix 修复定时器工具编写错误问题 2021-08-22 12:47:51 +00:00
疯狂的狮子li a0fc78f9e6 remove 删除无用路径 2021-08-22 11:58:08 +08:00
疯狂的狮子li 3ade542d81 fix 修复 druid 监控 集群模式下 无法路由到同一台服务器问题 nginx 使用 ip_hash 路由方式 保障同 ip 路由到同服务器 2021-08-22 10:42:58 +08:00
疯狂的狮子li 0e2ff6a6da update 优化copy工具增加空判断 2021-08-22 10:41:26 +08:00
疯狂的狮子li 0c9a778736 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/directive/index.js
 2021-08-22 10:40:36 +08:00
疯狂的狮子li 40347e4cb8 fix 修复 excel 导入与 class 未对应问题 2021-08-20 17:00:57 +08:00
疯狂的狮子li 33c16e562b update springboot 2.5.3 => 2.5.4 
update hutool 5.7.7 => 5.7.9
update feign-okhttp 11.2 => 11.6
 2021-08-20 14:47:49 +08:00
疯狂的狮子li c3b44e835d update 同步 ruoyi 更新代码 2021-08-19 17:37:44 +08:00
疯狂的狮子li c380b77617 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.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/Constants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-ui/src/layout/index.vue
 2021-08-19 17:33:46 +08:00
疯狂的狮子Li 7fafd94e39 !80 update 优化oss配置错误时的错误信息 
Merge pull request !80 from 友杰/auto-8071125-dev-1629364607691
 2021-08-19 09:23:46 +00:00
疯狂的狮子li aead560227 update 优化 使用权限工具 获取用户信息 2021-08-19 11:13:59 +08:00
疯狂的狮子li 36fae5c926 update 优化 OSS 模块与上传组件 异常处理 2021-08-18 19:14:26 +08:00
疯狂的狮子li 88e3805ff9 fix 修复 OSS配置清空被过滤问题 2021-08-18 18:24:05 +08:00
疯狂的狮子li e981388aa7 fix 修复 新版本说明 标签错误 2021-08-18 16:53:56 +08:00
疯狂的狮子li 9dd0ed4329 fix 修复 富文本图片路径错误问题 2021-08-18 14:49:31 +08:00
疯狂的狮子li e3d90b820d Merge remote-tracking branch 'origin/dev' into dev 2021-08-18 14:13:55 +08:00
疯狂的狮子li 8c7507b048 fix 修复 minio 无 perfix 问题 2021-08-18 14:13:46 +08:00
疯狂的狮子Li b19111b9bf Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev 2021-08-18 03:11:04 +00:00
疯狂的狮子li a937e3f268 发布 v3.0.0 2021-08-18 11:09:14 +08:00
疯狂的狮子li 4eb94f4a1e update 更新vip群信息 2021-08-18 10:44:08 +08:00
疯狂的狮子li 8cc673ec95 update 同步 ruoyi 自定义限流 新功能 2021-08-17 14:39:38 +08:00
疯狂的狮子li c271ffc066 update 同步 ruoyi 自定义限流 新功能 2021-08-17 14:34:29 +08:00
疯狂的狮子li 896939ce4e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
 2021-08-17 14:23:19 +08:00
疯狂的狮子li 5bfb2dae13 update 优化OSS异常判断 2021-08-17 11:43:14 +08:00
疯狂的狮子li 52d0d62c35 update 同步 ruoyi 适配改动 2021-08-17 10:45:01 +08:00
疯狂的狮子li d3abd6c96e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/components/Breadcrumb/index.vue
 2021-08-17 10:38:07 +08:00
疯狂的狮子li 73d2ed4c02 update 更新批量演示demo代码 2021-08-16 16:18:36 +08:00
疯狂的狮子li 25b47db3cb update 移除Spring注入 改为全局缓存 并使用更新时间确保集群配置最终一致性 2021-08-15 16:59:46 +08:00
疯狂的狮子li 881edb3e62 update springboot admin 2.4.3 => 2.5.0 (新增 Quartz 专属监控页) 2021-08-14 14:53:25 +08:00
疯狂的狮子li bb1d8d5796 remove 删除无用常量 2021-08-14 14:30:52 +08:00
疯狂的狮子li cb13642e85 update 重写 OSS 模块相关实现 支持动态配置(页面配置) 2021-08-13 21:09:24 +08:00
疯狂的狮子li 6473d4d8be Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	bin/clean.bat
	bin/run.bat
	ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/bin/run-web.bat
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/index.vue
 2021-08-13 17:36:26 +08:00
疯狂的狮子li 8c09c30ca0 remove 删除OSS配置页面无用按钮 2021-08-13 14:32:24 +08:00
疯狂的狮子li 86fba4aed4 remove 删除配置文件 OSS存储相关配置 2021-08-13 14:10:16 +08:00
疯狂的狮子li a5a71bf505 fix 修复代码生成 删除按钮报错 loading 不取消问题 2021-08-13 14:07:32 +08:00
疯狂的狮子li 652a39b11c update 修正 PR 相关问题 2021-08-13 14:04:57 +08:00
疯狂的狮子li 824635df7f update 修正 PR 相关问题 2021-08-13 12:37:34 +08:00
疯狂的狮子li 2b0c4acfa1 add 增加 admin 监控客户端开关 2021-08-12 13:53:58 +08:00
疯狂的狮子li 2915548bce remove 移除无用配置 2021-08-12 11:41:43 +08:00
疯狂的狮子li c9a9da7f49 remove 移除无用配置 2021-08-12 11:38:06 +08:00
疯狂的狮子li 8adbdee9d9 remove 移除无用配置 2021-08-12 11:37:12 +08:00
疯狂的狮子li 5645356fa9 fix 生产minio回显问题 2021-08-11 17:05:02 +08:00
疯狂的狮子li 6a66aaff47 update 注入器 insert 增加 update 字段处理 2021-08-11 16:47:38 +08:00
疯狂的狮子li 253f28bb2b update 代码生成文档注解 增加必填判断配置 2021-08-11 15:43:58 +08:00
疯狂的狮子li a48154a2ee update 补全基础实体 文档注解 2021-08-11 15:43:23 +08:00
疯狂的狮子li 0883b9eff1 update hutool 5.7.6 => 5.7.7 2021-08-11 14:42:58 +08:00
疯狂的狮子li 2c2dad24d5 update 更新 阿里云 maven源 新地址 2021-08-11 14:28:05 +08:00
疯狂的狮子li cec4e083ef update 更改多数据源框架更清晰的依赖名 2021-08-11 14:27:40 +08:00
疯狂的狮子li 05316b08b4 update 统一镜像时区配置 移除主机时间映射 2021-08-11 13:09:48 +08:00
疯狂的狮子li c2de299834 update 同步ruoyi 2021-08-09 10:05:27 +08:00
疯狂的狮子li 9bfa420a76 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	README.md
	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/SysPostController.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/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/web/service/UserDetailsServiceImpl.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-ui/package.json
	ruoyi-ui/src/views/system/menu/index.vue
 2021-08-09 09:55:50 +08:00
疯狂的狮子li f544ffc568 add 增加 国际化演示demo 2021-08-06 18:59:28 +08:00
疯狂的狮子li c06a02fb97 add 增加 完整国际化解决方案 2021-08-06 18:59:08 +08:00
疯狂的狮子li 4d15ab766f fix 修复操作日志根据状态查询异常问题 2021-08-06 12:43:21 +08:00
疯狂的狮子li 6896db47af update 补全国家化文件 2021-08-05 13:45:54 +08:00
疯狂的狮子li 313d8e8484 update 排版文档 增加新功能说明 2021-08-05 13:31:00 +08:00
疯狂的狮子li 8c912a8133 add 集成 性能分析插件 p6spy 更强劲的 SQL 分析 2021-08-05 13:30:36 +08:00