Commit Graph

722 Commits

Author SHA1 Message Date
RuoYi
b51c127eb7 数据逻辑删除不进行唯一验证 2022-08-03 16:53:11 +08:00
疯狂的狮子li
b74055f120 fix 修复用户导出字典使用错误 2022-08-01 18:18:30 +08:00
RuoYi
8fdb3c4d14 修复使用FastDFS上传头像失败提示文件名没有后缀问题 2022-07-30 22:53:44 +08:00
RuoYi
0ef63207f4 新增密码错误次数限制 2022-07-30 13:56:46 +08:00
RuoYi
1295177393 优化任务过期不执行调度 2022-07-30 13:49:36 +08:00
疯狂的狮子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
2022-07-27 18:52:46 +08:00
疯狂的狮子li
6e51026b51 update 修改 资源服务 不提供默认短信 sdk 依赖 2022-07-27 09:54:50 +08:00
RuoYi
c98f452431 防止vue3主键字段名与row或ids一致导致报错的问题 2022-07-26 20:05:56 +08:00
疯狂的狮子li
bbec3b5d8d add 新增 ruoyi-common-doc 整合 springdoc 基于 javadoc 实现无注解零入侵生成接口文档 2022-07-23 14:10:00 +08:00
疯狂的狮子li
9256e938c6 remove 移除所有 swagger 配置 准备对接 springdoc 2022-07-22 18:46:07 +08:00
疯狂的狮子li
8225235467 🦁 发布 1.1.0 新增 ELK 与三大 MQ 支持 2022-07-18 09:41:42 +08:00
RuoYi
87009e72bf 若依 3.6.0 2022-07-16 10:34:02 +08:00
疯狂的狮子Li
ce673fdde5 fix 修复代码生成首字母大写问题 2022-07-15 20:44:02 +08:00
RuoYi
f12baad00c 优化代码 2022-07-12 18:19:10 +08:00
疯狂的狮子li
fae0df1905 add 完成 ELK 整合 2022-07-12 11:41:59 +08:00
疯狂的狮子li
93e52ae6ac update 优化 docker 部署方式 使用 host 模式简化部署流程 降低使用成本 2022-07-11 15:29:38 +08:00
疯狂的狮子li
b877ec0e62 update 优化 使用 StreamUtils 简化业务流操纵 2022-07-05 11:17:51 +08:00
RuoYi
a573c4b10d 字典类型删除多余的mapper注解 2022-06-26 13:13:20 +08:00
疯狂的狮子li
362ea7a95e 发布 1.0.0 正式版 2022-06-20 10:03:53 +08:00
疯狂的狮子li
2bade9c472 update 优化 代码生成 业务接口 增加事务回滚 2022-06-17 10:36:40 +08:00
疯狂的狮子li
f6e1f4fca4 fix 修复 同步错误 password 无法查询问题 2022-06-16 16:22:07 +08:00
疯狂的狮子li
8607b39228 update 同步 ruoyi 2022-06-15 18:33:17 +08:00
RuoYi
570d468814 optimized code 2022-06-13 20:57:03 +08:00
若依
17246d8a27 !199 简化逻辑判断
Merge pull request !199 from 光速蜗牛/master
2022-06-13 12:48:42 +00:00
cgl
a52d455032 简化逻辑判断 2022-06-13 17:05:23 +08:00
疯狂的狮子li
f661d2ce13 update 优化 使用 maven 变量统一化 logback 配置文件服务名 简化配置 2022-06-10 14:08:55 +08:00
疯狂的狮子Li
d2d23d1fbc update 简化生成代码注释 2022-06-09 00:46:37 +08:00
疯狂的狮子Li
7475cff47d update 优化新增用户与角色信息、用户与岗位信息逻辑 2022-06-08 13:55:25 +00:00
疯狂的狮子Li
cf20020b89 update 优化新增用户与角色信息、用户与岗位信息逻辑 2022-06-08 21:47:30 +08:00
疯狂的狮子li
e1c789b947 update mybatis-plus 3.5.1 => 3.5.2 解决新版本兼容性问题 关键字冲突修改 2022-06-01 13:24:55 +08:00
疯狂的狮子li
713e039c44 发布 0.12.0 升级 seata 1.5.X 整合 seata 服务端 2022-05-31 19:24:30 +08:00
RuoYi
b3d462e873 用户列表查询不显示密码字段 2022-05-29 09:49:29 +08:00
疯狂的狮子Li
b59095b897 update 用户头像上传限制只能为图片格式 2022-05-28 23:47:27 +08:00
疯狂的狮子Li
2c5d743c0a update 修改 代码生成 controller 去除查询校验 由用户自行选择是否校验 2022-05-28 23:31:18 +08:00
疯狂的狮子Li
2f7f7c65da update 同步ruoyi最新修改 2022-05-28 22:22:15 +08:00
疯狂的狮子Li
4e0648171c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
	ruoyi-common/ruoyi-common-core/pom.xml
	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/ServletUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
	ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
	ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.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/controller/SysProfileController.java
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
	sql/ry_config_20220510.sql
2022-05-28 22:17:33 +08:00
疯狂的狮子li
e6439e04e0 update 优化 oss 回显查询 使用 redis 缓存 2022-05-27 09:59:39 +08:00
疯狂的狮子li
4bbf58d56d fix 修复 登录未选部门报空问题 2022-05-27 09:34:59 +08:00
RuoYi
cdcc466300 升级fastjson到最新版2.0.4 2022-05-26 10:04:13 +08:00
疯狂的狮子li
e42b2963e3 fix 修复脱敏实现逻辑问题 2022-05-25 10:38:10 +08:00
RuoYi
1d1b9501b7 用户头像上传限制只能为图片格式 2022-05-22 19:16:52 +08:00
RuoYi
386f3eb016 修复操作日志查询类型条件为0时会查到所有数据 2022-05-22 19:14:12 +08:00
疯狂的狮子Li
ceb1825316 reset 重置错误修改 2022-05-19 21:49:05 +08:00
疯狂的狮子Li
f0af90dd3f fix 修复 菜单部分字段 类型与数据库不匹配问题 2022-05-19 21:30:18 +08:00
疯狂的狮子li
55cef35287 fix 修复 编辑 OssConfig 字段重复问题 补全 remark 字段 2022-05-18 10:10:57 +08:00
疯狂的狮子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
2022-05-16 09:43:10 +08:00
疯狂的狮子li
8033fff523 update 优化 文件与图片上传组件 使用id存储回显 2022-05-12 10:57:10 +08:00
疯狂的狮子li
0666275a17 发布 0.11.0 增加 短信模块 邮件模块 重写oss模块功能 2022-05-10 14:54:53 +08:00
疯狂的狮子li
f47f0808fd update 优化删除无用导包 2022-05-10 14:48:48 +08:00
疯狂的狮子li
3430b090e6 update 基于S3协议重新实现 OSS模块 支持自定义域名 2022-05-10 14:48:01 +08:00