xiaozhi/xiaozhi-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,387 Commits 1 Branch 0 Tags
d3abd6c96e99e32ccfc030230e06ce4b529f2bbd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子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
疯狂的狮子li ffd3dc335f update 将 Actuator 配置 移动到全局配置 2021-08-05 13:30:04 +08:00
疯狂的狮子li 4e54190e3a update 代码生成模板 适配新excel导出 2021-08-05 10:22:29 +08:00
疯狂的狮子li 79bf332c53 remove 移除通用上传下载接口与配置 2021-08-04 19:11:39 +08:00
疯狂的狮子li 08db4a5f53 update 更改所有业务excel导出 2021-08-04 19:03:25 +08:00
疯狂的狮子li ffed5a09cb remove 移除原生excel工具 2021-08-04 19:02:59 +08:00
疯狂的狮子li 5ca4478540 update 更新 SysJob 导入导出 补全 SysUser 试图对象 2021-08-04 18:52:09 +08:00
疯狂的狮子li 9cf4794146 update 更新 SysUser 导入导出 2021-08-04 18:29:38 +08:00
疯狂的狮子li 43901370e9 update 自动注入修改为强制注入 无用户信息返回 null 并日志报警 2021-08-04 18:13:11 +08:00
疯狂的狮子li b65856227f update 文件存储工厂使用redis加载类型 2021-08-04 17:40:02 +08:00
疯狂的狮子li e1fcbc6476 update 移动文件存储 controller 到 admin 模块 2021-08-04 17:27:33 +08:00
疯狂的狮子li 0e8a8fca31 update 移动文件存储业务到 system 模块 2021-08-04 17:26:14 +08:00
疯狂的狮子li 01e8fe5ddb fix 头像上传 未走OSS存储问题 2021-08-04 13:10:28 +08:00
疯狂的狮子li 0ec756cf58 fix oss列表 jpeg 不回显问题 2021-08-04 13:09:43 +08:00
疯狂的狮子li 0539c2f927 update 重写系统部分业务导出 2021-08-04 11:46:55 +08:00
疯狂的狮子li 80067d32fc fix 头像上传 未走OSS存储问题 2021-08-04 11:15:16 +08:00
疯狂的狮子li 19d5f2dd78 update 下载工具更名为通用下载 2021-08-04 09:28:31 +08:00
疯狂的狮子li 13dde63463 update 修改 下载工具类 删除无用代码 2021-08-04 09:27:16 +08:00
疯狂的狮子li da4e080656 update 修改 操作日志导出 适配easyexcel工具 2021-08-03 19:29:59 +08:00
疯狂的狮子li 89cca8af07 update 重构 统一使用 zip 工具下载 2021-08-03 19:29:15 +08:00
疯狂的狮子li 170908ef8d add 增加 easyexcel 工具类 2021-08-03 19:28:15 +08:00
疯狂的狮子li 70b77d9801 add 增加 easyexcel 依赖 2021-08-03 19:27:48 +08:00
疯狂的狮子Li 2b1c3335f6 !74 Fix 修复DictUtils方法报错 
Merge pull request !74 from jackytang/N/A
 2021-08-03 02:07:20 +00:00
疯狂的狮子li c813046594 update 日常校验 统一重构到 StringUtils 便于维护扩展 2021-08-02 19:28:41 +08:00
疯狂的狮子li 5740561cd3 update 更新文档链接 更明显 2021-08-02 15:08:04 +08:00
疯狂的狮子li 28073ef2fe update 适配新业务 接口返回值 2021-08-02 13:08:36 +08:00
疯狂的狮子li c958217d19 update 修改 自动注入器 用户未登录异常拦截抛出警告 返回Null 2021-08-02 13:08:19 +08:00
疯狂的狮子li f8ab5663ef update 日常字符串校验 统一重构到 StringUtils 便于维护扩展 2021-08-02 12:15:14 +08:00
疯狂的狮子li cfdeada3fd Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-admin/src/main/resources/i18n/messages.properties
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/java/service.java.vm
	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.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/SysUserServiceImpl.java
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/utils/zipdownload.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-08-02 11:21:09 +08:00
疯狂的狮子li 210b5af1c7 update 优化自动注入器 异常检查更完善 2021-08-02 09:39:35 +08:00
疯狂的狮子li 946242e8f1 add 增加 重复提交 配置属性类 2021-08-01 11:04:37 +08:00
疯狂的狮子li 1cb79223ff update feign-okhttp 11.0 => 11.2 
update okhttp 3.19.4 => 4.9.1
update minio 8.2.0 => 8.3.0
 2021-08-01 11:03:56 +08:00
疯狂的狮子li ba99070ca4 update 更新 防重提交拦截器 demo演示案例 2021-07-30 19:11:10 +08:00
疯狂的狮子li c65acd6a28 update 重写 防重提交拦截器 支持全局与注解自定义 拦截时间配置配置 优化逻辑 2021-07-30 19:10:54 +08:00
疯狂的狮子li 39783f2b19 update 降级 minio 依赖版本 2021-07-30 14:14:21 +08:00
疯狂的狮子li 90d2a7af03 update 更新 BigNumberSerializer 书写错误 2021-07-29 15:09:23 +08:00
疯狂的狮子li d29a7adc9a update 更新 BigNumberSerializer 注释 2021-07-29 14:28:08 +08:00
疯狂的狮子li 0158fb437d update 更新 springboot 版本标签 2021-07-29 13:27:26 +08:00
疯狂的狮子li 2ef70303c5 Merge remote-tracking branch 'origin/dev' into dev 2021-07-29 13:11:42 +08:00
疯狂的狮子li 7e613f8da6 add 增加 jackson 超出 JS 最大数值自动转字符串(雪花id序列化)处理 2021-07-29 13:11:35 +08:00
疯狂的狮子Li 826bef86b2 update 更新软件架构图 2021-07-29 03:22:56 +00:00
疯狂的狮子li 0bfc4b433b update 优化 InsertAll 写法 2021-07-28 18:23:27 +08:00
疯狂的狮子li 5dbf39beee update service 统一使用 ServicePlusImpl 2021-07-28 14:22:58 +08:00
疯狂的狮子li 13da3c71d8 fix 修复 jdk8 与 jdk11 差异问题 2021-07-28 11:56:12 +08:00
疯狂的狮子li 973471c63b 发布 v2.6.0 2021-07-28 10:45:01 +08:00
疯狂的狮子li 79766fa8c2 update springboot 2.4.9 => 2.5.3 
update hutool 5.7.5 => 5.7.6
update redisson 3.16.0 => 3.16.1
update datasource 3.4.0 => 3.4.1
 2021-07-28 10:18:05 +08:00
疯狂的狮子li 6e75e88d71 update 同步ruoyi修正 2021-07-27 12:48:28 +08:00
疯狂的狮子li 06944747fd 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/SysProfileController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-07-27 12:42:41 +08:00
疯狂的狮子li 51ae60820d Merge remote-tracking branch 'origin/dev' into dev 2021-07-27 11:07:40 +08:00
疯狂的狮子li 7cf6064200 update 重构 IServicePlus 功能 增加 BeanCopyUtils 深拷贝工具 2021-07-27 11:07:33 +08:00
疯狂的狮子Li 2e1761423d fix 修复 DictData 删除逻辑问题 2021-07-26 12:05:15 +00:00
疯狂的狮子li 79eb42d3fe remove 删除 自带通用上传 接口 使用OSS模块替换 2021-07-26 14:36:59 +08:00
疯狂的狮子li 11c73d8877 udpate 补全缺失类 2021-07-26 13:57:11 +08:00
疯狂的狮子li a5fbb1cd1f udpate 更新 新特性文档介绍 2021-07-26 13:24:21 +08:00
疯狂的狮子li a3f1a00078 udpate 更新 OSS模块 适配新规范 2021-07-26 13:15:37 +08:00
疯狂的狮子li 280196c9e5 udpate 更新新功能演示案例 2021-07-26 13:13:46 +08:00
疯狂的狮子li 83cc800e97 update 多bo合并 使用分组校验 生成bo代码 2021-07-26 13:12:56 +08:00
疯狂的狮子li da5a1293b3 update 更新自定义vo转化接口 2021-07-26 13:12:03 +08:00
疯狂的狮子li 48817519a9 update 修改页面文档与源码地址 2021-07-26 13:08:54 +08:00
疯狂的狮子li b7f6f73342 fix 修复 授权角色空数据问题 2021-07-26 10:52:31 +08:00
疯狂的狮子li 90d4fd8cf1 update [重大改动] 重写VO转换 支持深拷贝 将VO类抽象到 ServicePlus 泛型处理 2021-07-24 21:19:05 +08:00
疯狂的狮子li fbe9ad2392 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-ui/src/router/index.js
 2021-07-24 19:03:36 +08:00
疯狂的狮子li b539939a90 update 更新druid配置 独立配置更明显 2021-07-24 18:29:12 +08:00
疯狂的狮子li 1dfc9bbaa6 fix 修复多数据源druid全局配置缩进错误 引起无效配置问题 
(cherry picked from commit 334fe11584)
 2021-07-24 18:25:51 +08:00
疯狂的狮子li c92ae6a9d2 update 更新除图片外显示URL文本 2021-07-23 19:50:08 +08:00
疯狂的狮子li dd9340090b add OSS模块 增加预览图片开关 2021-07-23 19:14:37 +08:00
疯狂的狮子li 7114fc2720 update OSS模块 更新 阿里云 腾讯云 相关代码 重构部分代码结构 2021-07-23 18:37:39 +08:00
疯狂的狮子li 22fd00832d update 更新OSS模块 七牛云相关代码 2021-07-23 15:35:28 +08:00
疯狂的狮子li 2d17123b74 update springboot 2.4.8 => 2.4.9 
update hutool 5.7.4 => 5.7.5
update minio 8.2.2 => 8.3.0
update docker plugin 1.2.0 => 1.2.2
 2021-07-23 10:50:03 +08:00