xiaozhi/xiaozhi-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,603 Commits 1 Branch 0 Tags
f85bad33886c792e5968e8583cbfbbf76dbcf8d7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子li f85bad3388 update 调整依赖结构 解决依赖冲突 2021-09-22 11:10:10 +08:00
疯狂的狮子li e9b0289eff update 优化代码生成 根据MP生成特性 调整导入表结构默认值合理化 2021-09-22 11:09:42 +08:00
疯狂的狮子li 40984e201e update 同步ruoyi修改命名 2021-09-22 10:12:49 +08:00
疯狂的狮子li 76bf987203 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
 2021-09-22 10:09:15 +08:00
疯狂的狮子Li 5306a45093 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
 2021-09-20 17:53:25 +08:00
疯狂的狮子li 8f7ed66544 update 优化aop语法 使用spring自动注入注解 基于注解拦截的aop注解不可能为空 2021-09-18 18:20:21 +08:00
疯狂的狮子li c99b9262a8 update 优化aop写法 使用spring自动注入注解参数 2021-09-18 18:05:50 +08:00
疯狂的狮子li 2ccbaf9143 update 补全 @Override 注解 2021-09-18 18:05:28 +08:00
疯狂的狮子li d54ab2733c update 简化数据字典使用 2021-09-18 17:04:25 +08:00
疯狂的狮子li 2f18d0d709 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	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/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-09-18 16:01:52 +08:00
疯狂的狮子li 41c75a808a update easyexcel 2.2.10 => 2.2.11 
update hutool 5.7.11 => 5.7.13
 2021-09-18 15:48:43 +08:00
疯狂的狮子li 1e55853036 update 更新 分布式幂等 文档说明 2021-09-18 15:47:52 +08:00
疯狂的狮子li 931ed0eb00 update [重大改动]重写 防重提交实现 使用分布式锁 解决并发问题 压测通过 2021-09-18 15:44:36 +08:00
疯狂的狮子Li 9342bbef56 fix 修复合并错误 2021-09-17 15:39:27 +00:00
疯狂的狮子Li f3a8b4625f 修复 全局限流key会多出一个"-" 将其移动到IP后面 去除多余的空格 2021-09-17 09:32:43 +00:00
疯狂的狮子li 4021020d3b update 更新 集群限流说明 2021-09-17 17:23:07 +08:00
疯狂的狮子li 2569e8c0a4 add 增加 集群限流演示案例 2021-09-17 17:22:55 +08:00
疯狂的狮子li dcaeb18870 add 增加 集群限流功能 2021-09-17 17:22:45 +08:00
疯狂的狮子li 30fe14c0ff add 增加 获取redis客户端实例id工具 2021-09-17 17:22:25 +08:00
疯狂的狮子li 089b3d6e6d update 更新限流 README.md 说明 2021-09-17 16:20:46 +08:00
疯狂的狮子li 17b90f8381 add 增加 限流演示案例 2021-09-17 16:20:26 +08:00
疯狂的狮子li f9c62fc23b update 使用 Redisson 限流工具 重写限流实现 2021-09-17 16:20:05 +08:00
疯狂的狮子li 900867df02 add RedisUtils 增加限流工具 2021-09-17 16:19:12 +08:00
疯狂的狮子li 50599487f8 update [重大改动] 将 framework 与 system 模块 解耦 2021-09-17 14:48:36 +08:00
疯狂的狮子li 2b53e9d86a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
 2021-09-17 11:12:43 +08:00
疯狂的狮子li d71e35893d update 重写框架 README.md 格式更友好 通俗易懂 2021-09-15 12:05:24 +08:00
疯狂的狮子li efd277e7ed update 用户未登录日志改为 warn 级别 2021-09-15 10:53:14 +08:00
疯狂的狮子li d3d3972bea update OSS模块 关于下载403报错信息优化 2021-09-14 17:52:19 +08:00
疯狂的狮子li 5285735c7a add 增加 redis redisson 集群配置 2021-09-14 16:57:07 +08:00
疯狂的狮子li 9bc5414b44 update 更新 Actuator prod 默认暴漏端点 增加暴漏 logfile 日志端点 2021-09-14 12:17:16 +08:00
疯狂的狮子li 6e28683411 update 默认适配jdk11 2021-09-14 12:07:42 +08:00
疯狂的狮子li b27a8afc3b fix 修复多主键代码生成bug 2021-09-14 12:03:58 +08:00
疯狂的狮子li 662251e208 Merge remote-tracking branch 'origin/dev' into dev 2021-09-14 10:16:44 +08:00
疯狂的狮子li e314a5e333 update 更新文档扩展项目地址 2021-09-14 10:16:38 +08:00
疯狂的狮子Li a0c165c418 !92 fix 代码生成-当表未设置主键时第一个字段重复生成 
Merge pull request !92 from dawn9117/dev
 2021-09-13 13:25:18 +00:00
疯狂的狮子Li d6107025fa !89 update 字典类型 数据解析状态对应字典调整 
Merge pull request !89 from 抓蛙师/auto-7465549-dev-1631512665539
 2021-09-13 05:58:57 +00:00
疯狂的狮子li 188d27159d update 同步 ruoyi 3.7.0 修正改动 2021-09-13 13:17:01 +08:00
疯狂的狮子li 2af534eea4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
	ruoyi-framework/pom.xml
	ruoyi-generator/pom.xml
	ruoyi-quartz/pom.xml
	ruoyi-system/pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/components/ThemePicker/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Link.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	sql/ry_20210908.sql
 2021-09-13 13:03:58 +08:00
疯狂的狮子li 808bb9a958 update 更新关于 本地与云存储说明 2021-09-10 16:13:57 +08:00
疯狂的狮子li eca8ea1eb6 fix 修复 @Cacheable 与 @DataScope 冲突问题 2021-09-10 15:41:23 +08:00
疯狂的狮子li d9681e1791 update 更新 @Cacheable 错误用法 注意事项 2021-09-10 15:31:01 +08:00
疯狂的狮子li 7f96363ecb update 更新数据库最低版本说明 2021-09-10 11:52:31 +08:00
疯狂的狮子li c1c6c1cf30 update 将所有 云存储字样 改为 对象存储 避免误解 2021-09-10 10:51:40 +08:00
疯狂的狮子li 5bb7b0dda5 update 优化代码生成 insertByBo 方法 针对返回主键优化 2021-09-09 15:24:33 +08:00
疯狂的狮子li 61edd5588e Merge remote-tracking branch 'origin/dev' into dev 2021-09-09 10:17:58 +08:00
疯狂的狮子li e1c993c277 update 回滚 配置检测拦截是否有效SQL 因不通用 2021-09-09 10:17:40 +08:00
疯狂的狮子Li 3b5fb07c3d Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev 2021-09-07 05:49:53 +00:00
疯狂的狮子li ddf8d6ad6b 发布 v3.1.0 2021-09-07 13:48:22 +08:00
疯狂的狮子li 182edef28a update 所有业务适配 RedisUtils 新工具 2021-09-07 13:20:24 +08:00
疯狂的狮子li 97cffa048e add 过期 RedisCache 新增 RedisUtils 工具类 更灵巧便于使用 2021-09-07 13:19:34 +08:00
疯狂的狮子li c5d46591fe update 更新 jackson 配置 支持 LocalDateTime 全局格式化 2021-09-07 13:18:36 +08:00
疯狂的狮子li 38f03855eb update redisson 3.16.1 => 3.16.2 2021-09-07 09:53:14 +08:00
疯狂的狮子li 0d8421e7ab update 适配 mybatis-plus 升级更新 2021-09-06 16:42:03 +08:00
疯狂的狮子li 43301bee8b update 使用MP自行判断数据库类型 2021-09-06 16:10:33 +08:00
疯狂的狮子li 36b0ebf54c update 代码生成 查询数据库列表 按照时间倒序 2021-09-06 11:08:09 +08:00
疯狂的狮子li e7f83fb695 update mybatis-plus 3.4.3 => 3.4.3.3 适配升级 (包含不兼容升级) 请详细阅读 mybatis-plus 官方升级文档 2021-09-06 10:19:58 +08:00
疯狂的狮子li ab4b75fe30 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/assets/styles/variables.scss
	ruoyi-ui/src/components/ThemePicker/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/tagsView.js
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-09-06 09:59:28 +08:00
疯狂的狮子li 2d6c306ae1 update 优化 oss配置 使用发布订阅工具 刷新配置 2021-09-03 17:42:58 +08:00
疯狂的狮子li b2ab087313 add PageUtils 增加构造无参 TableDataInfo 方法 2021-09-03 17:35:44 +08:00
疯狂的狮子li 22daef0b51 update 泛型统一使用 V 2021-09-03 17:14:19 +08:00
疯狂的狮子li 067029eebe update 优化分页工具排序处理 2021-09-03 17:06:18 +08:00
疯狂的狮子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 94be46d065 fix 修复定时器工具编写错误问题 2021-08-26 18:03:33 +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