xiaozhi/xiaozhi-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,014 Commits 1 Branch 0 Tags
bb2ade75a82d768db99a46cff54eecc0b67d4de0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子li bb2ade75a8 update 升级 hutool 5.7.1 适配工具类 2021-06-16 15:38:44 +08:00
疯狂的狮子li 7bdce848e7 update 升级 hutool 5.7.1 适配工具类 2021-06-16 15:36:45 +08:00
疯狂的狮子li feb7c85d57 update mybatis-plus 升级 3.4.3.1 fixbug 版本 2021-06-16 13:29:33 +08:00
疯狂的狮子li 2cdc12055d fix 修复 JsonUtils 参数为空报错 2021-06-16 13:15:18 +08:00
疯狂的狮子li 639816369a remove 移除无用swagger配置 2021-06-16 12:58:10 +08:00
疯狂的狮子li d98faaffee update 移除 fastjson 增加 jackson 工具类 重写相关业务 2021-06-13 15:39:35 +08:00
疯狂的狮子li c2cf7ba16a update 优化 jackson 序列化配置 2021-06-13 15:38:40 +08:00
疯狂的狮子li 5311937b69 update 增加 jackson 配置 默认序列化时间格式 2021-06-12 23:41:56 +08:00
疯狂的狮子li a044519b21 update 移除 基础类 字段生成判断 2021-06-12 23:40:34 +08:00
疯狂的狮子li 8349e631d2 update 优化 异步工厂重写 使用 spring 异步处理 2021-06-12 20:14:50 +08:00
疯狂的狮子li b3541e9758 update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题 2021-06-12 20:13:35 +08:00
疯狂的狮子li a51f7d52ed Merge remote-tracking branch 'origin/dev' into dev 2021-06-11 09:23:41 +08:00
疯狂的狮子li bf3a88ff1a 发版 v2.3.2 2021-06-11 09:23:34 +08:00
疯狂的狮子Li 346e80839f update spring-cache 与 MP二级缓存相关 2021-06-10 22:32:40 +08:00
疯狂的狮子li 24da85fea3 update MybatisPlus整合Redis二级缓存 2021-06-10 21:18:58 +08:00
疯狂的狮子li 57df2690da update spring-cache 整合 redisson 2021-06-10 20:23:15 +08:00
疯狂的狮子li 35f607f9a5 remove 删除无用注释 2021-06-10 18:23:59 +08:00
疯狂的狮子li 427430fc48 update 补全注释 更新文档 2021-06-10 17:11:44 +08:00
疯狂的狮子li 48d9fc10ea update 增加分页对象注释 2021-06-10 16:21:44 +08:00
疯狂的狮子li c5c8afe147 update 还原错误提交 2021-06-10 15:44:14 +08:00
疯狂的狮子li b348b766fc Merge remote-tracking branch 'origin/dev' into dev 2021-06-10 15:43:28 +08:00
疯狂的狮子li b561f7d906 remove 移除无用配置文件 2021-06-10 15:43:20 +08:00
疯狂的狮子li 9d05d2bac5 remove 移除无用配置文件 2021-06-10 15:42:46 +08:00
疯狂的狮子li f6ccfe6ed3 update 独立 CountDownLatch 方法 2021-06-10 14:04:41 +08:00
疯狂的狮子li 1bf9dd1217 update 优化redis锁工具代码结构 2021-06-10 13:32:50 +08:00
疯狂的狮子li 524683eabd update swagger 升级为 3.0.0 使用 OAS_30 协议 2021-06-10 09:57:34 +08:00
疯狂的狮子li 2103731f10 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/core/config/SwaggerConfig.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/online/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/dict/data.vue
	ruoyi-ui/src/views/system/dict/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
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/src/views/tool/swagger/index.vue
 2021-06-10 09:44:56 +08:00
疯狂的狮子li ceeac476ec update 优化 代码生成器 增加表单防重注解 2021-06-10 00:04:19 +08:00
疯狂的狮子li a6ba7d9093 update 优化pr redis工具代码 2021-06-09 23:31:47 +08:00
疯狂的狮子li 00d024ff86 fix 修复相对路径上传异常问题 2021-06-04 18:11:46 +08:00
疯狂的狮子li f087b37cb3 update 优化 锁切面代码 key到常量类 2021-06-04 16:46:28 +08:00
疯狂的狮子li 450c6759eb 发布 2.3.1 2021-06-04 16:11:17 +08:00
疯狂的狮子li dcf125a08a update 优化 redis锁pr 代码 2021-06-04 16:09:43 +08:00
疯狂的狮子li 6fc141497a update 优化分页默认值 默认查全部 2021-06-04 10:48:35 +08:00
疯狂的狮子li d674d934e7 fix 修复上传路径 win 打包编译为 win 路径, linux 报错问题 2021-06-04 09:46:28 +08:00
疯狂的狮子li 85bf5fbc9b fix 修复主键列表显示 重复生成bug 2021-06-03 17:33:48 +08:00
疯狂的狮子li 01c34b837d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/views/system/menu/index.vue
 2021-06-03 09:46:33 +08:00
疯狂的狮子li 5cc9b34132 update 更新文档 增加 star MIT IDEA 等小标签 2021-06-02 23:02:51 +08:00
疯狂的狮子li a5975a489c update 更新文档 增加 star MIT IDEA 等小标签 2021-06-02 22:55:56 +08:00
疯狂的狮子li edaf57148a update 更新开源协议软件名 2021-06-02 22:55:02 +08:00
疯狂的狮子Li 2ab7c7feae !47 【优化】代码生成器新增、修改页面的按钮动作loading从页面loading到按钮loading 
Merge pull request !47 from 狂盗一枝梅/kdyzm
 2021-06-02 18:20:06 +08:00
疯狂的狮子li 329c95196e update 更新测试案例 2021-06-02 17:15:20 +08:00
疯狂的狮子Li 375a7f7b4c !45 【优化】为代码生成器生成的前端代码添加loading；删除方法回调函数变更为箭头表达式 
Merge pull request !45 from 狂盗一枝梅/kdyzm
 2021-06-02 17:10:40 +08:00
疯狂的狮子li 2ee2e4505a fix 修复配置文件书写错误 2021-06-02 14:28:40 +08:00
疯狂的狮子li 7c20d6e28c update 优化代码书写格式 使用工具类 2021-06-02 12:47:54 +08:00
疯狂的狮子li a961fff69d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
 2021-06-02 12:42:18 +08:00
疯狂的狮子li 45fe77ce4a update 文档增加 Oracle 分支路径配置 2021-06-02 09:49:16 +08:00
疯狂的狮子li a4edce5a93 Merge remote-tracking branch 'origin/dev' into dev 2021-06-02 09:41:19 +08:00
疯狂的狮子li 83ba79dca2 update 增加redis空密码兼容性 2021-06-02 09:41:12 +08:00
疯狂的狮子li d1351503a8 update 优化代码书写格式 去除警告 2021-06-01 23:14:42 +08:00
疯狂的狮子li d9dd76f2ae 发布 v2.3.0 2021-06-01 10:54:59 +08:00
疯狂的狮子li d815317d7c 发布 v2.3.0 2021-06-01 10:21:56 +08:00
疯狂的狮子li 7bbeea0b81 update 更新文档 增加 redisson 内容 2021-05-31 23:38:30 +08:00
疯狂的狮子li 99c4692a0d update 升级 luttuce 为 redisson 性能更强 工具更全 2021-05-31 23:21:14 +08:00
疯狂的狮子li f3aaa7ea7a Merge remote-tracking branch 'origin/dev' into dev 2021-05-31 17:44:03 +08:00
疯狂的狮子Li 38c3c878e1 !44 修改批量接口，改用mybatis原生foreach优化性能 
Merge pull request !44 from Yjoioooo/insert-optimization
 2021-05-31 17:43:53 +08:00
疯狂的狮子li 079dc12fe1 update 优化 system 模块 删除性能 2021-05-31 16:55:26 +08:00
疯狂的狮子li d7359122b4 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
	ry.sh
 2021-05-31 13:21:29 +08:00
疯狂的狮子li 7b7f098dee update 文档更新数据权限使用 2021-05-30 02:25:56 +08:00
疯狂的狮子li a02aeb468e add 增加demo模块 树表演示案例(包含数据权限) 2021-05-30 02:25:14 +08:00
疯狂的狮子li a3a682eeb1 add 增加demo模块 单表演示案例(包含数据权限) 2021-05-30 02:24:10 +08:00
疯狂的狮子li 456f31901c add 增加测试数据sql文件 2021-05-30 02:22:19 +08:00
疯狂的狮子li 6d5a0d8a7e update 完美修复 数据权限功能(支持单表多表过滤) 2021-05-30 02:20:21 +08:00
疯狂的狮子li 6192d42564 update 优化代码生成模板 2021-05-30 02:18:34 +08:00
疯狂的狮子li 8cc2aee13e fix 修复单表数据权限问题 2021-05-29 21:54:20 +08:00
疯狂的狮子li 0860934888 update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 21:52:15 +08:00
疯狂的狮子Li d2b077af35 fix 修复数据权限编写错误 2021-05-29 21:48:56 +08:00
疯狂的狮子li 06513446a0 update 还原数据权限修改 2021-05-29 19:44:33 +08:00
疯狂的狮子li 57e071fe6b 发布 2.2.1 2021-05-29 18:57:56 +08:00
疯狂的狮子li 8d761fa60c update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 18:54:35 +08:00
疯狂的狮子li b7bd67b4cb update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 18:41:32 +08:00
疯狂的狮子li ead1136e31 add 增加 security 权限框架 @Async 异步注解配置 2021-05-28 14:24:45 +08:00
疯狂的狮子li 3d54400163 update 增加修改包名文档 2021-05-28 11:08:51 +08:00
疯狂的狮子li 7779cbca4d update 优化参数&字典缓存操作 2021-05-28 10:30:11 +08:00
疯狂的狮子li 8d6c9e116d Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
 2021-05-28 10:07:48 +08:00
疯狂的狮子li d0b2166525 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.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-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-ui/src/api/system/config.js
	ruoyi-ui/src/api/system/dict/type.js
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dict/index.vue
 2021-05-28 10:07:15 +08:00
疯狂的狮子li b4f9d3a8f2 update 优化dataScope参数防止注入 2021-05-27 22:06:36 +08:00
疯狂的狮子li 8a6bc41938 update 文档增加演示图例 2021-05-26 16:44:59 +08:00
疯狂的狮子li d2f0ea6fa0 fix 修复sql符号错误 2021-05-26 09:23:56 +08:00
疯狂的狮子li a42c1e4711 remove 删除提交错误文件 2021-05-25 14:32:41 +08:00
疯狂的狮子li 380b4e5f3a 配置文件错误 2021-05-25 14:28:38 +08:00
疯狂的狮子li a570589dcc 发布 v2.2.0 2021-05-25 14:11:32 +08:00
疯狂的狮子li 2885ced2c7 add 增加验证码开关 2021-05-25 14:02:50 +08:00
疯狂的狮子li 3131b7ea9d fix redis反序列化异常问题 2021-05-25 13:40:18 +08:00
疯狂的狮子li ca903ebd1f update 更新捐献二维码 2021-05-25 10:32:19 +08:00
疯狂的狮子li a2ca46004b update 更新捐献码 2021-05-25 10:17:43 +08:00
疯狂的狮子li 5795958a18 update 同步升级 ruoyi-vue 3.5.0 2021-05-25 10:14:18 +08:00
疯狂的狮子li 6c195af2a3 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/filter/XssHttpServletRequestWrapper.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-generator/pom.xml
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-quartz/pom.xml
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
	ruoyi-system/pom.xml
	ruoyi-ui/package.json
	ruoyi-ui/public/index.html
	ruoyi-ui/src/views/index.vue
	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/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-05-25 10:00:36 +08:00
疯狂的狮子li caa81d1f4d Merge remote-tracking branch 'origin/dev' into dev 2021-05-24 16:12:46 +08:00
疯狂的狮子li 5f584e683a update redis序列化修改为使用jackson 2021-05-24 16:12:40 +08:00
疯狂的狮子li a272ea07a9 !38 修改bo代码生成器，修改无法更新代码生成器是否必填为否问题 
Merge pull request !38 from Yjoioooo/master
 2021-05-22 23:40:26 +08:00
疯狂的狮子li 1d38d51ac1 发布 2.1.2 2021-05-21 17:58:04 +08:00
疯狂的狮子li f80b8f0d42 update springboot 升级 2.3.11 
update mybatis-plus 升级 3.4.3 分页Plus对象适配更新
 2021-05-21 17:58:03 +08:00
疯狂的狮子li d0dbe49bfd update 增加请求前缀 2021-05-21 17:58:02 +08:00
疯狂的狮子li 39a0e05f87 update 请求响应对象 与 分页对象 结构修改 适配接口文档配置 2021-05-21 17:58:01 +08:00
疯狂的狮子li 34e7f20f24 update 验证码生成更新为无符号整数计算 2021-05-21 17:58:01 +08:00
疯狂的狮子li dc7eeaa45d 发布 2.1.2 2021-05-21 17:57:13 +08:00
疯狂的狮子li 97a237bbdc update springboot 升级 2.3.11 
update mybatis-plus 升级 3.4.3 分页Plus对象适配更新
 2021-05-21 11:50:47 +08:00
疯狂的狮子li 3d25dfbebe update 增加请求前缀 2021-05-20 17:00:18 +08:00
疯狂的狮子li 7076deb2b6 update 请求响应对象 与 分页对象 结构修改 适配接口文档配置 2021-05-20 13:23:12 +08:00