xiaozhi/xiaozhi-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
929 Commits 1 Branch 0 Tags
08609348883df8986e039566551046e0a1bf61d7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子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
疯狂的狮子li db18050b86 update 验证码生成更新为无符号整数计算 2021-05-19 22:57:34 +08:00
疯狂的狮子li 8c744e13bc 发布 v2.1.1 2021-05-18 11:38:18 +08:00
疯狂的狮子li eb12d7bd73 fix 修复swagger开关无法控制关闭问题 2021-05-18 11:38:17 +08:00
疯狂的狮子li 5e32b5f0bf update 配置统一提取为 properties 配置类 2021-05-18 11:38:16 +08:00
疯狂的狮子li 0fc1f4e10e update admin 实时监控日志 改为保留一天 2021-05-18 11:38:16 +08:00
疯狂的狮子li 3b79eff2f1 fix maven install 异常 2021-05-18 11:38:15 +08:00
疯狂的狮子li 92a54a5320 update 删除过期方法 2021-05-18 11:38:14 +08:00
疯狂的狮子li 65ca0f2554 update 修正更新说明错误 2021-05-18 11:38:14 +08:00
疯狂的狮子li 72de8f57a7 发布 v2.1.1 2021-05-18 11:37:24 +08:00
疯狂的狮子li c4eb641d9c fix 修复swagger开关无法控制关闭问题 2021-05-17 16:36:07 +08:00
疯狂的狮子li 2ebcffb22e update 配置统一提取为 properties 配置类 2021-05-17 13:39:59 +08:00
疯狂的狮子li 89fa1dff09 update admin 实时监控日志 改为保留一天 2021-05-16 10:42:47 +08:00
疯狂的狮子li 5bc6057050 fix maven install 异常 2021-05-16 10:29:13 +08:00
疯狂的狮子li 87164d574e update 删除过期方法 2021-05-16 09:25:19 +08:00
疯狂的狮子li b366f8b053 update 修正更新说明错误 2021-05-15 14:55:21 +08:00
疯狂的狮子li be6a9ba72c 发布 v2.1.0 2021-05-15 14:34:57 +08:00
疯狂的狮子li 3e08a8e1c1 update 通用Service接口 增加自定义vo转换函数 2021-05-15 14:34:56 +08:00
疯狂的狮子li 3c57f468c6 update swagger升级3.0.2 2021-05-15 14:34:55 +08:00
疯狂的狮子li 84c1841e85 remove 移除ruoyi自带服务监控(Admin已全部包含) 2021-05-15 14:34:55 +08:00
疯狂的狮子li a7833a3b72 remove 移除ruoyi自带服务监控(Admin已全部包含) 2021-05-15 14:34:54 +08:00
疯狂的狮子li df6f3e658a update 增强分页工具兼容性 2021-05-15 14:34:53 +08:00
疯狂的狮子li b885e1eeff 发布 v2.1.0 2021-05-15 14:33:53 +08:00
疯狂的狮子li 69b9a4db2b update 通用Service接口 增加自定义vo转换函数 2021-05-15 14:27:29 +08:00
疯狂的狮子li ee064fa84c update swagger升级3.0.2 2021-05-15 14:25:48 +08:00
疯狂的狮子li 9d94d0fce9 remove 移除ruoyi自带服务监控(Admin已全部包含) 2021-05-15 14:25:07 +08:00
疯狂的狮子li b5064021e6 remove 移除ruoyi自带服务监控(Admin已全部包含) 2021-05-15 14:23:43 +08:00
疯狂的狮子li 31db658929 update 增强分页工具兼容性 2021-05-15 11:32:05 +08:00
疯狂的狮子li 322d9d66a8 !36 同步dev分支 
Merge pull request !36 from 疯狂的狮子li/dev
 2021-05-14 21:43:57 +08:00
疯狂的狮子li 488cce767f update 打包插件更新 2.3.10 2021-05-14 21:43:28 +08:00
疯狂的狮子li 2316379160 !35 同步dev分支 
Merge pull request !35 from 疯狂的狮子li/dev
 2021-05-14 21:40:56 +08:00
疯狂的狮子li d459bb61dc update 打包插件更新 2.3.10 2021-05-14 21:38:41 +08:00
疯狂的狮子li 590f4e07af !34 同步dev分支 
Merge pull request !34 from 疯狂的狮子li/dev
 2021-05-14 21:12:59 +08:00
疯狂的狮子li e071b4315a 正式发布 v2.0.0 2021-05-14 21:07:20 +08:00
疯狂的狮子li 869e975ed1 update springboot 升级 2.3.10 依赖全面升级适配 2021-05-14 17:03:19 +08:00
疯狂的狮子li dab99405c5 update springboot 升级 2.3.10 依赖全面升级适配 2021-05-14 16:58:09 +08:00
疯狂的狮子li d2c745d3fd add 代码生成器 增加校验注解 2021-05-14 15:12:40 +08:00
疯狂的狮子li 6067cb1797 add 增加增强Mapper 重写业务适配 2021-05-14 13:01:18 +08:00
疯狂的狮子li 51efddcfb0 update 重写文档介绍 2021-05-14 11:19:50 +08:00
疯狂的狮子li 0c7e52d9c3 update 代码生成器修改为MP分页(完成) 2021-05-14 10:44:04 +08:00
疯狂的狮子li 81b50b9b3c update 代码生成器修改为MP分页(未完成) 2021-05-13 23:52:36 +08:00
疯狂的狮子li 7c26e516c9 update 更新数据权限相关注意事项 2021-05-13 22:45:26 +08:00
疯狂的狮子li 9c95c93630 fix 修复系统配置表 sql符号错误问题 2021-05-13 22:44:30 +08:00
疯狂的狮子li 7f73591742 fix 修复代码生成 数据权限问题 2021-05-13 22:43:14 +08:00
疯狂的狮子li f01bb5966a update 使用 MP 分页工具 重构业务 2021-05-13 21:25:51 +08:00
疯狂的狮子li b0417338cc add 增加升级版通用Service IServicePlus 2021-05-13 21:24:47 +08:00
疯狂的狮子li 20e82d708b remove 移除 pagehelper 分页工具 2021-05-13 21:23:50 +08:00
疯狂的狮子li 9f5a03edcd add 增加分页工具 2021-05-13 21:22:51 +08:00
疯狂的狮子li a34fef3478 !33 版本更新 v1.0.2 
Merge pull request !33 from 疯狂的狮子li/dev
 2021-05-13 09:21:08 +08:00
疯狂的狮子li 685504e1d0 版本更新 v1.0.2 2021-05-13 09:20:02 +08:00
疯狂的狮子li fddc128156 update 更新整合打包文档 重新排版 2021-05-13 09:17:12 +08:00
疯狂的狮子li 9159e2ed22 fix vue与boot整合打包与admin页面路由冲突 2021-05-13 09:16:28 +08:00
疯狂的狮子li 15fdb9b218 !32 版本更新 v1.0.1 
Merge pull request !32 from 疯狂的狮子li/dev
 2021-05-11 17:37:27 +08:00
疯狂的狮子li 3b73bbe0ac 版本更新 v1.0.1 2021-05-11 17:36:52 +08:00
疯狂的狮子li c33c3de43a 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/monitor/SysOperlogController.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-ui/src/assets/styles/element-ui.scss
	ruoyi-ui/src/views/index.vue
 2021-05-11 17:14:53 +08:00
疯狂的狮子li dafdb43c84 update 配置转移到 yml 文件 统一管理 2021-05-11 10:02:32 +08:00
疯狂的狮子li 961c60dd1a update 更新banner 2021-05-10 23:53:15 +08:00
疯狂的狮子li e124de4b80 !31 同步dev分支 
Merge pull request !31 from 疯狂的狮子li/dev
 2021-05-10 15:35:09 +08:00
疯狂的狮子li 98624e66e5 正式发布 1.0.0 2021-05-10 15:34:17 +08:00
疯狂的狮子li 5343b03493 update 更新作者二维码 2021-05-08 23:57:09 +08:00
疯狂的狮子li 60895bf8d6 update 更新作者二维码 2021-05-08 23:54:52 +08:00
疯狂的狮子li d50e7a3d17 !30 同步dev分支 
Merge pull request !30 from 疯狂的狮子li/dev
 2021-05-08 23:39:50 +08:00
疯狂的狮子li a181c09786 fix 修复数据权限问题 2021-05-08 23:35:39 +08:00
疯狂的狮子li 7c8dd238de !29 同步dev分支 
Merge pull request !29 from 疯狂的狮子li/dev
 2021-05-08 17:08:21 +08:00
疯狂的狮子li 0b6952d0fe fix 日志时间sql符号转换问题 2021-05-08 17:05:18 +08:00
疯狂的狮子li 6ce4c93b3c fix 日志时间sql符号转换问题 2021-05-08 16:55:50 +08:00