xiaozhi/xiaozhi-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,159 Commits 1 Branch 0 Tags
3fef2b68dc4e30eb9787c23c8154eb1d37e5a99e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子Li 3fef2b68dc !129 重命名通用 数据权限 服务接口类名称，与其他服务接口风格统一 
Merge pull request !129 from KonBAI/fix-rename-DataScopeService
 2022-01-15 17:44:34 +00:00
疯狂的狮子li 0b09272a60 update 代码生成调整 2022-01-13 15:28:00 +08:00
疯狂的狮子li f9129bd54e update 代码生成调整 删除无用导报与逻辑 2022-01-13 15:23:17 +08:00
疯狂的狮子li c0f3dff0f6 update 合并 satoken 解决不兼容不分 2022-01-13 11:27:09 +08:00
疯狂的狮子li 6ca8535166 Merge remote-tracking branch 'origin/satoken' into dev 
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
#	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
 2022-01-13 11:14:33 +08:00
疯狂的狮子li ff4a429136 update 升级 springboot 2.6.X 解决 springfox 兼容性问题 2022-01-13 11:07:09 +08:00
疯狂的狮子li 9a5cea2b23 update 降低开发环境 redis连接池数量 2022-01-13 10:46:10 +08:00
疯狂的狮子li cd1a68f15e update 防止 MP 无主键警告 2022-01-13 10:26:18 +08:00
疯狂的狮子li a0bed51d96 update 格式化代码 统一间隔符 
update 格式化代码 统一间隔符
 2022-01-13 09:58:16 +08:00
疯狂的狮子li 857dec38d1 update 代码模板 适配新改动 2022-01-13 09:49:08 +08:00
疯狂的狮子li 8f6484e470 [重磅更新] 重写项目整体结构 数据处理下沉至 Mapper 符合 MVC 规范 减少循环依赖 2022-01-12 21:22:26 +08:00
疯狂的狮子li 5413b37d71 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	README.md
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
#	ruoyi-ui/src/views/index.vue
 2022-01-12 20:53:03 +08:00
疯狂的狮子li 26fc652d33 update 统一代码间隔符 2022-01-11 16:58:47 +08:00
疯狂的狮子li fc8c96399f update 防重复提交标识组合 改为 key + url + header 2022-01-11 12:36:33 +08:00
疯狂的狮子li 9bad713db5 fix 修复 index-tree.vue.vm 漏删 #end 2022-01-11 11:30:53 +08:00
疯狂的狮子li 6f222ab02b fix 修复 通配符匹配无效 2022-01-11 09:30:38 +08:00
疯狂的狮子li e47596383a update 删除文档无用合并 2022-01-10 15:05:03 +08:00
疯狂的狮子Li 7487c92a52 add 增加 监控中心 自定义事件通知 2022-01-09 00:54:59 +08:00
疯狂的狮子Li 29cc9da934 update hutool 引入改为 bom 依赖项引入 2022-01-08 19:15:16 +08:00
疯狂的狮子Li eaeb324c74 update 指定 maven 资源过滤为具体文件 防止错误过滤 2022-01-08 18:41:42 +08:00
疯狂的狮子li d9a0de20f8 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
#	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
 2022-01-07 15:41:18 +08:00
疯狂的狮子li 92653f3deb Merge remote-tracking branch 'origin/dev' into dev 2022-01-04 10:10:59 +08:00
疯狂的狮子li c526ab1870 add 增加 RedisUtils 工具 hasKey 检查key存在方法 2022-01-04 09:48:20 +08:00
疯狂的狮子li 1c7d840ff6 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/SysUserController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
	ruoyi-generator/pom.xml
	ruoyi-job/pom.xml
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
	ruoyi-system/pom.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/api/system/user.js
	ruoyi-ui/src/utils/request.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2022-01-04 09:45:33 +08:00
疯狂的狮子Li 09b03465d8 update mybatis-plus 3.4.3.4 => 3.5.0 2022-01-02 13:14:16 +08:00
疯狂的狮子li fb673107f3 update 接口文档增加 basic 账号密码验证 2021-12-30 17:17:34 +08:00
疯狂的狮子li 293db76bd6 remove 移除过期代码 分页工具相关 2021-12-28 14:33:26 +08:00
疯狂的狮子li 5b257b2b57 remove 移除过期代码 多数据源切换 2021-12-28 14:33:08 +08:00
疯狂的狮子li 4e04f5e967 remove 移除过期代码 数据权限 2021-12-28 14:32:53 +08:00
疯狂的狮子li 29f0ded88b update 注释遗漏 老版本数据权限 2021-12-28 14:28:47 +08:00
疯狂的狮子li 6c4882b907 update 注释遗漏 老版本数据权限 2021-12-28 14:27:59 +08:00
疯狂的狮子li 45e6accd2a add 增加邮箱与银行卡脱敏策略 并应用到 SysUser 2021-12-28 12:03:00 +08:00
疯狂的狮子li 51b19fcff4 update 优化 数据脱敏pr 使用接口提高扩展性 2021-12-28 11:51:01 +08:00
疯狂的狮子li c4cfaab621 Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 11:24:58 +08:00
疯狂的狮子Li 8bf27bf76b !127 add 新增数据脱敏注解，可根据菜单权限字符控制是否脱敏 
Merge pull request !127 from Yjoioooo/auto-5403234-dev-1640272112776
 2021-12-28 03:24:34 +00:00
疯狂的狮子li ccb132374b update 更新 手动获取 延迟队列方法 2021-12-28 11:23:33 +08:00
疯狂的狮子li c82afc8c46 update RedisUtils 迁移到 utils/redis 包下 2021-12-28 11:23:33 +08:00
疯狂的狮子li 08e0ed4fc6 [重磅更新] 增加 轻量级 分布式队列 支持 2021-12-28 11:23:32 +08:00
疯狂的狮子li 261d9f8ebc update 合并 dev 处理差异 2021-12-28 10:38:25 +08:00
疯狂的狮子li 948ad86049 Merge remote-tracking branch 'origin/dev' into satoken 2021-12-28 10:37:43 +08:00
疯狂的狮子li ed659da488 发布 v3.5.0-release 正式版 2021-12-28 10:35:52 +08:00
疯狂的狮子li a8227453fc update hutool 5.7.17 => 5.7.18 bugfix 
update redisson 3.16.6 => 3.16.7 bugfix
 2021-12-27 11:43:59 +08:00
疯狂的狮子li 225eda7176 update 更新 Sa-Token 文档说明与连接 2021-12-27 11:06:12 +08:00
疯狂的狮子li dd37247e65 Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
#	ruoyi-common/pom.xml
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
#	ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.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/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
 2021-12-27 09:50:42 +08:00
疯狂的狮子li 295cd3670f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
 2021-12-27 09:30:12 +08:00
疯狂的狮子li 2a421deaa3 update 更改项目介绍 2021-12-24 12:39:13 +08:00
疯狂的狮子li 5ca038d888 update 调整监控依赖 从 common 迁移到 framework 2021-12-24 11:36:02 +08:00
疯狂的狮子li 3454e34c7c update 更新 文档 satoken 说明 2021-12-22 13:23:21 +08:00
疯狂的狮子li 619a80228f update springboot 2.5.7 => 2.5.8 升级预防 log4j2 问题 
update springboot-admin 2.5.4 => 2.5.5
update hutool 5.7.16 => 5.7.17
 2021-12-22 10:22:00 +08:00
疯狂的狮子li 89de1beb6f update 优化web拦截器 使用原生接口处理 默认非生产环境开启 2021-12-22 10:19:57 +08:00
疯狂的狮子li b6442b4640 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	pom.xml
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
 2021-12-22 10:10:29 +08:00
疯狂的狮子li 4c99cea3e4 update 更新批处理演示案例注释说明 2021-12-21 11:18:03 +08:00
疯狂的狮子li 1d54ef57c7 update 更新 nginx 配置文件关于 https 可能遇到的问题与解决方案说明 2021-12-21 10:54:57 +08:00
疯狂的狮子li 673b225da2 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	ruoyi-ui/vue.config.js
 2021-12-20 14:34:05 +08:00
疯狂的狮子li c3fe137720 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	ruoyi-ui/package.json
#	ruoyi-ui/vue.config.js
 2021-12-20 14:32:21 +08:00
疯狂的狮子li a3504dac6e 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/controller/BaseController.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/vue.config.js
 2021-12-20 09:47:56 +08:00
疯狂的狮子Li 08f4ae04e1 update 更新 jdbc 配置参考博客地址 2021-12-19 02:05:31 +08:00
疯狂的狮子Li 83d69ba507 add [重磅更新] 增加 jdbc 批处理参数 大幅提升批量操作性能 对原生语句与 MP 均有效 2021-12-18 22:59:55 +08:00
疯狂的狮子Li 63cb34b563 update 优化 pr 调整导包位置 2021-12-18 18:34:23 +08:00
疯狂的狮子Li 271e42176c !126 自动生成代码未引入此依赖 import com.baomidou.mybatisplus.extension.plugins.pag 
Merge pull request !126 from 抓蛙师/auto-7465549-dev-1639814849312
 2021-12-18 10:19:34 +00:00
疯狂的狮子Li 5d2b162bea add 增加 DataPermissionHelper 类 便于操作数据权限变量 2021-12-17 21:52:11 +08:00
疯狂的狮子Li 3fce90dbb9 update 优化数据权限缓存合并为一个 标注版本注释 2021-12-17 21:50:14 +08:00
疯狂的狮子li d40b9324ca add oss下载增加 loading 层 2021-12-17 17:53:19 +08:00
疯狂的狮子li 6875935d37 fix 修复 集群雪花id重复问题 使用网卡信息绑定生成 2021-12-17 13:47:24 +08:00
疯狂的狮子li 3546ac2854 fix 修复 redisson 集群模式 路径未匹配协议头问题 2021-12-16 15:37:31 +08:00
疯狂的狮子li d600cdd8a0 add 代码生成增加 vue3 页面模板 2021-12-16 15:09:35 +08:00
疯狂的狮子li d2c6e27d07 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/views/system/user/index.vue
 2021-12-16 14:21:04 +08:00
疯狂的狮子li 8041ced02d update 数据权限增加全局缓存 提高处理性能 减少重复处理 2021-12-16 13:58:52 +08:00
疯狂的狮子li d81056cbe7 update 修改 缓存懒加载 为 false 默认启动预加载数据 2021-12-16 13:55:14 +08:00
疯狂的狮子li 44e8a012e2 update 去除 jdk17 标签 由于很多组件还未适配 导致一些问题 2021-12-16 12:10:42 +08:00
疯狂的狮子li 30483dacfb update 回滚错误修改 2021-12-16 11:52:55 +08:00
疯狂的狮子li 9d81d95700 update 代码生成 数据库功能使用 mapper 操作 规范用法避免滥用 2021-12-16 11:45:58 +08:00
疯狂的狮子li e6b45d4cdb update 数据权限注解支持类标注 2021-12-16 10:54:44 +08:00
疯狂的狮子li c2e28b5d94 update 修改 基础方法返回空判断 优化返回值 2021-12-16 10:54:26 +08:00
疯狂的狮子Li ffde310d30 update qiniu 7.8.0 => 7.9.0 
update minio 8.3.3 => 8.3.4
 2021-12-16 00:13:04 +08:00
疯狂的狮子Li 44bc7dd9a5 update 修改已过期方法 调整编译警告 2021-12-16 00:11:38 +08:00
疯狂的狮子Li 9e5b64e1b7 Merge remote-tracking branch 'origin/dev' into dev 2021-12-15 23:33:57 +08:00
疯狂的狮子Li 2599073f56 fix 修复数据权限 兜底sql处理逻辑问题 2021-12-15 23:33:51 +08:00
疯狂的狮子li a2d49f9981 update 更改演示案例多数据源注解 2021-12-15 17:28:41 +08:00
疯狂的狮子li 877a9d510b update tlog 1.3.5 => 1.3.6 修复 jdk17 不兼容问题 2021-12-15 15:33:31 +08:00
疯狂的狮子li 2455d0b859 add 增加 自定义 Xss 校验注解 用户导入增加 Bean 校验 2021-12-15 15:03:44 +08:00
疯狂的狮子li b3c3afc2b4 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/domain/entity/SysUser.java
	ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
 2021-12-15 14:12:36 +08:00
疯狂的狮子li 3f97d19381 update [重磅更新] 重构分页 简化使用 2021-12-15 13:29:54 +08:00
疯狂的狮子li 3ab3d49055 update 清除警告 2021-12-15 13:23:16 +08:00
疯狂的狮子li bd89cc0287 update ServicePlusImpl 功能 下沉到 BaseMapperPlus 2021-12-15 12:17:04 +08:00
疯狂的狮子li 5e38e054a7 update hutool 工具 改为单包引入 减少无用依赖 2021-12-15 10:44:50 +08:00
疯狂的狮子Li 317f6d5c87 fix 修复代码生成 sql异常 屏蔽代码生成数据权限过滤 2021-12-14 23:47:59 +08:00
疯狂的狮子li c876776a25 update 更正包名书写错误 2021-12-14 18:00:38 +08:00
疯狂的狮子li c5dbd04c9c fix 修复数据权限 仅自己 相关问题 2021-12-14 10:11:16 +08:00
疯狂的狮子li 2a8a72a085 add 新增 Vue3 分支(由于组件还未完善 仅供学习) 2021-12-13 20:33:31 +08:00
疯狂的狮子li 29c46a15f9 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	README.md
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-framework/pom.xml
	ruoyi-generator/pom.xml
	ruoyi-job/pom.xml
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
	ruoyi-system/pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.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/SysMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/directive/index.js
	ruoyi-ui/src/plugins/download.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/monitor/online/index.vue
	ruoyi-ui/src/views/system/user/authRole.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue
 2021-12-13 12:37:36 +08:00
疯狂的狮子Li aae3fe5305 update [重大更新] 重写数据权限实现 2021-12-13 03:49:05 +00:00
疯狂的狮子li abc378c727 fix 修复代码生成 导出注解错误 2021-12-13 10:03:00 +08:00
疯狂的狮子li 79fc16eeb7 fix 修复代码生成 导出注解错误 2021-12-13 10:02:32 +08:00
疯狂的狮子Li c9e9341b4a fix 修复 在线用户key错误 2021-12-09 17:53:36 +08:00
疯狂的狮子Li da247c61b7 update 过滤离线用户 2021-12-09 16:32:32 +08:00
疯狂的狮子Li 2cd2e6dd19 update 删除异常用户token 2021-12-09 16:22:10 +08:00
疯狂的狮子Li e442bce607 update 删除异常用户token 2021-12-09 16:21:26 +08:00
疯狂的狮子Li f7664a2d7e update 查询在线用户检查是否已经离线 如果离线则清除token 2021-12-09 16:08:18 +08:00
疯狂的狮子li 8a5c8d0db5 update 补全缺失导包 2021-12-09 11:52:27 +08:00