疯狂的狮子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 |
疯狂的狮子li
|
c0294cdab5
|
update 更改框架页面命名
|
3 years ago |
疯狂的狮子li
|
4bad9c3eed
|
update 更改 关于接口文档的说明
|
3 years ago |
RuoYi
|
9f90b4eba7
|
优化字典数据使用store存取
|
3 years ago |
疯狂的狮子li
|
8225235467
|
🦁 发布 1.1.0 新增 ELK 与三大 MQ 支持
|
3 years ago |
RuoYi
|
87009e72bf
|
若依 3.6.0
|
3 years ago |
RuoYi
|
e753cea03e
|
修改验证码开关变量名
|
3 years ago |
RuoYi
|
4b1351ef21
|
修改验证码开关变量名
|
4 years ago |
RuoYi
|
81d3c90bbc
|
添加新群号:148794840
|
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 |
疯狂的狮子li
|
31af8d93ba
|
fix 修复 演示页面导出路径错误
|
4 years ago |
RuoYi
|
95aa343805
|
优化字典数据回显样式下拉框显示值
|
4 years ago |
疯狂的狮子li
|
362ea7a95e
|
发布 1.0.0 正式版
|
4 years ago |
疯狂的狮子li
|
8607b39228
|
update 同步 ruoyi
|
4 years ago |
疯狂的狮子li
|
e46d286270
|
add 新增 ruoyi-demo 演示模块 用于编写一些测试及演示案例
|
4 years ago |
疯狂的狮子li
|
713e039c44
|
发布 0.12.0 升级 seata 1.5.X 整合 seata 服务端
|
4 years ago |
RuoYi
|
6cda8cb28f
|
表单构建按钮不显示正则校验
|
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
|
0666275a17
|
发布 0.11.0 增加 短信模块 邮件模块 重写oss模块功能
|
4 years ago |
疯狂的狮子li
|
3430b090e6
|
update 基于S3协议重新实现 OSS模块 支持自定义域名
|
4 years ago |
RuoYi
|
103bf66f77
|
修复字典数据显示不全问题
|
4 years ago |
疯狂的狮子li
|
cc963acdbe
|
update 更新 首页技术栈介绍
|
4 years ago |
疯狂的狮子Li
|
98756eae3f
|
发布 0.10.0 版本 全面升级 SpringCloud Alibaba 2021.0.1.0 最新版
|
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
|
d14f27e5eb
|
若依 3.5.0
|
4 years ago |
RuoYi
|
f7b761275c
|
添加页签openPage支持传递参数
|
4 years ago |
疯狂的狮子Li
|
73eb9cc7d7
|
update 修改角色适配 采用 get set 转换数据类型
|
4 years ago |
疯狂的狮子Li
|
487f18a930
|
fix 修复 用户绑定角色 与 角色绑定用户 异常 编写错误
|
4 years ago |
疯狂的狮子li
|
794c902773
|
update 优化 SysRole 部分字段类型 防止数据库类型映射异常
|
4 years ago |
RuoYi
|
242101ae6e
|
添加新群号:213618602
|
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
|
d1832352de
|
发布 0.9.0
|
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
|
1fc833d876
|
发布 0.8.0 完成 国际化 功能, sentinel控制台 对接 nacos
|
4 years ago |
疯狂的狮子li
|
dc6f7cd691
|
add 完成 国际化 功能
|
4 years ago |
疯狂的狮子li
|
73831db0ce
|
fix 修复 角色菜单权限列表 返回体结构漏改
|
4 years ago |
疯狂的狮子li
|
d20921838e
|
发布 0.7.0 完成 代码生成 与 docker 部署 集成 sentinel 控制台
|
4 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
|
4 years ago |
RuoYi
|
297193b6ce
|
代码生成编辑修改打开新页签
|
4 years ago |
RuoYi
|
dbca691746
|
优化代码
|
4 years ago |
疯狂的狮子li
|
d6a93184c4
|
发布 0.6.0 完成 分布式存储 支持 Minio、七牛、阿里、腾讯
|
4 years ago |