287 Commits (2cc7ea4bd83a91680e5a814926e263bdc93b2ab9)

Author SHA1 Message Date
疯狂的狮子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
RuoYi b51c127eb7 数据逻辑删除不进行唯一验证 3 years ago
疯狂的狮子li b74055f120 fix 修复用户导出字典使用错误 3 years ago
RuoYi 0ef63207f4 新增密码错误次数限制 3 years ago
疯狂的狮子li 9256e938c6 remove 移除所有 swagger 配置 准备对接 springdoc 3 years ago
RuoYi f12baad00c 优化代码 4 years ago
疯狂的狮子li fae0df1905 add 完成 ELK 整合 4 years ago
疯狂的狮子li b877ec0e62 update 优化 使用 StreamUtils 简化业务流操纵 4 years ago
RuoYi a573c4b10d 字典类型删除多余的mapper注解 4 years ago
疯狂的狮子li f6e1f4fca4 fix 修复 同步错误 password 无法查询问题 4 years ago
疯狂的狮子li 8607b39228 update 同步 ruoyi 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 f661d2ce13 update 优化 使用 maven 变量统一化 logback 配置文件服务名 简化配置 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
RuoYi b3d462e873 用户列表查询不显示密码字段 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
RuoYi 386f3eb016 修复操作日志查询类型条件为0时会查到所有数据 4 years ago
疯狂的狮子Li ceb1825316 reset 重置错误修改 4 years ago
疯狂的狮子Li f0af90dd3f fix 修复 菜单部分字段 类型与数据库不匹配问题 4 years ago
若依 97500fbccb
!182 简化返回值
Merge pull request !182 from shawn/dev
4 years ago
疯狂的狮子li 8fab5ac32d add 新增 startup trace 监控 4 years ago
疯狂的狮子li 5fbdeb1646 fix 修复 查询未分配用户角色列表 角色无绑定用户情况下 空列表问题 4 years ago
RuoYi 6bc77169fe 修改显示顺序orderNum类型为整型 4 years ago
RuoYi 742f3106a2 修复长主键溢出问题 将查询返回类型改为 Long 4 years ago
shawn 9da3b34b9c 简化返回值逻辑判断 4 years ago
疯狂的狮子Li 37f08f6def 全面升级适配 SpringCloudAlibaba 2021.0.1.0 配置方式大更改
nacos client 降级 2.0.2 高于此版本会有问题 不影响nacos服务端版本
nacos 配置文件 application.yml 重命名为 application-common.yml 解决命名冲突问题
4 years ago
疯狂的狮子Li db46e5a8b0 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	README.md
	pom.xml
	ruoyi-api/pom.xml
	ruoyi-api/ruoyi-api-resource/pom.xml
	ruoyi-api/ruoyi-api-system/pom.xml
	ruoyi-auth/pom.xml
	ruoyi-common/pom.xml
	ruoyi-common/ruoyi-common-core/pom.xml
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.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/web/controller/BaseController.java
	ruoyi-common/ruoyi-common-log/pom.xml
	ruoyi-common/ruoyi-common-mybatis/pom.xml
	ruoyi-common/ruoyi-common-redis/pom.xml
	ruoyi-common/ruoyi-common-security/pom.xml
	ruoyi-common/ruoyi-common-swagger/pom.xml
	ruoyi-gateway/pom.xml
	ruoyi-modules/pom.xml
	ruoyi-modules/ruoyi-gen/pom.xml
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-modules/ruoyi-job/pom.xml
	ruoyi-modules/ruoyi-resource/pom.xml
	ruoyi-modules/ruoyi-system/pom.xml
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue
	ruoyi-visual/pom.xml
	ruoyi-visual/ruoyi-monitor/pom.xml
4 years ago
RuoYi 0b6166663c 用户缓存信息添加部门ancestors祖级列表 4 years ago
疯狂的狮子Li 73eb9cc7d7 update 修改角色适配 采用 get set 转换数据类型 4 years ago
疯狂的狮子Li 33683d4bb1 update 更新小程序登录 单独的结构体 4 years ago