Commit Graph

381 Commits (21c3635a04e8ae4802b6541169b88296d08098ff)

Author SHA1 Message Date
疯狂的狮子li f6d00e7da3 update 优化 前后端多环境部署保持一致 删除无用环境文件
疯狂的狮子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
疯狂的狮子li c0294cdab5 update 更改框架页面命名
疯狂的狮子Li 3c15950bc9 fix 修复 图片回显查询 路径错误问题
疯狂的狮子li 4bad9c3eed update 更改 关于接口文档的说明
RuoYi 5e20f99a99 优化布局设置使用el-drawer抽屉显示
RuoYi 9f90b4eba7 优化字典数据使用store存取
RuoYi ce82095f04 防止date-picker组件报错,降级element-ui版本
疯狂的狮子li 8225235467 🦁 发布 1.1.0 新增 ELK 与三大 MQ 支持
RuoYi 87009e72bf 若依 3.6.0
RuoYi 1543fb801b 升级element-ui到最新版本2.15.9
RuoYi e753cea03e 修改验证码开关变量名
RuoYi 4b1351ef21 修改验证码开关变量名
RuoYi 81d3c90bbc 添加新群号:148794840
疯狂的狮子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
疯狂的狮子li 31af8d93ba fix 修复 演示页面导出路径错误
RuoYi 20476e9dd1 默认不启用压缩文件缓存防止node_modules过大
RuoYi 95aa343805 优化字典数据回显样式下拉框显示值
疯狂的狮子li 362ea7a95e 发布 1.0.0 正式版
疯狂的狮子li 8607b39228 update 同步 ruoyi
RuoYi 8ee702e4a2 reset babel
RuoYi 570d468814 optimized code
疯狂的狮子li e46d286270 add 新增 ruoyi-demo 演示模块 用于编写一些测试及演示案例
清溪先生 5a48c5dba7 修复【增加对空字符串参数的过滤】提交的参数判断问题;
Signed-off-by: 清溪先生 <usfree2021@163.com>
疯狂的狮子li 713e039c44 发布 0.12.0 升级 seata 1.5.X 整合 seata 服务端
RuoYi 6cda8cb28f 表单构建按钮不显示正则校验
RuoYi 9c29907d57 增加对空字符串参数的过滤
疯狂的狮子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
huyikai 2eaa52c7aa Unexpected use of comma operator
疯狂的狮子li 8033fff523 update 优化 文件与图片上传组件 使用id存储回显
huyikai 86b9e675b5 体验优化-用户管理左侧树型组件增加选中高亮保持。
疯狂的狮子li 4e7ea02f9a update 优化 弹窗点击遮罩层 默认不关闭 可在 main.js 修改
疯狂的狮子li 3ecf75a1fb update 优化 上传组件 部分用户存储url串 导致无法回显问题
疯狂的狮子li 0666275a17 发布 0.11.0 增加 短信模块 邮件模块 重写oss模块功能
疯狂的狮子li 3430b090e6 update 基于S3协议重新实现 OSS模块 支持自定义域名
RuoYi 103bf66f77 修复字典数据显示不全问题
疯狂的狮子li b6c6a58a93 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java
	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/utils/PageUtils.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/page/TableSupport.java
	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
	ruoyi-ui/package.json
疯狂的狮子li cc963acdbe update 更新 首页技术栈介绍
疯狂的狮子Li 06b59e404c update 优化文件上传、图片上传组件 文件列表展示文件原名便于后续处理, 完善组件删除功能
RuoYi a0ce434163 升级element-ui到最新版本2.15.8
疯狂的狮子Li 98756eae3f 发布 0.10.0 版本 全面升级 SpringCloud Alibaba 2021.0.1.0 最新版
疯狂的狮子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 f7b761275c 添加页签openPage支持传递参数
RuoYi 6f5c149ba0 降级jsencrypt版本兼容IE浏览器
疯狂的狮子Li e29c470cc7
fix 修复增加应用路径路由不生效问题
疯狂的狮子Li 73eb9cc7d7 update 修改角色适配 采用 get set 转换数据类型
RuoYi 55a7a90bab update registry source
RuoYi a70d5ee2ab topNav自定义隐藏侧边栏路由
疯狂的狮子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