332 Commits (c787fc948e77ea9563a2aae8ff3166cde3640011)

Author SHA1 Message Date
疯狂的狮子li 0427d362d9 update 同步 ruoyi 相关提交
* fix 修复Log注解GET请求记录不到参数问题
* fix 修复某些特性的环境生成代码变乱码TXT文件问题
* update 消除Vue3控制台出现的警告信息
* fix 开启TopNav没有子菜单隐藏侧边栏
* fix 修复回显数据字典数组异常问题(I60UYQ)
* update 忽略不必要的属性数据返回
2 years ago
scmiot abfd090b80
优化Dockerfile创建目录命令
Signed-off-by: scmiot <scmiot@qq.com>
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 14f1c89409 !53 合并 skywalking 分支 完成整合
* add 新增 所有服务 docker 部署对接 skywalking
* add 新增 三大 mq 整合 skywalking
* add 新增 seata 整合 skywalking 手动编译 seata 插件包
* add 新增 ruoyi-common-skylog 整合 skywalking 日志推送
* add 增加 skywalking docker编排
2 years ago
疯狂的狮子Li 0995b5e821 update 优化 调用toAjax时的冗余三元操作符 2 years ago
疯狂的狮子li 21c5bca317 🐣发布 1.3.0 正式版 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 c6242d7dbe add 新增 ruoyi-common-sentinel 模块 支持使用服务名注册sentinel控制台 2 years ago
疯狂的狮子li baec889475 remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代 2 years ago
疯狂的狮子li 60f3757672 fix 修复 点击删除后点击取消控制台报错问题 2 years ago
疯狂的狮子li e2a5167368 🦁 发布 1.2.0 新增 SpringDoc 无注解文档生成 与 新增 easy-es 集成 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 bbec3b5d8d add 新增 ruoyi-common-doc 整合 springdoc 基于 javadoc 实现无注解零入侵生成接口文档 3 years ago
疯狂的狮子li 9256e938c6 remove 移除所有 swagger 配置 准备对接 springdoc 3 years ago
疯狂的狮子li 8225235467 🦁 发布 1.1.0 新增 ELK 与三大 MQ 支持 3 years ago
RuoYi 87009e72bf 若依 3.6.0 3 years ago
疯狂的狮子Li ce673fdde5 fix 修复代码生成首字母大写问题 3 years ago
疯狂的狮子li fae0df1905 add 完成 ELK 整合 3 years ago
疯狂的狮子li 93e52ae6ac update 优化 docker 部署方式 使用 host 模式简化部署流程 降低使用成本 3 years ago
疯狂的狮子li b877ec0e62 update 优化 使用 StreamUtils 简化业务流操纵 3 years ago
疯狂的狮子li 362ea7a95e 发布 1.0.0 正式版 3 years ago
疯狂的狮子li 2bade9c472 update 优化 代码生成 业务接口 增加事务回滚 3 years ago
疯狂的狮子li f661d2ce13 update 优化 使用 maven 变量统一化 logback 配置文件服务名 简化配置 3 years ago
疯狂的狮子Li d2d23d1fbc update 简化生成代码注释 3 years ago
疯狂的狮子li 713e039c44 发布 0.12.0 升级 seata 1.5.X 整合 seata 服务端 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 0666275a17 发布 0.11.0 增加 短信模块 邮件模块 重写oss模块功能 3 years ago
疯狂的狮子li 8fab5ac32d add 新增 startup trace 监控 3 years ago
RuoYi 70f306418f 修改代码生成树形选择器组件 3 years ago
疯狂的狮子Li 98756eae3f 发布 0.10.0 版本 全面升级 SpringCloud Alibaba 2021.0.1.0 最新版 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 d14f27e5eb 若依 3.5.0 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 d1832352de 发布 0.9.0 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 1fc833d876 发布 0.8.0 完成 国际化 功能, sentinel控制台 对接 nacos 3 years ago
疯狂的狮子Li 14c412113f
update 补全事务注解异常 3 years ago
疯狂的狮子li d20921838e 发布 0.7.0 完成 代码生成 与 docker 部署 集成 sentinel 控制台 3 years ago
疯狂的狮子li 44ac1c23a3 add 适配 docker 部署方式 3 years ago
疯狂的狮子li f1c3e5d1ea update 优化代码生成 使用新 JsonUtils.parseMap 方法 3 years ago
疯狂的狮子li b9a3eba0b5 fix 回滚代码生成部分优化 修复优化导致的问题 3 years ago
疯狂的狮子li 43a7181fc7 update 优化 代码生成 pr 代码 3 years ago
yueye 1e22d7ce70 update 修改 代码生成 适配所有新功能 3 years ago
疯狂的狮子li 4827f9217b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.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/ImageUtils.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/utils/sql/SqlUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.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/mapper/SysUserMapper.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/router/index.js
3 years ago
RuoYi 0e13296752 代码生成同步保留必填/类型选项 3 years ago
RuoYi dbca691746 优化代码 3 years ago
疯狂的狮子li ef3b77f8a8 update sa-token 1.28.0 => 1.29.0 解决dubbo启动报错问题 3 years ago
疯狂的狮子li d6a93184c4 发布 0.6.0 完成 分布式存储 支持 Minio、七牛、阿里、腾讯 3 years ago
疯狂的狮子li 69e699946f add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构 3 years ago
疯狂的狮子li bf151c5db2 update 补全 接口文档注解 调整返回类型为 R 3 years ago
疯狂的狮子li af983c4f2f 发布 0.5.0 完成 satoken 与 mybatis-plus 整合 3 years ago
疯狂的狮子Li db70abf9f0 !15 合并 新功能/satoken 分支 3 years ago
疯狂的狮子li 0e9ec77392 add 整合 mybatis-plus 重写所有业务 3 years ago
疯狂的狮子li 65fd3dcef6 update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题 3 years ago
RuoYi bd30f3d53a 若依 3.4.0 3 years ago
疯狂的狮子li b43a720a6d 发布 0.4.0 升级 3 years ago
疯狂的狮子li 07ba70ec8c add 集成 EasyExcel 框架 完成业务功能切换
update 优化 Validation 校验框架功能
update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
3 years ago
疯狂的狮子li 4bc137d113 fix 修复 升级带来的兼容性问题 3 years ago
疯狂的狮子li c28d9c208e Merge remote-tracking branch 'ruoyi-cloud/master'
# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
#	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
#	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
#	sql/ry_config_20220114.sql
3 years ago
疯狂的狮子li 384a52e3e9 fix 修复 dubbo 自动配置优先级高于 nacos 导致配置不生效 循环依赖报错 3 years ago
RuoYi d0a19e5b6f 定时任务屏蔽违规的字符 3 years ago
疯狂的狮子li 1de6f31b52 update 适配升级 springcloud 2021 springboot2.6 3 years ago
yueye ac4005c9dd add 新增 ruoyi-doc 模块 集成 Knife4j 3 years ago
疯狂的狮子li 94c732c439 add 自定义负载均衡模块 用于多团队开发 3 years ago
runphp d601b5781e
字段更新未同步 3 years ago
RuoYi 8223a5dcc4 Vue3前端代码生成模板同步到最新 3 years ago
疯狂的狮子li a95aa08d13 发布 0.3.0 新特性 集成 xxl-job 重构配置体系 3 years ago
疯狂的狮子li e3cd9e30c3 add 新增 集成 Xxl-Job 定时任务管理 3 years ago
疯狂的狮子Li 6bf7371d89 update 更改整体配置策略 使用注册中心命名空间隔离 3 years ago
疯狂的狮子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
3 years ago
疯狂的狮子li c6b955f4f5 update 补全插件版本号 避免maven构建警告 3 years ago
疯狂的狮子li 30f3fe7a26 update 更新动态日志开关与订阅服务配置 3 years ago