ly
/
Stwzhj-Cloud-Plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,901 Commits
6 Branches
0 Tags
110 MiB
Commit Graph

114 Commits (02be6526cd0fe935a2101e0da84c70a64bc43249)

Author SHA1 Message Date
疯狂的狮子li 0427d362d9 update 同步 ruoyi 相关提交 
* fix 修复Log注解GET请求记录不到参数问题
* fix 修复某些特性的环境生成代码变乱码TXT文件问题
* update 消除Vue3控制台出现的警告信息
* fix 开启TopNav没有子菜单隐藏侧边栏
* fix 修复回显数据字典数组异常问题(I60UYQ)
* update 忽略不必要的属性数据返回
 2022-11-24 15:26:03 +08:00
疯狂的狮子li fb06ab9582 fix 修复 p6spy 配置文件乱码问题 2022-11-08 09:30:14 +08:00
疯狂的狮子Li 62d1304f9a update 数据源连接池从 druid 切换到 hikari 2022-11-08 00:36:24 +08:00
疯狂的狮子li 4605d42cf4 update 优化 抽取 logback 通用配置 logback-common.xml 简化其他服务日志文件书写 2022-11-02 17:22:47 +08:00
疯狂的狮子Li 0995b5e821 update 优化 调用toAjax时的冗余三元操作符 2022-10-29 17:38:05 +08:00
疯狂的狮子li bc376899b2 update 优化 vue3说明文件 编码问题 2022-09-23 15:06:36 +08:00
疯狂的狮子li 5948f2594f fix 修复 p6spy输出sql语句时间格式化不正确问题 2022-09-14 14:46:30 +08:00
疯狂的狮子li 60f3757672 fix 修复 点击删除后点击取消控制台报错问题 2022-08-23 18:39:27 +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
RuoYi c98f452431 防止vue3主键字段名与row或ids一致导致报错的问题 2022-07-26 20:05:56 +08:00
疯狂的狮子li 9256e938c6 remove 移除所有 swagger 配置 准备对接 springdoc 2022-07-22 18:46:07 +08:00
疯狂的狮子li fae0df1905 add 完成 ELK 整合 2022-07-12 11:41:59 +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 2c5d743c0a update 修改 代码生成 controller 去除查询校验 由用户自行选择是否校验 2022-05-28 23:31:18 +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
RuoYi 70f306418f 修改代码生成树形选择器组件 2022-04-25 10:30:02 +08:00
疯狂的狮子Li 37f08f6def 全面升级适配 SpringCloudAlibaba 2021.0.1.0 配置方式大更改 
nacos client 降级 2.0.2 高于此版本会有问题 不影响nacos服务端版本
nacos 配置文件 application.yml 重命名为 application-common.yml 解决命名冲突问题
 2022-04-13 12:43:32 +08:00
疯狂的狮子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
 2022-04-11 12:15:49 +08:00
RuoYi 6f7b02372e 代码生成树表新增(展开/折叠) 2022-04-07 11:04:16 +08:00
疯狂的狮子li d25e313ffb update 优化 logback 日志 异步输出 2022-03-21 13:33:20 +08:00
疯狂的狮子li e908329cc0 update 优化 TreeEntity 树实体 去除未知泛型 2022-03-15 13:22:00 +08:00
疯狂的狮子li eaf6fdc445 update 代码生成sql模板适配雪花id 2022-03-15 12:03:41 +08:00
疯狂的狮子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
 2022-03-15 10:24:40 +08:00
RuoYi 8b3d75a6a0 开启TopNav没有子菜单情况隐藏侧边栏 2022-03-06 09:05:56 +08:00
RuoYi 7a09412ecb 修复表单清除元素位置未垂直居中问题(I4V27B) 2022-03-04 19:26:47 +08:00
疯狂的狮子li c74884e232 update 简化查询代码生成列表功能 2022-03-04 13:40:11 +08:00
疯狂的狮子li a941caf3bd update 优化去除sql差异化 时间范围统一使用 between 处理 2022-03-03 11:28:53 +08:00
疯狂的狮子li 710864a4f2 fix 修复一些小问题 2022-02-25 18:42:27 +08:00
疯狂的狮子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
 2022-02-24 15:24:01 +08:00
RuoYi 089ebaf9c5 代码生成子表支持日期/字典配置 2022-02-24 09:29:53 +08:00
疯狂的狮子li 43a7181fc7 update 优化 代码生成 pr 代码 2022-02-14 16:01:53 +08:00
yueye 1e22d7ce70 update 修改 代码生成 适配所有新功能 2022-02-14 15:46:44 +08:00
疯狂的狮子li bf151c5db2 update 补全 接口文档注解 调整返回类型为 R 2022-01-29 11:21:25 +08:00
疯狂的狮子Li db70abf9f0 !15 合并 新功能/satoken 分支 2022-01-28 11:35:54 +00:00
疯狂的狮子li 0e9ec77392 add 整合 mybatis-plus 重写所有业务 2022-01-26 20:33:39 +08:00
疯狂的狮子li 07ba70ec8c add 集成 EasyExcel 框架 完成业务功能切换 
update 优化 Validation 校验框架功能
update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
 2022-01-21 18:19:22 +08:00
疯狂的狮子li 384a52e3e9 fix 修复 dubbo 自动配置优先级高于 nacos 导致配置不生效 循环依赖报错 2022-01-17 15:06:10 +08:00
疯狂的狮子li 1de6f31b52 update 适配升级 springcloud 2021 springboot2.6 2022-01-13 13:04:43 +08:00
yueye ac4005c9dd add 新增 ruoyi-doc 模块 集成 Knife4j 2022-01-12 16:32:19 +08:00
RuoYi 8223a5dcc4 Vue3前端代码生成模板同步到最新 2022-01-11 18:10:40 +08:00
疯狂的狮子li e3cd9e30c3 add 新增 集成 Xxl-Job 定时任务管理 2022-01-10 11:46:56 +08:00
疯狂的狮子Li 6bf7371d89 update 更改整体配置策略 使用注册中心命名空间隔离 2022-01-10 00:48:27 +08:00
疯狂的狮子li 3efd7c7bd4 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/constant/Constants.java
	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
 2022-01-07 15:36:16 +08:00
疯狂的狮子li 30f3fe7a26 update 更新动态日志开关与订阅服务配置 2022-01-06 15:26:17 +08:00
疯狂的狮子li d728d116e9 update 共享配置支持动态刷新 2022-01-06 15:08:20 +08:00
RuoYi 6274bfcd8c 代码生成列表图片支持预览 2022-01-04 20:20:11 +08:00
疯狂的狮子li 4a9929f307 add 增加监控中心 在线日志监控 优化日志文件格式 2021-12-31 15:00:59 +08:00
疯狂的狮子li e1ee9d467b update 合并配置文件 2021-12-31 13:56:26 +08:00
疯狂的狮子Li 42a196f875 update 项目细节调整 多环境配置文件调整 2021-12-30 23:12:38 +08:00