疯狂的狮子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
|
3 years ago |
RuoYi
|
d14f27e5eb
|
若依 3.5.0
|
3 years ago |
RuoYi
|
f7b761275c
|
添加页签openPage支持传递参数
|
3 years ago |
RuoYi
|
6f5c149ba0
|
降级jsencrypt版本兼容IE浏览器
|
3 years ago |
疯狂的狮子Li
|
e29c470cc7
|
fix 修复增加应用路径路由不生效问题
|
3 years ago |
疯狂的狮子Li
|
73eb9cc7d7
|
update 修改角色适配 采用 get set 转换数据类型
|
3 years ago |
RuoYi
|
55a7a90bab
|
update registry source
|
3 years ago |
RuoYi
|
a70d5ee2ab
|
topNav自定义隐藏侧边栏路由
|
3 years ago |
疯狂的狮子Li
|
ba7aa248df
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
Conflicts:
README.md
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
ruoyi-ui/src/store/modules/user.js
ruoyi-ui/src/views/index.vue
|
3 years ago |
疯狂的狮子Li
|
487f18a930
|
fix 修复 用户绑定角色 与 角色绑定用户 异常 编写错误
|
3 years ago |
RuoYi
|
dc8938ab2f
|
优化固定Header后顶部导航栏样式问题(I4XDN5)
|
3 years ago |
RuoYi
|
368a9044be
|
修复Oracle数据库用户表头像列为null时不显示默认头像问题
|
3 years ago |
疯狂的狮子li
|
794c902773
|
update 优化 SysRole 部分字段类型 防止数据库类型映射异常
|
3 years ago |
RuoYi
|
242101ae6e
|
添加新群号:213618602
|
3 years ago |
RuoYi
|
99932d91c0
|
优化菜单名称过长悬停显示标题
|
3 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
|
3 years ago |
疯狂的狮子li
|
e418c2efe4
|
update 重命名 菜单字段 query -> query_param 解决系统关键字问题
|
3 years ago |
RuoYi
|
8b3d75a6a0
|
开启TopNav没有子菜单情况隐藏侧边栏
|
3 years ago |
RuoYi
|
7a09412ecb
|
修复表单清除元素位置未垂直居中问题(I4V27B)
|
3 years ago |
疯狂的狮子li
|
d1832352de
|
发布 0.9.0
|
3 years ago |
疯狂的狮子li
|
bc72868fc5
|
update 优化多文件 多图片上传
|
3 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
|
3 years ago |
疯狂的狮子li
|
9bd29a6777
|
update 支持配置文件指定应用路径
|
3 years ago |
疯狂的狮子li
|
710864a4f2
|
fix 修复一些小问题
|
3 years ago |
RuoYi
|
04706403d3
|
组件fileUpload支持多文件同时选择上传
|
3 years ago |
RuoYi
|
c43565ef43
|
组件ImageUpload支持多图同时选择上传
|
3 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
|
3 years ago |
RuoYi
|
089ebaf9c5
|
代码生成子表支持日期/字典配置
|
3 years ago |
RuoYi
|
6f3c3f1b7e
|
页面若未匹配到字典标签则返回原字典值
|
3 years ago |
East
|
b5d2628b71
|
修复个人中心页面,修改个人信息的时候,表单验证里email字段的验证message多一个单引号的问题
|
3 years ago |
疯狂的狮子li
|
1fc833d876
|
发布 0.8.0 完成 国际化 功能, sentinel控制台 对接 nacos
|
3 years ago |
疯狂的狮子li
|
93c4a503c9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
Conflicts:
pom.xml
ruoyi-ui/src/utils/request.js
|
3 years ago |
疯狂的狮子li
|
dc6f7cd691
|
add 完成 国际化 功能
|
3 years ago |
East
|
1358b21c3a
|
优化分页组件发送两次请求的实现
|
3 years ago |
RuoYi
|
2e1ef93aa6
|
修改登录超时刷新页面跳转登录页面还提示重新登录问题
|
3 years ago |
疯狂的狮子li
|
e810021b57
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
Conflicts:
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.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/SysRoleServiceImpl.java
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
|
3 years ago |
疯狂的狮子li
|
73831db0ce
|
fix 修复 角色菜单权限列表 返回体结构漏改
|
3 years ago |
RuoYi
|
642cfbda0a
|
修复分页组件请求两次问题
|
3 years ago |
疯狂的狮子li
|
d20921838e
|
发布 0.7.0 完成 代码生成 与 docker 部署 集成 sentinel 控制台
|
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
|
297193b6ce
|
代码生成编辑修改打开新页签
|
3 years ago |
RuoYi
|
dbca691746
|
优化代码
|
3 years ago |
疯狂的狮子li
|
d6a93184c4
|
发布 0.6.0 完成 分布式存储 支持 Minio、七牛、阿里、腾讯
|
3 years ago |
疯狂的狮子li
|
909539d934
|
fix 修复 资源文件 下载问题
|
3 years ago |
疯狂的狮子li
|
69e699946f
|
add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构
|
3 years ago |
疯狂的狮子Li
|
44674f0896
|
fix 修复验证码返回值问题
|
3 years ago |
疯狂的狮子li
|
bf151c5db2
|
update 补全 接口文档注解 调整返回类型为 R
|
3 years ago |
疯狂的狮子li
|
af983c4f2f
|
发布 0.5.0 完成 satoken 与 mybatis-plus 整合
|
3 years ago |
疯狂的狮子Li
|
db70abf9f0
|
!15 合并 新功能/satoken 分支
|
3 years ago |
疯狂的狮子li
|
c790e65937
|
Merge remote-tracking branch 'ruoyi-cloud/master'
# 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-datascope/pom.xml
# ruoyi-common/ruoyi-common-datasource/pom.xml
# ruoyi-common/ruoyi-common-log/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-file/pom.xml
# ruoyi-modules/ruoyi-gen/pom.xml
# ruoyi-modules/ruoyi-job/pom.xml
# ruoyi-modules/ruoyi-system/pom.xml
# ruoyi-ui/package.json
# ruoyi-ui/src/views/index.vue
# ruoyi-visual/pom.xml
# ruoyi-visual/ruoyi-monitor/pom.xml
|
3 years ago |