270 Commits (eaf6fdc445f756dea7c7aed1f7c3adc79abda776)

Author SHA1 Message Date
疯狂的狮子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
3 years ago
疯狂的狮子li f4b16090db update 使用 in 优化 or 提升索引命中率 3 years ago
疯狂的狮子li e418c2efe4 update 重命名 菜单字段 query -> query_param 解决系统关键字问题 3 years ago
疯狂的狮子li 6c84640e1e update 处理 find_in_set 函数多类型数据库兼容性问题 3 years ago
疯狂的狮子li 34da4a696b update 使用全局字段格式化处理 mysql关键字问题 去除不推荐使用的配置 3 years ago
RuoYi 8b3d75a6a0 开启TopNav没有子菜单情况隐藏侧边栏 3 years ago
疯狂的狮子li 1ec6263399 update 简化用户与角色功能 3 years ago
疯狂的狮子li 12acc1e7e6 update 简化查询菜单功能 3 years ago
疯狂的狮子li fe43c94810 update 简化查询角色功能 3 years ago
疯狂的狮子li 04a5001fc8 update 优化 部门修改子元素关系 使用批量更新 3 years ago
疯狂的狮子li d1832352de 发布 0.9.0 3 years ago
疯狂的狮子li 99476ad708 fix 修复 数据权限 从 aop 切换到 拦截器 导致获取代理失败问题 3 years ago
疯狂的狮子li a941caf3bd update 优化去除sql差异化 时间范围统一使用 between 处理 3 years ago
疯狂的狮子li 58981b5b3d update 简化查询菜单功能 3 years ago
疯狂的狮子li 901940b042 update 简化查询部门功能 3 years ago
疯狂的狮子Li 0798f5340b update 更新数据权限Service的使用说明 3 years ago
疯狂的狮子Li e167ba5539 update 移除自定义注解 改为框架统一配置 3 years ago
RuoYi 9460acd91b 优化菜单关键字导致的插件报错问题 3 years ago
疯狂的狮子li a90cb2b6b3 update 优化远程调用异常处理 3 years ago
疯狂的狮子li 1fc833d876 发布 0.8.0 完成 国际化 功能, sentinel控制台 对接 nacos 3 years ago
疯狂的狮子li dc6f7cd691 add 完成 国际化 功能 3 years ago
疯狂的狮子Li 2ccf189139 update 优化 是否为管理员的判断 3 years ago
疯狂的狮子Li 14c412113f
update 补全事务注解异常 3 years ago
疯狂的狮子li ec2e829e69 update 补全事务注解异常 3 years ago
疯狂的狮子li ba635272fe update 完善auth服务 重构用户注册流程 补全接口文档 3 years ago
疯狂的狮子li 27087e5d1e update 任务调度 独立 ruoyi-job 服务 统一远程处理任务 规范用法 3 years ago
疯狂的狮子li d20921838e 发布 0.7.0 完成 代码生成 与 docker 部署 集成 sentinel 控制台 3 years ago
疯狂的狮子li 44ac1c23a3 add 适配 docker 部署方式 3 years ago
疯狂的狮子li 5be893f980 update 优化 TreeBuildUtils 工具 使用反射自动获取顶级父id 3 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
3 years ago
RuoYi 0e13296752 代码生成同步保留必填/类型选项 3 years ago
RuoYi dbca691746 优化代码 3 years ago
若依 e66f65b257
!149 Result type not match for select id="selectMenuListByRoleId"
Merge pull request !149 from runphp/N/A
3 years ago
runphp 4191f5ca5c
Result type not match for select id="selectMenuListByRoleId" 3 years ago
疯狂的狮子li 1b7cde73f3 update 返回体 统一 3 years ago
疯狂的狮子li bf019b405e add 增加 数据脱敏 功能 3 years ago
疯狂的狮子li b12b98ab1c update 使用 satoken 自带的 BCrypt 工具 替换 Security 加密工具 减少依赖 3 years ago
caohong 9cb15ec2ae 方法结果没有返回值时,去掉方法注释 @Return 3 years ago
疯狂的狮子li d6a93184c4 发布 0.6.0 完成 分布式存储 支持 Minio、七牛、阿里、腾讯 3 years ago
疯狂的狮子li 16b1f02705 fix 修复 接口文档 上传文件问题 3 years ago
疯狂的狮子li 69e699946f add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构 3 years ago
疯狂的狮子li 5870045c35 fix 修复xml参数未对应问题 3 years ago
疯狂的狮子li e35767b9cf fix 修复xml参数未对应问题 3 years ago
疯狂的狮子li bf151c5db2 update 补全 接口文档注解 调整返回类型为 R 3 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
3 years ago
疯狂的狮子li af983c4f2f 发布 0.5.0 完成 satoken 与 mybatis-plus 整合 3 years ago
疯狂的狮子Li db70abf9f0 !15 合并 新功能/satoken 分支 3 years ago
疯狂的狮子li 268e141d5e update 修改用户注册报未登录警告 3 years ago
RuoYi 1a1d6562d2 用户访问控制时校验数据权限,防止越权 3 years ago
疯狂的狮子li 0e9ec77392 add 整合 mybatis-plus 重写所有业务 3 years ago