xiaozhi/xiaozhi-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,222 Commits 1 Branch 0 Tags
1891dbc56684a039e6b00a8e943866809f93903b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子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
疯狂的狮子li aa14085746 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-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.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/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/api/system/role.js
	ruoyi-ui/src/api/system/user.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-07-06 12:01:05 +08:00
疯狂的狮子li 9ac87fd66f update 优化中英文语言配置 2021-07-06 11:39:14 +08:00
疯狂的狮子li 54688ce7c7 update 优化批量插入执行器 增加主键类型枚举对应生成策略 2021-07-05 18:17:49 +08:00
疯狂的狮子li 2fc3dcfc74 update 更改演示案例 2021-07-05 16:35:15 +08:00
疯狂的狮子Li 769e298e0a !66 修复 按钮loading卡死的问题 
Merge pull request !66 from Nguyendream/N/A
 2021-07-05 01:31:49 +00:00
疯狂的狮子li 2704e921c8 update 增加 feign 熔断 自定义结构体解析方法 与 demo 注释 2021-07-04 19:18:06 +08:00
疯狂的狮子li 99051916eb update 升级 springboot 2.4.8 2021-07-04 13:24:19 +08:00
疯狂的狮子li de194880ae update 关闭默认二级缓存 推荐使用 spring-cache 注解手动缓存 2021-07-04 02:21:04 +08:00
疯狂的狮子li c26073afeb update 优化缓存配置 增加spring-cache演示案例 2021-07-04 02:13:24 +08:00
疯狂的狮子li b9128b6074 update 依赖升级 2021-07-03 23:52:39 +08:00
疯狂的狮子li d6ca9e548d Merge remote-tracking branch 'origin/dev' into dev 2021-07-02 09:39:14 +08:00
疯狂的狮子li 2d8f380b71 update 优化 增加MP注入异常拦截 2021-07-02 09:39:07 +08:00
疯狂的狮子li 5647cf7a7e update 规范maven写法 2021-07-01 10:42:24 +08:00
疯狂的狮子li d4be4df871 update 优化代码生成器 批量导入 2021-06-30 13:37:11 +08:00
疯狂的狮子li d92560b64b fix 修复 hutool StrUtil.containsAny 传入参数后返回结果不一致问题 2021-06-29 15:22:45 +08:00
疯狂的狮子Li 4952f7dcdb !61 update ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java. 
Merge pull request !61 from 陆继保/N/A
 2021-06-29 07:17:35 +00:00
疯狂的狮子li 10a6a9192d update 更新 MP 详细日志配置 2021-06-29 09:57:45 +08:00
疯狂的狮子li 99de90a015 update 更新配置注释(规范使用方法) 2021-06-28 19:23:02 +08:00
疯狂的狮子li cb54546259 Merge remote-tracking branch 'origin/dev' into dev 2021-06-28 13:54:53 +08:00
疯狂的狮子li efd1fc017b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
	ruoyi-ui/vue.config.js
 2021-06-28 13:52:19 +08:00
疯狂的狮子Li b73a67455d update README.md. 2021-06-25 08:01:54 +00:00
疯狂的狮子Li b51b8b1b41 update README.md. 2021-06-25 08:00:38 +00:00
疯狂的狮子li 4d7ef44aee Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-06-24 17:14:15 +08:00
疯狂的狮子li 3148781045 update 更新文档 提问四部曲 2021-06-24 17:13:19 +08:00
疯狂的狮子li 96507d3709 update 更新文档 提问四部曲 2021-06-24 17:12:48 +08:00
疯狂的狮子li 5ddfd5bf11 update 更新文档 提问四部曲 2021-06-24 17:10:38 +08:00
疯狂的狮子li beef02a4b6 update 更新文档 提问四部曲 2021-06-24 17:10:03 +08:00
疯狂的狮子li 4962ec7589 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-06-24 15:46:01 +08:00
疯狂的狮子li cc2fbc7b89 fix 相对路径下载问题 2021-06-24 15:42:51 +08:00
疯狂的狮子li 66f453452e fix 相对路径下载问题 2021-06-24 15:41:16 +08:00
疯狂的狮子li 24c7ff7959 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-06-24 09:54:13 +08:00
疯狂的狮子li dfd7f594b5 update 更新文档版本 2021-06-24 09:39:33 +08:00
疯狂的狮子li 9b76b5ac98 update 更新文档版本 2021-06-24 09:39:14 +08:00
疯狂的狮子Li 9edab3dc55 !58 同步dev分支 
Merge pull request !58 from 疯狂的狮子Li/dev
 2021-06-24 01:36:00 +00:00
疯狂的狮子li 3eee19c9a2 Merge remote-tracking branch 'origin/dev' into dev 2021-06-24 09:34:16 +08:00
疯狂的狮子li 8195e948a1 发布 v2.4.0 2021-06-24 09:34:06 +08:00
疯狂的狮子li ae43edeb4f update 更新 初始化项目 文档地址 2021-06-23 21:24:13 +08:00
疯狂的狮子li 1488a09b8e Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-06-23 18:08:17 +08:00
疯狂的狮子li 152a386ac1 add 增加 Swagger3 用法示例 2021-06-23 17:01:30 +08:00
疯狂的狮子li c4712bcb52 Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-06-23 15:31:22 +08:00
疯狂的狮子li 4545beab51 update 更新文档 增加 GitHub 地址 与其他小标签 2021-06-23 15:30:26 +08:00
疯狂的狮子li f48e807cee remove 删除无用测试类 2021-06-23 09:51:44 +08:00
疯狂的狮子li c12dc71ece Merge remote-tracking branch 'origin/dev' 
# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java
 2021-06-23 09:44:04 +08:00
疯狂的狮子li ce3562b3ea Merge remote-tracking branch 'origin/dev' 2021-06-23 09:43:31 +08:00
疯狂的狮子li d05458aa3a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	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/user/index.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
 2021-06-23 09:38:53 +08:00
疯狂的狮子li c822e2f6cc Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/views/monitor/druid/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/tool/swagger/index.vue
 2021-06-22 16:56:38 +08:00
疯狂的狮子li f098222a43 update 集成 Lock4j 分布式锁 2021-06-22 16:45:37 +08:00
疯狂的狮子li 1790c81603 fix 修复地址ip地址特殊回环问题 2021-06-22 14:12:51 +08:00
疯狂的狮子li fef57cb312 update 更新文档说明 2021-06-22 14:01:35 +08:00