xiaozhi/xiaozhi-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,302 Commits 1 Branch 0 Tags
cfdeada3fdb415ea451fb3fb76b96a2e7977752c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子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
疯狂的狮子li bb67924233 update OSS下载文件名改为后端传输 2021-07-23 10:48:28 +08:00
疯狂的狮子li 1f2cf719da Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-ui/src/views/monitor/job/index.vue
 2021-07-21 14:00:07 +08:00
疯狂的狮子li 85376e8d6e add 演示Demo增加自定义分页接口案例 2021-07-21 12:07:12 +08:00
疯狂的狮子li ed197ce7ac update 完成OSS模块页面功能 2021-07-20 17:26:20 +08:00
疯狂的狮子li a4c019ace2 update OSS接口增加通用contentType 2021-07-20 11:12:22 +08:00
疯狂的狮子li eea8f33cf9 发布 v2.5.2 bug修复版 
(cherry picked from commit b12bdd1f15)
 2021-07-19 19:44:18 +08:00
疯狂的狮子li 0a128e454c update 编写 Minio 实现 调整OSS模块结构 2021-07-19 19:40:18 +08:00
疯狂的狮子li 3aaf4e2384 fix 回滚代码生成器 批处理优化(字段内容不一致, 不适合批处理) 2021-07-19 14:18:38 +08:00
疯狂的狮子li 1891dbc566 fix 代码生成 queryType 重复勾选数据库无默认值问题 2021-07-19 10:04:56 +08:00
疯狂的狮子li 00b9043915 add 增加 OSS 模块业务代码 2021-07-18 20:27:37 +08:00
疯狂的狮子li fdd8c65b36 fix 修复接口单参数校验无效问题 2021-07-18 19:53:16 +08:00
疯狂的狮子li 7cffafcdaa update 增加OSS模块service自动激活 2021-07-18 19:29:33 +08:00
疯狂的狮子li f847f67982 update 更新OSS配置类 使用内部类结构 2021-07-18 18:41:47 +08:00
疯狂的狮子li 4b921f5e72 remove 移除无用配置 2021-07-18 18:22:55 +08:00
疯狂的狮子li 089e288a6e update 使用 策略+工厂 重写OSS模块 2021-07-18 18:20:21 +08:00
疯狂的狮子li d642c08c2e update 优化代码生成器注释格式 2021-07-18 18:19:16 +08:00
疯狂的狮子li 7e90d84598 add 增加 OSS 对象存储模块 相关代码(未完成) 2021-07-17 20:44:27 +08:00
疯狂的狮子li d7fde6fe0d fix 代码生成器 queryType >= <= 标识符错误问题 2021-07-17 18:07:08 +08:00
疯狂的狮子li dfebbfc331 remove 删除无用文档与脚本 2021-07-14 14:47:48 +08:00
疯狂的狮子Li a42acb03ab !70 fix 未完全解决的代码生成字典问题 
Merge pull request !70 from Nguyendream/N/A
 2021-07-14 06:43:08 +00:00
疯狂的狮子li 28fa991fc2 update 修复 thread-pool: enabled 配置不生效问题 2021-07-14 10:43:33 +08:00
疯狂的狮子li 55546dfc80 发布 v2.5.1 针对 v2.5.0 版本新特性bug修复 2021-07-13 13:49:47 +08:00
疯狂的狮子li a412b6b03a update 验证码开关 转移到系统配置内 2021-07-13 13:38:53 +08:00
疯狂的狮子li fd5414f82e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/views/login.vue
	sql/ry_20210713.sql
 2021-07-13 13:34:10 +08:00
疯狂的狮子li 79965e30af fix 合并 pr !68 业务集群部署与文件上传的问题 2021-07-13 13:20:08 +08:00
疯狂的狮子li 5c8de41b32 fix 修复 docker业务集群部署与文件上传的问题 2021-07-13 13:12:32 +08:00
疯狂的狮子li 6bf38a806c fix 修复 docker业务集群部署与文件上传的问题 2021-07-13 13:11:37 +08:00
疯狂的狮子li 15c45eae11 fix 修复代码生成同步表结构id冲突问题 2021-07-13 13:08:47 +08:00
疯狂的狮子li 45b9acd57b fix 修复代码生成选择字典 无法取消问题 2021-07-13 11:32:02 +08:00
疯狂的狮子li 3b765f3ac9 fix 修复代码生成字典为null问题 2021-07-13 11:24:12 +08:00
疯狂的狮子li fdad98b321 Merge remote-tracking branch 'origin/dev' into dev 2021-07-12 14:30:05 +08:00
疯狂的狮子li 8ddd71a818 update 使用hutool重构 判断是否url 2021-07-12 14:29:49 +08:00
疯狂的狮子Li 1cbe4c0d88 Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev 2021-07-12 03:39:26 +00:00
疯狂的狮子li cd34c87afa fix 修复升级合并错误 2021-07-12 11:00:12 +08:00
疯狂的狮子li d30ba9d52e 发布 v2.5.0 2021-07-12 09:58:32 +08:00
疯狂的狮子li e085ec9418 发布 v2.5.0 2021-07-12 09:53:46 +08:00
疯狂的狮子li aac20ca789 update hutool 5.7.4 2021-07-12 09:46:05 +08:00
疯狂的狮子li 599016a63a update 同步ruoyi修正差异 2021-07-12 09:44:46 +08:00
疯狂的狮子li 8231953e29 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-generator/pom.xml
	ruoyi-quartz/pom.xml
	ruoyi-system/pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/index.vue
 2021-07-12 09:37:23 +08:00
疯狂的狮子li ea506de048 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/directive/index.js
	ruoyi-ui/src/directive/permission/hasPermi.js
	ruoyi-ui/src/directive/permission/hasRole.js
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/system/notice/index.vue
 2021-07-09 18:07:32 +08:00
疯狂的狮子li d6bb7ab832 update 更新 admin client 与 actuator 配置到 环境配置文件 2021-07-09 17:41:45 +08:00
疯狂的狮子li 43486f2f41 update 配置 monitor-admin docker编排 2021-07-09 17:15:09 +08:00
疯狂的狮子li 1c11d7ccc1 update 转移 springboot-admin 到扩展模块项目 2021-07-09 15:30:40 +08:00
疯狂的狮子li 33ae270b0d update 更新 nginx https 配置 2021-07-09 14:14:16 +08:00
疯狂的狮子li 4c500eb50c update 更新 部署文档 2021-07-08 21:01:57 +08:00
疯狂的狮子li dcad0cdf92 update 更新 业务模块 集群配置 2021-07-08 20:34:24 +08:00
疯狂的狮子li bc5898b8cd update 更新 nginx 配置文件 2021-07-08 20:34:12 +08:00
疯狂的狮子li 18705b4f26 update 更新文档 Docker 文档说明 2021-07-08 20:33:49 +08:00
疯狂的狮子li e169366638 update 更新文档 PR 说明 2021-07-08 20:18:27 +08:00
疯狂的狮子li ae8c0b6c43 update 更新sql文件项目官网 2021-07-08 20:06:19 +08:00
疯狂的狮子li 6a8e281b66 update 更新docker脚本配置 2021-07-08 20:06:06 +08:00
疯狂的狮子li 821f54f1ab update 富文本接口返回值修正 2021-07-08 20:05:37 +08:00
疯狂的狮子li e30079d656 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/components/ImageUpload/index.vue
 2021-07-08 19:58:28 +08:00
疯狂的狮子li 6905522b91 update 优化 docker 配置 2021-07-08 16:47:34 +08:00
疯狂的狮子li d0bbcc4e77 update 更新 docker ip配置 2021-07-06 15:30:25 +08:00
疯狂的狮子li 282f3b0632 add 增加 docker 配置 2021-07-06 14:06:25 +08:00
疯狂的狮子li 80e74eb91c add 增加 docker 编排 与 shell 脚本 2021-07-06 13:48:06 +08:00
疯狂的狮子li 61e2a60438 update 同步 ruoyi 对新业务进行修正 2021-07-06 13:19:53 +08:00
疯狂的狮子li 59114a14ff update 同步 ruoyi 对新业务进行修正 2021-07-06 13:05:47 +08:00