287 Commits (d2a70b159d9fbcd87020a2e2ef814790c25ac347)

Author SHA1 Message Date
疯狂的狮子li 8d46866237 fix 修复 修改用户信息 校验用户名未排除当前用户问题 3 years ago
zlyx 0badec2c00 fix 修正Excel导出字典值转换方法由于内部调用缓存不生效 bug ; 3 years ago
疯狂的狮子Li 54cab42252 update 优化 获取用户信息getInfo接口 使用缓存数据获取 3 years ago
疯狂的狮子Li 3cdd052740 update 同步ruoyi 3 years ago
疯狂的狮子li cd107fbef5 update sa-token 1.30.0 => 1.31.0 3 years ago
RuoYi 07c2e08e4a 导入更新用户数据前校验数据权限 3 years ago
疯狂的狮子li 1b93d297d8 fix 修复 在线用户设置永不过期 被过滤问题 3 years ago
RuoYi ad54d36385 修改用户登录账号重复验证 3 years ago
疯狂的狮子li 4aabd0efeb fix 修复 用户导入存在则更新不生效 3 years ago
疯狂的狮子li ca18a1f767 fix 修复 没有权限的用户编辑部门缺少数据 3 years ago
zlyx cb1e93d3f5 fix 修正 spring cache 获取在线用户失败问题, 回退为使用 redis 工具缓存 ;
update 优化 DictUtils, 使用 CacheUtils 缓存字典数据 ;
3 years ago
疯狂的狮子li d1f58ae277 update 同步 ruoyi 新功能 3 years ago
疯狂的狮子li 2cc7ea4bd8 update 同步 ruoyi 新功能 3 years ago
疯狂的狮子li 02bf210180 fix 修复 角色部门状态字典错误 与 菜单注释错误 3 years ago
RuoYi 52d50e4e47 优化页面内嵌iframe切换tab不刷新数据 3 years ago
RuoYi 767f7c8621 优化多角色数据权限匹配规则 3 years ago
taest d4c61daf9b
代码小整理
Signed-off-by: taest <876239615@qq.com>
3 years ago
疯狂的狮子li 74e075b4d3 update 优化 使用 spring-cache 注解优化缓存 3 years ago
RuoYi 59b867dcca 限制用户个人信息修改部门 3 years ago
RuoYi 2a675aa304 优化修改资料头像被覆盖的问题(I5LK04) 3 years ago
Rain 9d21b1627b
修复账户解锁接口请求路径错误的问题 3 years ago
疯狂的狮子li 0c5cf65965 update 适配ruoyi错误登录与解锁功能 3 years ago
疯狂的狮子li 7bacfd9c4c update 同步ruoyi 3 years ago
RuoYi c8a108b93a 登录日志新增解锁账户功能 3 years ago
疯狂的狮子li b74055f120 fix 修复用户导出字典使用错误 3 years ago
RuoYi 0ef63207f4 新增密码错误次数限制 3 years ago
疯狂的狮子li 9256e938c6 remove 移除所有 swagger 配置 准备对接 springdoc 3 years ago
疯狂的狮子li b877ec0e62 update 优化 使用 StreamUtils 简化业务流操纵 4 years ago
RuoYi a573c4b10d 字典类型删除多余的mapper注解 4 years ago
RuoYi 570d468814 optimized code 4 years ago
若依 17246d8a27
!199 简化逻辑判断
Merge pull request !199 from 光速蜗牛/master
4 years ago
cgl a52d455032 简化逻辑判断 4 years ago
疯狂的狮子Li 7475cff47d
update 优化新增用户与角色信息、用户与岗位信息逻辑 4 years ago
疯狂的狮子Li cf20020b89 update 优化新增用户与角色信息、用户与岗位信息逻辑 4 years ago
疯狂的狮子li e1c789b947 update mybatis-plus 3.5.1 => 3.5.2 解决新版本兼容性问题 关键字冲突修改 4 years ago
疯狂的狮子Li b59095b897 update 用户头像上传限制只能为图片格式 4 years ago
疯狂的狮子Li 2f7f7c65da update 同步ruoyi最新修改 4 years ago
疯狂的狮子Li 4e0648171c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
	ruoyi-common/ruoyi-common-core/pom.xml
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
	ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
	ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
	ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
	sql/ry_config_20220510.sql
4 years ago
疯狂的狮子li 4bbf58d56d fix 修复 登录未选部门报空问题 4 years ago
疯狂的狮子li e42b2963e3 fix 修复脱敏实现逻辑问题 4 years ago
RuoYi 1d1b9501b7 用户头像上传限制只能为图片格式 4 years ago
疯狂的狮子Li ceb1825316 reset 重置错误修改 4 years ago
疯狂的狮子Li f0af90dd3f fix 修复 菜单部分字段 类型与数据库不匹配问题 4 years ago
疯狂的狮子li 8fab5ac32d add 新增 startup trace 监控 4 years ago
疯狂的狮子li 5fbdeb1646 fix 修复 查询未分配用户角色列表 角色无绑定用户情况下 空列表问题 4 years ago
shawn 9da3b34b9c 简化返回值逻辑判断 4 years ago
疯狂的狮子Li 73eb9cc7d7 update 修改角色适配 采用 get set 转换数据类型 4 years ago
疯狂的狮子Li 33683d4bb1 update 更新小程序登录 单独的结构体 4 years ago
疯狂的狮子Li 487f18a930 fix 修复 用户绑定角色 与 角色绑定用户 异常 编写错误 4 years ago
疯狂的狮子li ab884114be fix 修复 构建 loginUser 遗漏密码 导致无法登录 4 years ago
疯狂的狮子Li bb479c436a add 增加 短信登录 与 小程序登录 示例 4 years ago
疯狂的狮子li a546c8ceaa update 调整排序字段与数据库类型对应 4 years ago
疯狂的狮子li 794c902773 update 优化 SysRole 部分字段类型 防止数据库类型映射异常 4 years ago
疯狂的狮子li e908329cc0 update 优化 TreeEntity 树实体 去除未知泛型 4 years ago
疯狂的狮子li e2417b433a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/job/log.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
4 years ago
疯狂的狮子li f4b16090db update 使用 in 优化 or 提升索引命中率 4 years ago
疯狂的狮子li e418c2efe4 update 重命名 菜单字段 query -> query_param 解决系统关键字问题 4 years ago
疯狂的狮子li 6c84640e1e update 处理 find_in_set 函数多类型数据库兼容性问题 4 years ago
疯狂的狮子li 34da4a696b update 使用全局字段格式化处理 mysql关键字问题 去除不推荐使用的配置 4 years ago
RuoYi 8b3d75a6a0 开启TopNav没有子菜单情况隐藏侧边栏 4 years ago
疯狂的狮子li 1ec6263399 update 简化用户与角色功能 4 years ago
疯狂的狮子li 12acc1e7e6 update 简化查询菜单功能 4 years ago
疯狂的狮子li fe43c94810 update 简化查询角色功能 4 years ago
疯狂的狮子li 04a5001fc8 update 优化 部门修改子元素关系 使用批量更新 4 years ago
疯狂的狮子li 99476ad708 fix 修复 数据权限 从 aop 切换到 拦截器 导致获取代理失败问题 4 years ago
疯狂的狮子li 58981b5b3d update 简化查询菜单功能 4 years ago
疯狂的狮子li 901940b042 update 简化查询部门功能 4 years ago
疯狂的狮子Li 0798f5340b update 更新数据权限Service的使用说明 4 years ago
疯狂的狮子Li e167ba5539 update 移除自定义注解 改为框架统一配置 4 years ago
疯狂的狮子li a90cb2b6b3 update 优化远程调用异常处理 4 years ago
疯狂的狮子li dc6f7cd691 add 完成 国际化 功能 4 years ago
疯狂的狮子Li 2ccf189139 update 优化 是否为管理员的判断 4 years ago
疯狂的狮子Li 14c412113f
update 补全事务注解异常 4 years ago
疯狂的狮子li ec2e829e69 update 补全事务注解异常 4 years ago
疯狂的狮子li ba635272fe update 完善auth服务 重构用户注册流程 补全接口文档 4 years ago
疯狂的狮子li 27087e5d1e update 任务调度 独立 ruoyi-job 服务 统一远程处理任务 规范用法 4 years ago
疯狂的狮子li 5be893f980 update 优化 TreeBuildUtils 工具 使用反射自动获取顶级父id 4 years ago
疯狂的狮子li 4827f9217b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
	ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/router/index.js
4 years ago
RuoYi 0e13296752 代码生成同步保留必填/类型选项 4 years ago
RuoYi dbca691746 优化代码 4 years ago
疯狂的狮子li 1b7cde73f3 update 返回体 统一 4 years ago
疯狂的狮子li bf019b405e add 增加 数据脱敏 功能 4 years ago
疯狂的狮子li b12b98ab1c update 使用 satoken 自带的 BCrypt 工具 替换 Security 加密工具 减少依赖 4 years ago
caohong 9cb15ec2ae 方法结果没有返回值时,去掉方法注释 @Return 4 years ago
疯狂的狮子li 16b1f02705 fix 修复 接口文档 上传文件问题 4 years ago
疯狂的狮子li 69e699946f add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构 4 years ago
疯狂的狮子li bf151c5db2 update 补全 接口文档注解 调整返回类型为 R 4 years ago
疯狂的狮子li 5fb7886928 Merge remote-tracking branch 'ruoyi-cloud/master'
# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
4 years ago
疯狂的狮子Li db70abf9f0 !15 合并 新功能/satoken 分支 4 years ago
疯狂的狮子li 268e141d5e update 修改用户注册报未登录警告 4 years ago
RuoYi 1a1d6562d2 用户访问控制时校验数据权限,防止越权 4 years ago
疯狂的狮子li 0e9ec77392 add 整合 mybatis-plus 重写所有业务 4 years ago
疯狂的狮子li 65fd3dcef6 update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题 4 years ago
疯狂的狮子li 726116e8f6 fix vue3下点击编辑,取消修改报错问题 4 years ago
疯狂的狮子li 075bfb040d Merge remote-tracking branch 'ruoyi-cloud/master'
# Conflicts:
#	pom.xml
#	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
4 years ago
疯狂的狮子li 07ba70ec8c add 集成 EasyExcel 框架 完成业务功能切换
update 优化 Validation 校验框架功能
update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
4 years ago
RuoYi 79b1717f9a vue3下点击编辑,取消修改报错问题 4 years ago
疯狂的狮子li 0c2efd36cf add 整合 seata 1.4.2 对接 nacos 注册中心 配置中心 4 years ago
疯狂的狮子li 4b5d0fac02 fix 修复 dubbo 传输文件问题 临时更改 后续对接oss 4 years ago
疯狂的狮子li c28d9c208e Merge remote-tracking branch 'ruoyi-cloud/master'
# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
#	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
#	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
#	sql/ry_config_20220114.sql
4 years ago