疯狂的狮子li
|
0427d362d9
|
update 同步 ruoyi 相关提交
* fix 修复Log注解GET请求记录不到参数问题
* fix 修复某些特性的环境生成代码变乱码TXT文件问题
* update 消除Vue3控制台出现的警告信息
* fix 开启TopNav没有子菜单隐藏侧边栏
* fix 修复回显数据字典数组异常问题(I60UYQ)
* update 忽略不必要的属性数据返回
|
2 years ago |
疯狂的狮子li
|
fb06ab9582
|
fix 修复 p6spy 配置文件乱码问题
|
2 years ago |
疯狂的狮子Li
|
62d1304f9a
|
update 数据源连接池从 druid 切换到 hikari
|
2 years ago |
疯狂的狮子li
|
4605d42cf4
|
update 优化 抽取 logback 通用配置 logback-common.xml 简化其他服务日志文件书写
|
2 years ago |
疯狂的狮子Li
|
0995b5e821
|
update 优化 调用toAjax时的冗余三元操作符
|
2 years ago |
疯狂的狮子li
|
bc376899b2
|
update 优化 vue3说明文件 编码问题
|
2 years ago |
疯狂的狮子li
|
2b6eb08c07
|
reset 回滚代码生成相关修复提交
|
2 years ago |
疯狂的狮子li
|
bd0cce5540
|
fix 修复 不同网段因reset请求头导致下载导出跨域问题
|
2 years ago |
疯狂的狮子li
|
5948f2594f
|
fix 修复 p6spy输出sql语句时间格式化不正确问题
|
2 years ago |
疯狂的狮子li
|
60f3757672
|
fix 修复 点击删除后点击取消控制台报错问题
|
2 years ago |
疯狂的狮子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 |
RuoYi
|
c98f452431
|
防止vue3主键字段名与row或ids一致导致报错的问题
|
3 years ago |
疯狂的狮子li
|
9256e938c6
|
remove 移除所有 swagger 配置 准备对接 springdoc
|
3 years ago |
疯狂的狮子Li
|
ce673fdde5
|
fix 修复代码生成首字母大写问题
|
3 years ago |
疯狂的狮子li
|
fae0df1905
|
add 完成 ELK 整合
|
3 years ago |
疯狂的狮子li
|
b877ec0e62
|
update 优化 使用 StreamUtils 简化业务流操纵
|
3 years ago |
疯狂的狮子li
|
2bade9c472
|
update 优化 代码生成 业务接口 增加事务回滚
|
3 years ago |
疯狂的狮子li
|
f661d2ce13
|
update 优化 使用 maven 变量统一化 logback 配置文件服务名 简化配置
|
3 years ago |
疯狂的狮子Li
|
d2d23d1fbc
|
update 简化生成代码注释
|
3 years ago |
疯狂的狮子Li
|
2c5d743c0a
|
update 修改 代码生成 controller 去除查询校验 由用户自行选择是否校验
|
3 years ago |
RuoYi
|
cdcc466300
|
升级fastjson到最新版2.0.4
|
3 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
|
3 years ago |
疯狂的狮子li
|
8fab5ac32d
|
add 新增 startup trace 监控
|
3 years ago |
RuoYi
|
70f306418f
|
修改代码生成树形选择器组件
|
3 years ago |
疯狂的狮子Li
|
37f08f6def
|
全面升级适配 SpringCloudAlibaba 2021.0.1.0 配置方式大更改
nacos client 降级 2.0.2 高于此版本会有问题 不影响nacos服务端版本
nacos 配置文件 application.yml 重命名为 application-common.yml 解决命名冲突问题
|
3 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
|
3 years ago |
RuoYi
|
6f7b02372e
|
代码生成树表新增(展开/折叠)
|
3 years ago |
疯狂的狮子Li
|
72c3327fd5
|
fix 修复 代码生成id未设置问题
|
3 years ago |
疯狂的狮子Li
|
3e7dd75f6d
|
update 优化代码与注释
|
3 years ago |
疯狂的狮子li
|
d25e313ffb
|
update 优化 logback 日志 异步输出
|
3 years ago |
疯狂的狮子li
|
e908329cc0
|
update 优化 TreeEntity 树实体 去除未知泛型
|
3 years ago |
疯狂的狮子li
|
eaf6fdc445
|
update 代码生成sql模板适配雪花id
|
3 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
|
3 years ago |
donghaoran
|
2444fcc646
|
fix_bug 修复遗漏的拼写错误
|
3 years ago |
RuoYi
|
8b3d75a6a0
|
开启TopNav没有子菜单情况隐藏侧边栏
|
3 years ago |
疯狂的狮子Li
|
7dff3c88a8
|
fix 修复变量拼写错误
|
3 years ago |
疯狂的狮子Li
|
4feb0adb6e
|
fix 修复变量拼写错误
|
3 years ago |
疯狂的狮子Li
|
32a4766e0e
|
fix 修复Oracle代码生成器空值更新报错问题
|
3 years ago |
疯狂的狮子li
|
9e7d4074f4
|
update 去除多余符号
|
3 years ago |
RuoYi
|
7a09412ecb
|
修复表单清除元素位置未垂直居中问题(I4V27B)
|
3 years ago |
疯狂的狮子li
|
c74884e232
|
update 简化查询代码生成列表功能
|
3 years ago |
疯狂的狮子li
|
a941caf3bd
|
update 优化去除sql差异化 时间范围统一使用 between 处理
|
3 years ago |
疯狂的狮子li
|
c55b80819c
|
fix 修复代码生成 基于路径生成 路径为空问题
|
3 years ago |
疯狂的狮子Li
|
e167ba5539
|
update 移除自定义注解 改为框架统一配置
|
3 years ago |
疯狂的狮子li
|
710864a4f2
|
fix 修复一些小问题
|
3 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
|
3 years ago |
RuoYi
|
089ebaf9c5
|
代码生成子表支持日期/字典配置
|
3 years ago |
疯狂的狮子Li
|
14c412113f
|
update 补全事务注解异常
|
3 years ago |
疯狂的狮子li
|
f1c3e5d1ea
|
update 优化代码生成 使用新 JsonUtils.parseMap 方法
|
3 years ago |
疯狂的狮子li
|
b9a3eba0b5
|
fix 回滚代码生成部分优化 修复优化导致的问题
|
3 years ago |