xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,609 Commits
3 Branches
0 Tags
150 MiB
Commit Graph

517 Commits (feb069560e117ced1fe69dcd33690feac0458f2c)

Author SHA1 Message Date
疯狂的狮子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 6e51026b51 update 修改 资源服务 不提供默认短信 sdk 依赖
RuoYi c98f452431 防止vue3主键字段名与row或ids一致导致报错的问题
疯狂的狮子li bbec3b5d8d add 新增 ruoyi-common-doc 整合 springdoc 基于 javadoc 实现无注解零入侵生成接口文档
疯狂的狮子li 9256e938c6 remove 移除所有 swagger 配置 准备对接 springdoc
疯狂的狮子li 8225235467 🦁 发布 1.1.0 新增 ELK 与三大 MQ 支持
RuoYi 87009e72bf 若依 3.6.0
疯狂的狮子Li ce673fdde5 fix 修复代码生成首字母大写问题
RuoYi f12baad00c 优化代码
疯狂的狮子li fae0df1905 add 完成 ELK 整合
疯狂的狮子li 93e52ae6ac update 优化 docker 部署方式 使用 host 模式简化部署流程 降低使用成本
疯狂的狮子li b877ec0e62 update 优化 使用 StreamUtils 简化业务流操纵
RuoYi a573c4b10d 字典类型删除多余的mapper注解
疯狂的狮子li 362ea7a95e 发布 1.0.0 正式版
疯狂的狮子li 2bade9c472 update 优化 代码生成 业务接口 增加事务回滚
疯狂的狮子li f6e1f4fca4 fix 修复 同步错误 password 无法查询问题
疯狂的狮子li 8607b39228 update 同步 ruoyi
RuoYi 570d468814 optimized code
若依 17246d8a27
简化逻辑判断 
Merge pull request  from 光速蜗牛/master
cgl a52d455032 简化逻辑判断
疯狂的狮子li f661d2ce13 update 优化 使用 maven 变量统一化 logback 配置文件服务名 简化配置
疯狂的狮子Li d2d23d1fbc update 简化生成代码注释
疯狂的狮子Li 7475cff47d
update 优化新增用户与角色信息、用户与岗位信息逻辑
疯狂的狮子Li cf20020b89 update 优化新增用户与角色信息、用户与岗位信息逻辑
疯狂的狮子li e1c789b947 update mybatis-plus 3.5.1 => 3.5.2 解决新版本兼容性问题 关键字冲突修改
疯狂的狮子li 713e039c44 发布 0.12.0 升级 seata 1.5.X 整合 seata 服务端
RuoYi b3d462e873 用户列表查询不显示密码字段
疯狂的狮子Li b59095b897 update 用户头像上传限制只能为图片格式
疯狂的狮子Li 2c5d743c0a update 修改 代码生成 controller 去除查询校验 由用户自行选择是否校验
疯狂的狮子Li 2f7f7c65da update 同步ruoyi最新修改
疯狂的狮子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
疯狂的狮子li e6439e04e0 update 优化 oss 回显查询 使用 redis 缓存
疯狂的狮子li 4bbf58d56d fix 修复 登录未选部门报空问题
RuoYi cdcc466300 升级fastjson到最新版2.0.4
疯狂的狮子li e42b2963e3 fix 修复脱敏实现逻辑问题
RuoYi 1d1b9501b7 用户头像上传限制只能为图片格式
RuoYi 386f3eb016 修复操作日志查询类型条件为0时会查到所有数据
疯狂的狮子Li ceb1825316 reset 重置错误修改
疯狂的狮子Li f0af90dd3f fix 修复 菜单部分字段 类型与数据库不匹配问题
疯狂的狮子li 55cef35287 fix 修复 编辑 OssConfig 字段重复问题 补全 remark 字段
疯狂的狮子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
疯狂的狮子li 8033fff523 update 优化 文件与图片上传组件 使用id存储回显
疯狂的狮子li 0666275a17 发布 0.11.0 增加 短信模块 邮件模块 重写oss模块功能
疯狂的狮子li f47f0808fd update 优化删除无用导包
疯狂的狮子li 3430b090e6 update 基于S3协议重新实现 OSS模块 支持自定义域名
若依 97500fbccb
简化返回值 
Merge pull request  from shawn/dev
疯狂的狮子li 6d9a89a65f fix 修复 SmsResult 字段类型变更报错
疯狂的狮子li 079b7c2455 add 增加 资源服务 短信与邮件 远程接口实现
疯狂的狮子li 92d07f2bfc update 迁移 短信和邮件功能 到资源服务
疯狂的狮子li 3f26b6a4b7 fix 修复 关闭短信功能 找不到bean异常问题