Commit Graph

284 Commits (37f08f6deffd8f9ab55c60bf7ff7d74d3a20848f)

Author SHA1 Message Date
疯狂的狮子Li 37f08f6def 全面升级适配 SpringCloudAlibaba 2021.0.1.0 配置方式大更改
nacos client 降级 2.0.2 高于此版本会有问题 不影响nacos服务端版本
nacos 配置文件 application.yml 重命名为 application-common.yml 解决命名冲突问题
疯狂的狮子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
RuoYi d14f27e5eb 若依 3.5.0
RuoYi 0b6166663c 用户缓存信息添加部门ancestors祖级列表
疯狂的狮子Li 73eb9cc7d7 update 修改角色适配 采用 get set 转换数据类型
疯狂的狮子Li 33683d4bb1 update 更新小程序登录 单独的结构体
疯狂的狮子Li 487f18a930 fix 修复 用户绑定角色 与 角色绑定用户 异常 编写错误
疯狂的狮子li ab884114be fix 修复 构建 loginUser 遗漏密码 导致无法登录
疯狂的狮子Li bb479c436a add 增加 短信登录 与 小程序登录 示例
疯狂的狮子li d25e313ffb update 优化 logback 日志 异步输出
疯狂的狮子li a546c8ceaa update 调整排序字段与数据库类型对应
疯狂的狮子li f60befce9c update 优化 查询条件与字段类型不匹配 可能出现问题
疯狂的狮子li 794c902773 update 优化 SysRole 部分字段类型 防止数据库类型映射异常
疯狂的狮子li e908329cc0 update 优化 TreeEntity 树实体 去除未知泛型
疯狂的狮子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
疯狂的狮子li f4b16090db update 使用 in 优化 or 提升索引命中率
疯狂的狮子li e418c2efe4 update 重命名 菜单字段 query -> query_param 解决系统关键字问题
疯狂的狮子li 6c84640e1e update 处理 find_in_set 函数多类型数据库兼容性问题
疯狂的狮子li 34da4a696b update 使用全局字段格式化处理 mysql关键字问题 去除不推荐使用的配置
RuoYi 8b3d75a6a0 开启TopNav没有子菜单情况隐藏侧边栏
疯狂的狮子li 1ec6263399 update 简化用户与角色功能
疯狂的狮子li 12acc1e7e6 update 简化查询菜单功能
疯狂的狮子li fe43c94810 update 简化查询角色功能
疯狂的狮子li 04a5001fc8 update 优化 部门修改子元素关系 使用批量更新
疯狂的狮子li d1832352de 发布 0.9.0
疯狂的狮子li 99476ad708 fix 修复 数据权限 从 aop 切换到 拦截器 导致获取代理失败问题
疯狂的狮子li a941caf3bd update 优化去除sql差异化 时间范围统一使用 between 处理
疯狂的狮子li 58981b5b3d update 简化查询菜单功能
疯狂的狮子li 901940b042 update 简化查询部门功能
疯狂的狮子Li 0798f5340b update 更新数据权限Service的使用说明
疯狂的狮子Li e167ba5539 update 移除自定义注解 改为框架统一配置
RuoYi 9460acd91b 优化菜单关键字导致的插件报错问题
疯狂的狮子li a90cb2b6b3 update 优化远程调用异常处理
疯狂的狮子li 1fc833d876 发布 0.8.0 完成 国际化 功能, sentinel控制台 对接 nacos
疯狂的狮子li dc6f7cd691 add 完成 国际化 功能
疯狂的狮子Li 2ccf189139 update 优化 是否为管理员的判断
疯狂的狮子Li 14c412113f
update 补全事务注解异常
疯狂的狮子li ec2e829e69 update 补全事务注解异常
疯狂的狮子li ba635272fe update 完善auth服务 重构用户注册流程 补全接口文档
疯狂的狮子li 27087e5d1e update 任务调度 独立 ruoyi-job 服务 统一远程处理任务 规范用法
疯狂的狮子li d20921838e 发布 0.7.0 完成 代码生成 与 docker 部署 集成 sentinel 控制台
疯狂的狮子li 44ac1c23a3 add 适配 docker 部署方式
疯狂的狮子li 5be893f980 update 优化 TreeBuildUtils 工具 使用反射自动获取顶级父id
疯狂的狮子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
RuoYi 0e13296752 代码生成同步保留必填/类型选项
RuoYi dbca691746 优化代码
若依 e66f65b257
Result type not match for select id="selectMenuListByRoleId"
Merge pull request  from runphp/N/A
runphp 4191f5ca5c
Result type not match for select id="selectMenuListByRoleId"
疯狂的狮子li 1b7cde73f3 update 返回体 统一
疯狂的狮子li bf019b405e add 增加 数据脱敏 功能