115 Commits (5a7d39a53bda740a68d6b0acb44814a8f20628e6)

Author SHA1 Message Date
疯狂的狮子li 2e23b64eb2 update 优化 修改 oss 配置页面开关说明 避免造成误解 3 years ago
疯狂的狮子li 08ac3886d7 update 优化 修改 oss 配置页面开关说明 避免造成误解 3 years ago
chenchen a1af58500b 加入 oss 私有库功能 3 years ago
疯狂的狮子li 306f9e04d0 fix 修复 table中更多按钮切换主题色未生效修复问题 3 years ago
疯狂的狮子li e9324fb9ce update 优化 重置时取消部门选中 3 years ago
疯狂的狮子li 451eb02343 fix 修复 使用透明底png图片时, 自动填充黑色背景 3 years ago
疯狂的狮子li 29fb70c838 Merge remote-tracking branch 'ruoyi-cloud/master' into dev
# Conflicts:
#	pom.xml
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
#	ruoyi-ui/src/views/system/user/index.vue
#	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
3 years ago
RuoYi c759728269 优化修改头像在小屏幕上页面布局错位的问题 3 years ago
RuoYi 58e07ba142 修复用户编辑时角色和部门存在无法修改情况 3 years ago
疯狂的狮子Li 3cdd052740 update 同步ruoyi 3 years ago
疯狂的狮子li f256bdb912 update 优化 分页对象 PageQuery 支持多排序 适配 文件管理 页面支持多排序 3 years ago
RuoYi f250c6ee93 优化日志操作中重置按钮时重复查询的问题 3 years ago
疯狂的狮子li ca18a1f767 fix 修复 没有权限的用户编辑部门缺少数据 3 years ago
疯狂的狮子li 2cc7ea4bd8 update 同步 ruoyi 新功能 3 years ago
RuoYi 767f7c8621 优化多角色数据权限匹配规则 3 years ago
RuoYi 12d335b9ac 添加菜单管理遗漏的prop属性 3 years ago
Dincat d504a7df2f 修复个人中心卡死或鼠标点击和键盘输入无效 3 years ago
疯狂的狮子li 7bacfd9c4c update 同步ruoyi 3 years ago
RuoYi c8a108b93a 登录日志新增解锁账户功能 3 years ago
疯狂的狮子li 8c4091af01 Merge remote-tracking branch 'ruoyi-cloud/master' into dev
# Conflicts:
#	README.md
#	pom.xml
#	ruoyi-api/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/annotation/Excel.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
#	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/poi/ExcelUtil.java
#	ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
#	ruoyi-common/ruoyi-common-excel/pom.xml
#	ruoyi-common/ruoyi-common-job/pom.xml
#	ruoyi-common/ruoyi-common-log/pom.xml
#	ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-common/ruoyi-common-mybatis/pom.xml
#	ruoyi-common/ruoyi-common-redis/pom.xml
#	ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-common/ruoyi-common-security/pom.xml
#	ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-example/ruoyi-stream-mq/pom.xml
#	ruoyi-gateway/pom.xml
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
#	ruoyi-modules/pom.xml
#	ruoyi-modules/ruoyi-gen/pom.xml
#	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
#	ruoyi-modules/ruoyi-job/pom.xml
#	ruoyi-modules/ruoyi-system/pom.xml
#	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/src/views/login.vue
#	ruoyi-ui/src/views/register.vue
#	ruoyi-visual/pom.xml
#	ruoyi-visual/ruoyi-monitor/pom.xml
3 years ago
RuoYi 9f90b4eba7 优化字典数据使用store存取 3 years ago
RuoYi 4b1351ef21 修改验证码开关变量名 4 years ago
疯狂的狮子li aa5ea44dde Merge remote-tracking branch 'ruoyi-cloud/master' into dev
# Conflicts:
#	pom.xml
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
#	ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java
#	ruoyi-gateway/src/main/resources/bootstrap.yml
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
#	ruoyi-ui/vue.config.js
#	ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java
4 years ago
RuoYi 95aa343805 优化字典数据回显样式下拉框显示值 4 years ago
疯狂的狮子li b6452dcf1f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java
	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/service/impl/SysDeptServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
	ruoyi-ui/src/views/system/user/index.vue
	sql/ry_config_20220510.sql
4 years ago
huyikai 86b9e675b5 体验优化-用户管理左侧树型组件增加选中高亮保持。 4 years ago
疯狂的狮子li 3430b090e6 update 基于S3协议重新实现 OSS模块 支持自定义域名 4 years ago
RuoYi 103bf66f77 修复字典数据显示不全问题 4 years ago
疯狂的狮子Li 73eb9cc7d7 update 修改角色适配 采用 get set 转换数据类型 4 years ago
疯狂的狮子Li 487f18a930 fix 修复 用户绑定角色 与 角色绑定用户 异常 编写错误 4 years ago
疯狂的狮子li 794c902773 update 优化 SysRole 部分字段类型 防止数据库类型映射异常 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 e418c2efe4 update 重命名 菜单字段 query -> query_param 解决系统关键字问题 4 years ago
RuoYi 8b3d75a6a0 开启TopNav没有子菜单情况隐藏侧边栏 4 years ago
RuoYi 7a09412ecb 修复表单清除元素位置未垂直居中问题(I4V27B) 4 years ago
疯狂的狮子li 3f682fc80c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	docker/copy.sh
	pom.xml
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.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/uuid/IdUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.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-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/views/system/user/index.vue
4 years ago
疯狂的狮子li 710864a4f2 fix 修复一些小问题 4 years ago
RuoYi 04706403d3 组件fileUpload支持多文件同时选择上传 4 years ago
疯狂的狮子li 0d827e55ff Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
4 years ago
RuoYi 089ebaf9c5 代码生成子表支持日期/字典配置 4 years ago
East b5d2628b71 修复个人中心页面,修改个人信息的时候,表单验证里email字段的验证message多一个单引号的问题 4 years ago
疯狂的狮子li 73831db0ce fix 修复 角色菜单权限列表 返回体结构漏改 4 years ago
疯狂的狮子li 69e699946f add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构 4 years ago
疯狂的狮子li bf151c5db2 update 补全 接口文档注解 调整返回类型为 R 4 years ago
RuoYi 5ebc354cfc 优化部门修改缩放后出现的错位问题 4 years ago
RuoYi 418b74b39d 用户管理部门查询选择节点后分页参数初始 4 years ago
RuoYi 7713948f5c 修复菜单图标缺少的prop属性 4 years ago
RuoYi c1b223e3a7 用户导入提示溢出则显示滚动条 4 years ago
RuoYi f64a5dd5ca 修正用户分配角色属性错误 4 years ago
RuoYi 82779f3c70 优化提示信息 4 years ago