xiaozhi/xiaozhi-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,291 Commits 1 Branch 0 Tags
6751b97db9a892cdc91288e1a90dabfa3870b52f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子li 6751b97db9 fix 修复一些小问题 2022-02-25 18:34:37 +08:00
疯狂的狮子li 7faa364c53 update 更新minio容器 关于https相关参数配置 2022-02-25 09:47:57 +08:00
疯狂的狮子li 568e2a9337 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/Pagination/index.vue
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/utils/request.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/server/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
 2022-02-24 15:30:20 +08:00
疯狂的狮子Li 77756eb08d !146 无符号算数验证码两个随机数生成相同概率较高问题 
Merge pull request !146 from tmjAccount/dev
 2022-02-24 05:09:37 +00:00
疯狂的狮子li 81ff77c2d5 update 调整用户登录 将日志调整到最后 防止获取不到用户警告 2022-02-24 10:02:47 +08:00
疯狂的狮子Li d9b9f0b3d3 fix 修复测试账号 邮箱重复导致的问题 2022-02-22 21:37:48 +08:00
疯狂的狮子li 3517a8f494 update 优化 R 默认返回 msg 2022-02-22 14:03:53 +08:00
疯狂的狮子li 075f7fc19e update 增加 用户注册 用户类型默认值 2022-02-21 10:53:59 +08:00
疯狂的狮子li ea7ea2ec59 Merge remote-tracking branch 'origin/dev' into dev 2022-02-21 10:40:35 +08:00
疯狂的狮子li 64b183da36 update 增加用户登出日志 2022-02-21 10:40:28 +08:00
疯狂的狮子Li edce19e406 update 更新 多用户多设备的注释说明 2022-02-19 16:16:48 +08:00
疯狂的狮子Li 1687f20760 Merge remote-tracking branch 'origin/dev' into dev 2022-02-19 16:16:20 +08:00
疯狂的狮子Li 30e90619f5 update 更新微信商家二维码 2022-02-18 13:39:02 +00:00
疯狂的狮子Li d53dc28b83 !141 修正 StringUtils.format() 注释错误问题 
Merge pull request !141 from KonBAI/fix_StringUtils_Note
 2022-02-18 08:49:34 +00:00
疯狂的狮子li bb793d71e7 fix 修复 minio 适配 https 导致的问题 2022-02-18 14:05:32 +08:00
疯狂的狮子li 587fb27484 add 增加页面更新说明 2022-02-18 10:38:03 +08:00
疯狂的狮子li 7f305962f2 发布 4.0.0 2022-02-18 10:31:13 +08:00
疯狂的狮子li f6edb48df9 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-ui/src/components/Pagination/index.vue
 2022-02-18 09:57:51 +08:00
疯狂的狮子li 5c2992ef16 update 去除编译器警告 规范写法 2022-02-17 14:02:06 +08:00
疯狂的狮子li 86d5a1d190 update 更新 所有 oss 均支持 https 配置 2022-02-17 10:31:52 +08:00
疯狂的狮子li cb713e32d3 fix 修复 insertOrUpdateBatch 获取模板错误 2022-02-16 16:54:19 +08:00
疯狂的狮子Li 84fe0737de update 更新uuid去除默认值 漏改 2022-02-16 08:53:11 +00:00
疯狂的狮子li 4ea636366d update 优化代码生成 使用新 JsonUtils.parseMap 方法 2022-02-15 17:32:33 +08:00
疯狂的狮子li 54f5b59c8c update 优化代码生成 使用新 JsonUtils.parseMap 方法 2022-02-15 12:07:56 +08:00
疯狂的狮子li 657b6a9fae update 使用 hutool Dict 优化 JsonUtils 防止类型解析异常 2022-02-15 12:07:20 +08:00
疯狂的狮子li 6c01241b96 fix 回滚代码生成部分优化 修复优化导致的问题 2022-02-15 11:07:50 +08:00
疯狂的狮子li 961073ec96 update 优化 TreeBuildUtils 工具 使用反射自动获取顶级父id 2022-02-15 10:45:04 +08:00
疯狂的狮子li e2b786d97b update 更新 swagger 配置类错误注释 2022-02-14 18:30:26 +08:00
疯狂的狮子li 2fbf9ab7be fix 修复因升级 sa-token 导致 doLogin 无法获取 token 问题 2022-02-14 17:29:43 +08:00
疯狂的狮子li 68a23c4918 update 优化代码生成 2022-02-14 16:02:22 +08:00
疯狂的狮子li b49dbcdbbe update 修改验证码校验 增加 uuid 空判断 2022-02-14 14:31:57 +08:00
疯狂的狮子li ee2f74dc5e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	.gitignore
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.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/ISysLogininforService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.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/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.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/SysRoleServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/views/tool/build/index.vue
 2022-02-14 14:27:13 +08:00
疯狂的狮子li 8a2f988be6 update 返回体 统一 2022-02-11 17:46:36 +08:00
疯狂的狮子li 83c0b70a2d fix 修复 验证码 强制校验问题 2022-02-11 17:30:38 +08:00
疯狂的狮子li b7082c0eb4 fix 修复 R 参数位置错误 2022-02-11 16:49:26 +08:00
疯狂的狮子li 61e2a07ee2 update 使用 satoken 自带的 BCrypt 工具 替换 Security 加密工具 减少依赖 2022-02-11 15:03:09 +08:00
疯狂的狮子li 04c36018d6 update sa-token 1.28.0 => 1.29.0 2022-02-10 11:14:10 +08:00
疯狂的狮子li 1273421498 add 增加 issue 与 pr 模板 2022-02-10 09:32:26 +08:00
疯狂的狮子li 7bd34cb1da update 更新 swagger 注解用法 2022-02-09 19:44:48 +08:00
疯狂的狮子li d99dd4b875 update 调整oss预览开关 使用前端直接调用更改配置参数 2022-02-09 14:52:33 +08:00
疯狂的狮子Li 844e8b2f77 fix 修复 insertOrUpdateBatch 获取错误 class 类 2022-02-07 23:37:47 +08:00
疯狂的狮子Li 5a0a9e3a1c update 更新文档说明 2022-02-07 23:08:00 +08:00
疯狂的狮子li 53da7140c2 update 调整返回类型为 R 2022-01-29 11:48:41 +08:00
疯狂的狮子li eb87229ee9 update 修正脚本错误 2022-01-29 09:23:27 +08:00
疯狂的狮子li 0b852faf00 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	pom.xml
#	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-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.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-ui/src/assets/styles/ruoyi.scss
#	ry.bat
 2022-01-29 09:23:11 +08:00
疯狂的狮子li ce9e033551 update 更新全局异常响应 2022-01-28 19:57:19 +08:00
疯狂的狮子li eefe3a9c6e update 更新全局异常响应 2022-01-28 19:56:30 +08:00
疯狂的狮子li 06535c8eac fix 修复建造者模式无法反序列化问题 2022-01-28 14:29:39 +08:00
疯狂的狮子li 651867055c update 修改用户注册报未登录警告 2022-01-28 11:03:31 +08:00
疯狂的狮子li 8c7e49dd54 update 修改用户注册报未登录警告 2022-01-28 10:15:09 +08:00
疯狂的狮子li aa9f2c9a3c update 替换过期配置 2022-01-27 11:43:56 +08:00
疯狂的狮子li 5764befa46 update 优化 redisson 配置 去除掉不常用的配置 使用默认配置 2022-01-27 11:20:54 +08:00
疯狂的狮子li 29462b83ff update 优化 LoginUser 解耦 2022-01-27 09:50:18 +08:00
疯狂的狮子li 129a49a60b fix 修复登录监听获取不到用户 改为优先执行一级缓存 2022-01-26 21:07:21 +08:00
疯狂的狮子li 0da30f4623 update 优化 查询登录用户数据 统一走缓存 2022-01-26 20:58:05 +08:00
疯狂的狮子li 69bcebdf86 update 更新测试sql 2022-01-26 18:46:49 +08:00
疯狂的狮子li c0d749b1e2 fix 修复 数据权限 缓存方法名错误问题 2022-01-26 18:30:57 +08:00
疯狂的狮子li e6bcced213 update mybatis-plus 3.5.0 => 3.5.1 2022-01-26 10:44:37 +08:00
疯狂的狮子Li 3706d2e1db update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题 2022-01-25 21:50:54 +08:00
疯狂的狮子Li 03bda9422d update 修改 关于 BeanCopyUtils 工具的说明 避免问题 2022-01-25 20:17:45 +08:00
疯狂的狮子Li f89b4e9336 !134 优化登录、注册校验方式 
Merge pull request !134 from KonBAI/fix_auth_valid
 2022-01-25 09:54:37 +00:00
疯狂的狮子li 0c8f727bd8 update maven-jar-plugin 3.2.0 => 3.2.2 
update maven-war-plugin 3.2.0 => 3.2.2
update maven-compiler-plugin 3.1 => 3.9.0
update hutool 5.7.18 => 5.7.20
update springboot-admin 2.6.0 => 2.6.2
update redisson 3.16.7 => 3.16.8
update qiniu 7.9.0 => 7.9.2
update aliyun 3.13.1 => 3.14.0
update qcloud 5.6.58 => 5.6.68
update minio 8.3.4 => 8.3.5
 2022-01-24 13:03:42 +08:00
疯狂的狮子li ad18449753 update 重构 使用 Spring 简化 oss 模块代码 2022-01-24 13:00:38 +08:00
疯狂的狮子Li 0f75f789d8 !133 修复单词拼写错误 
Merge pull request !133 from JackyTang/dev
 2022-01-22 03:47:15 +00:00
疯狂的狮子li 76f1650109 fix vue3下点击编辑，取消修改报错问题 2022-01-21 18:34:41 +08:00
疯狂的狮子li c636e6909b Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
 2022-01-21 18:29:44 +08:00
疯狂的狮子li b5b1b94a9d update springboot 2.6.2 => 2.6.3 2022-01-21 14:55:44 +08:00
疯狂的狮子li b87aeb9b95 update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换 2022-01-21 10:30:39 +08:00
疯狂的狮子Li 5f0e4e81f0 !131 fix 修改用户信息校验方法 
Merge pull request !131 from KonBAI/fix_cheakUserInfo
 2022-01-20 09:13:54 +00:00
疯狂的狮子li dcf79d9119 add 增加 3.X update 4.0 更新sql 2022-01-17 18:32:02 +08:00
疯狂的狮子li 911867d5a5 update 数据库更改 对接多用户体系 2022-01-17 17:09:27 +08:00
疯狂的狮子li 3600875707 update 优化 代码生成 字段更新未同步 2022-01-17 15:49:34 +08:00
疯狂的狮子li 8052d75957 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
#	ruoyi-ui/src/views/login.vue
#	ruoyi-ui/src/views/register.vue
 2022-01-17 15:48:09 +08:00
疯狂的狮子li cc2624d08e update 优化加载字典缓存数据 2022-01-17 15:46:28 +08:00
疯狂的狮子li e72cfff7bb remove 删除无用同步 2022-01-17 15:27:41 +08:00
疯狂的狮子li a43e6e06e0 update 优化多用户体系处理 更名 LoginUtils 为 LoginHelper 支持 LoginUser 多级缓存 2022-01-17 12:03:15 +08:00
疯狂的狮子Li dc0af0a419 fix 修复 banner 显示版本号不正确 2022-01-16 18:03:05 +08:00
疯狂的狮子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