diff --git a/README.md b/README.md index 66316565f8d2baaecc49c69095c9334ade18450f..160b57d742f850cb14665bdd348c694e8b618f35 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # acp-admin-cloud -###### v6.8.0 [版本更新日志](doc/version_history.md) +###### v6.8.1 [版本更新日志](doc/version_history.md) - 使用Application Construction Platform 应用构建平台作为脚手架 - 基于 Spring Cloud 的微服务版本，基于 Spring Boot @@ -9,9 +9,9 @@ ## 相关组件版本 -- [Spring Boot 3.4.5](https://projects.spring.io/spring-boot) -- [Spring Boot Admin 3.4.5](https://github.com/codecentric/spring-boot-admin) -- [Acp 2025.4.0](https://gitee.com/zhangbinhub/acp) +- [Spring Boot 3.4.6](https://projects.spring.io/spring-boot) +- [Spring Boot Admin 3.4.7](https://github.com/codecentric/spring-boot-admin) +- [Acp 2025.4.1](https://gitee.com/zhangbinhub/acp) - [sensitive](https://github.com/houbb/sensitive) ## 技术栈 diff --git a/doc/version_history.md b/doc/version_history.md index 69a1f2588aafbe19402cf24055b6ad2b018b90f0..318004eb411538658edbf11ad6fde436ad1356e3 100644 --- a/doc/version_history.md +++ b/doc/version_history.md @@ -1,5 +1,14 @@ ## 版本更新记录 +##### v6.8.1 + +- Global + - [Upgrade] 升级依赖 + - Kotlin 2.1.21 + - Acp 2025.4.1 + - Spring Boot 3.4.6 + - Spring Boot Admin 3.4.7 + ##### v6.8.0 - Global diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 30765920057514b1e70997a8a70bd23f8157a0ee..f7fb1b804490754e2a4be55717e640f3ceb681df 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -3,11 +3,11 @@ ext { } versions += [ - kotlin : "2.1.0", - springBoot : "3.4.5", - springBootAdmin : "3.4.5", - acp : "2025.4.0", + kotlin : "2.1.21", + springBoot : "3.4.6", + springBootAdmin : "3.4.7", + acp : "2025.4.1", sensitive : "1.7.0", sensitiveDeepCopy: "0.0.1", - mysql : "9.1.0" + mysql : "9.2.0" ] \ No newline at end of file diff --git a/gradle/moduleVersion.gradle b/gradle/moduleVersion.gradle index eb0d39aef057fb50b78e0ff2c733673c3a42ffad..95058a1490900b635d50a826dee4084e3b92bf9c 100644 --- a/gradle/moduleVersion.gradle +++ b/gradle/moduleVersion.gradle @@ -1,30 +1,30 @@ project(':acp-admin-cloud-constant') { - version '6.8.0' + version '6.8.1' } project(':acp-admin-cloud-dependencies') { - version '6.8.0' + version '6.8.1' } project(':acp-admin-cloud-dependencies-resource-server') { - version '6.8.0' + version '6.8.1' } project(':admin-server') { - version '6.8.0' + version '6.8.1' } project(':deploy-server') { - version '6.8.0' + version '6.8.1' } project(':gateway-server') { - version '6.8.0' + version '6.8.1' } project(':log-server') { - version '6.8.0' + version '6.8.1' } project(':oauth-server') { - version '6.8.0' + version '6.8.1' } project(':route-server') { - version '6.8.0' + version '6.8.1' } project(':workflow-server') { - version '6.8.0' + version '6.8.1' } \ No newline at end of file diff --git a/modules/workflow-server/src/main/resources/init-sql/mysql/warm-flow-all.sql b/modules/workflow-server/src/main/resources/init-sql/mysql/warm-flow-all.sql index 7dead0aa02a84d39da2def04f18d24c8ca084f51..e35a53ec00aa87f0abf628fab712a72534695a05 100644 --- a/modules/workflow-server/src/main/resources/init-sql/mysql/warm-flow-all.sql +++ b/modules/workflow-server/src/main/resources/init-sql/mysql/warm-flow-all.sql @@ -105,25 +105,25 @@ CREATE TABLE IF NOT EXISTS `flow_task` CREATE TABLE IF NOT EXISTS `flow_his_task` ( - `id` bigint(20) NOT NULL COMMENT '主键id', - `definition_id` bigint(20) NOT NULL COMMENT '对应flow_definition表的id', - `instance_id` bigint(20) NOT NULL COMMENT '对应flow_instance表的id', - `task_id` bigint(20) NOT NULL COMMENT '对应flow_task表的id', + `id` bigint(20) NOT NULL COMMENT '主键id', + `definition_id` bigint(20) NOT NULL COMMENT '对应flow_definition表的id', + `instance_id` bigint(20) NOT NULL COMMENT '对应flow_instance表的id', + `task_id` bigint(20) NOT NULL COMMENT '对应flow_task表的id', `node_code` varchar(100) DEFAULT NULL COMMENT '开始节点编码', `node_name` varchar(100) DEFAULT NULL COMMENT '开始节点名称', `node_type` tinyint(1) DEFAULT NULL COMMENT '开始节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）', `target_node_code` varchar(200) DEFAULT NULL COMMENT '目标节点编码', `target_node_name` varchar(200) DEFAULT NULL COMMENT '结束节点名称', `approver` varchar(40) DEFAULT NULL COMMENT '审批者', - `cooperate_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)', + `cooperate_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)', `collaborator` varchar(40) DEFAULT NULL COMMENT '协作人', - `skip_type` varchar(10) NOT NULL COMMENT '流转类型（PASS通过 REJECT退回 NONE无动作）', - `flow_status` varchar(20) NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）', + `skip_type` varchar(10) NOT NULL COMMENT '流转类型（PASS通过 REJECT退回 NONE无动作）', + `flow_status` varchar(20) NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）', `form_custom` char(1) DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）', `form_path` varchar(100) DEFAULT NULL COMMENT '审批表单路径', `message` varchar(500) DEFAULT NULL COMMENT '审批意见', `variable` TEXT DEFAULT NULL COMMENT '任务变量', - `ext` varchar(500) DEFAULT NULL COMMENT '业务详情 存业务表对象json字符串', + `ext` TEXT DEFAULT NULL COMMENT '业务详情 存业务表对象json字符串', `create_time` datetime DEFAULT NULL COMMENT '任务开始时间', `update_time` datetime DEFAULT NULL COMMENT '审批完成时间', `del_flag` char(1) DEFAULT '0' COMMENT '删除标志',