Commit Graph

179 Commits (6678ec6b7bc5b20319e5a4bd39d3145cd3f0fc9c)

Author SHA1 Message Date
疯狂的狮子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 14c412113f
update 补全事务注解异常 2022-02-17 11:15:34 +00:00
疯狂的狮子li f1c3e5d1ea update 优化代码生成 使用新 JsonUtils.parseMap 方法 2022-02-15 12:16:29 +08:00
疯狂的狮子li b9a3eba0b5 fix 回滚代码生成部分优化 修复优化导致的问题 2022-02-15 11:11:03 +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 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
2022-02-14 14:55:55 +08:00
RuoYi 0e13296752 代码生成同步保留必填/类型选项 2022-02-13 21:09:16 +08:00
RuoYi dbca691746 优化代码 2022-02-12 14:23:11 +08:00
疯狂的狮子li 69e699946f add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构 2022-02-09 18:59:04 +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 65fd3dcef6 update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题 2022-01-26 15:29:31 +08:00
疯狂的狮子li 07ba70ec8c add 集成 EasyExcel 框架 完成业务功能切换
update 优化 Validation 校验框架功能
update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
2022-01-21 18:19:22 +08:00
疯狂的狮子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
2022-01-17 15:58:59 +08:00
疯狂的狮子li 384a52e3e9 fix 修复 dubbo 自动配置优先级高于 nacos 导致配置不生效 循环依赖报错 2022-01-17 15:06:10 +08:00
RuoYi d0a19e5b6f 定时任务屏蔽违规的字符 2022-01-14 10:53:03 +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
runphp d601b5781e
字段更新未同步 2022-01-12 02:12:09 +00: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
疯狂的狮子li 5aa45e7a92 update 修改失效配置 2022-01-06 11:28:57 +08:00
疯狂的狮子li 4c20bf7137 add 集成 dubbo 实现高性能 rpc 远程调用
update 回滚到 dubbo2.7.8

add 增加 dubbo 日志打印过滤器

update 优化代码 dubbo 用法
2022-01-05 14:34:54 +08:00
RuoYi 6274bfcd8c 代码生成列表图片支持预览 2022-01-04 20:20:11 +08:00
疯狂的狮子li db9fd081e6 全项目代码格式化 2021-12-31 16:31:17 +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
疯狂的狮子li 1ece3f0415 update 使用 jackson 全局处理时间 2021-12-30 17:57:31 +08:00
疯狂的狮子li 4e2d2858c7 update 使用 jackson 全局处理时间 2021-12-30 17:44:50 +08:00
疯狂的狮子li a57be1eab9 Merge remote-tracking branch 'ruoyi-cloud/master' 2021-12-27 11:19:01 +08:00
RuoYi efaaacabb0 优化代码生成字典组重复问题 2021-12-24 15:47:48 +08:00
疯狂的狮子li cb931f4c61 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/SysUser.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
2021-12-22 13:33:48 +08:00
RuoYi 5c90f0bbb7 新增Vue3前端代码生成模板 2021-12-16 09:59:46 +08:00
疯狂的狮子li 6b0070a437 update 抽取所有公用配置到 maven profile 管理 2021-12-01 14:57:58 +08:00
疯狂的狮子li 9dd3fca1c8 update 补全 lombok 注解 2021-12-01 10:14:25 +08:00
疯狂的狮子li 5a18beaefa Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-11-29 15:41:11 +08:00
Ricky 2a452a00e0 升级velocity到最新版本2.3(语法升级) 2021-11-25 15:23:46 +08:00
Ricky 4d4123243c 修复代码生成复选框字典遗漏问题 2021-11-25 13:42:06 +08:00
RuoYi 08885f65cd 升级velocity到最新版本2.3 2021-11-24 16:40:18 +08:00
RuoYi 73b38b143b 代码生成模板主子表删除方法缺少事务 2021-11-18 17:54:20 +08:00
疯狂的狮子li 0036a2a60c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-11-17 19:43:12 +08:00
RuoYi 173c0e384f 优化导出数据操作 2021-11-17 12:12:58 +08:00