From 3786e6f078b6bd80556fe6aa00f514977b97e9ca Mon Sep 17 00:00:00 2001 From: dataprince Date: Fri, 22 Dec 2023 10:51:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E2=80=9C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=E2=80=9D=E7=9A=84=E2=80=9C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E2=80=9D=E9=94=99=E8=AF=AF=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=89=A7=E8=A1=8Cudate.sql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- pom.xml | 12 ++++++------ ruoyi-common/ruoyi-common-bom/pom.xml | 2 +- sql/mysql/update.sql | 7 ++++++- sql/postgresql/update.sql | 6 ++++++ 5 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 sql/postgresql/update.sql diff --git a/README.md b/README.md index c042e3c..483f592 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ## 1、平台简介 -Ruoyi-Flex是一套全部开源的快速开发平台，使用MIT开源许可协议，毫无保留给个人及企业免费使用。基于RuoYi-Vue、RuoYi-Vue-Plus，集成MyBatis-Flex、JDK21、SpringBootV3.2.X+、Lombok、Sa-Token、SpringDoc、Hutool、SpringBoot Admin、PowerJob、Vue3、Element-Plus、MinIO等优秀开源软件。 +Ruoyi-Flex是一套全部开源的快速开发平台，使用MIT开源许可协议，毫无保留给个人及企业免费使用。基于RuoYi-Vue、RuoYi-Vue-Plus，集成MyBatis-Flex、JDK21、SpringBootV3.2.X+、Lombok、Sa-Token、SpringDoc、Hutool、SpringBoot Admin、PowerJob、Vue3、Element-Plus、MinIO等优秀开源软件，支持PostgreSQL、MySQL开源数据库及其衍生分布式数据库。 ## 2、系统特色 Ruoyi-Flex秉承“写的更少、性能更好、出错更低、交流通畅、快速入门” 的理念，为您带来全方位的赋能与提升： @@ -53,7 +53,7 @@ Ruoyi-Flex实行前后端分离仓库，本项目是java后端部分，前端项 15. 系统接口：集成springdoc，根据文档注释自动生成相关的api接口文档。 16. 监控中心：集成Spring Boot Admin，监视集群系统CPU、内存、磁盘、堆栈、在线日志、Spring相关配置等。 17. 缓存监控：对系统的缓存信息查询，命令统计等。 -18. 后台数据库支持：MySQL、PostgreSQL数据库。 +18. 后台数据库：支持PostgreSQL、MySQL开源数据库及其衍生分布式数据库。 19. 演示模块：mybatis、mybatis-flex两种格式代码的单表、树表、主子表三种类型的演示程序。 ## 5、演示图 diff --git a/pom.xml b/pom.xml index fd8c38c..0bbfdf5 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ Ruoyi-Flex管理系统 - 4.2.0 + 5.0.0-SNAPSHOT UTF-8 UTF-8 21 @@ -47,7 +47,7 @@ 3.25.1 2.2.4 2.14.3 - 3.1.6 + 3.1.7 4.3.6 2.7.0 @@ -122,10 +122,10 @@ test - - org.springframework.boot - spring-boot-starter-jdbc - + + + + diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index 420f3d3..d6458af 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -14,7 +14,7 @@ - 4.2.0 + 5.0.0-SNAPSHOT diff --git a/sql/mysql/update.sql b/sql/mysql/update.sql index 492ced9..df9ec58 100644 --- a/sql/mysql/update.sql +++ b/sql/mysql/update.sql @@ -27,4 +27,9 @@ ALTER TABLE `sys_tenant` ALTER TABLE `sys_user` CHANGE COLUMN `del_flag` `del_flag` SMALLINT NULL DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）' COLLATE 'utf8mb4_bin' AFTER `status`; - +----升级 from V4.2.0 to V5.0.0: +--修正“任务调度”的“任务管理”错误： +UPDATE `pj_job_info` SET `processor_info`='com.ruoyi.job.processors.StandaloneProcessorDemo' WHERE `id`=1; +UPDATE `pj_job_info` SET `processor_info`='com.ruoyi.job.processors.BroadcastProcessorDemo' WHERE `id`=2; +UPDATE `pj_job_info` SET `processor_info`='com.ruoyi.job.processors.MapProcessorDemo' WHERE `id`=3; +UPDATE `pj_job_info` SET `processor_info`='com.ruoyi.job.processors.MapReduceProcessorDemo' WHERE `id`=4; diff --git a/sql/postgresql/update.sql b/sql/postgresql/update.sql new file mode 100644 index 0000000..d97b235 --- /dev/null +++ b/sql/postgresql/update.sql @@ -0,0 +1,6 @@ +----升级 from V4.2.0 to V5.0.0: +--修正“任务调度”的“任务管理”错误： +UPDATE "public"."pj_job_info" SET "alarm_config"='{"alertThreshold":0,"silenceWindowLen":0,"statisticWindowLen":0}', "log_config"='{"type":1}', "processor_info"='com.ruoyi.job.processors.StandaloneProcessorDemo' WHERE "id"=1; +UPDATE "public"."pj_job_info" SET "alarm_config"='{"alertThreshold":0,"silenceWindowLen":0,"statisticWindowLen":0}', "log_config"='{"type":1}', "processor_info"='com.ruoyi.job.processors.BroadcastProcessorDemo' WHERE "id"=2; +UPDATE "public"."pj_job_info" SET "alarm_config"='{"alertThreshold":0,"silenceWindowLen":0,"statisticWindowLen":0}', "log_config"='{"type":1}', "processor_info"='com.ruoyi.job.processors.MapProcessorDemo' WHERE "id"=3; +UPDATE "public"."pj_job_info" SET "alarm_config"='{"alertThreshold":0,"silenceWindowLen":0,"statisticWindowLen":0}', "log_config"='{"type":1}', "processor_info"='com.ruoyi.job.processors.MapReduceProcessorDemo' WHERE "id"=4;