From ec03a3d509d1f9061a77d7e07ffde94bdd25d395 Mon Sep 17 00:00:00 2001 From: zhangbinhub Date: Mon, 7 Apr 2025 14:40:46 +0800 Subject: [PATCH] v6.7.3 --- README.md | 6 +-- deploy/docker/middleware/docker-compose.yaml | 2 +- deploy/init/nacos-mysql-2.0.sql | 41 -------------------- doc/version_history.md | 7 ++++ gradle/dependencies.gradle | 4 +- 5 files changed, 13 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 984823fd..b85da720 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # acp-admin-cloud -###### v6.7.2 [版本更新日志](doc/version_history.md) +###### v6.7.3 [版本更新日志](doc/version_history.md) - 使用Application Construction Platform 应用构建平台作为脚手架 - 基于 Spring Cloud 的微服务版本，基于 Spring Boot @@ -9,9 +9,9 @@ ## 相关组件版本 -- [Spring Boot 3.4.3](https://projects.spring.io/spring-boot) +- [Spring Boot 3.4.4](https://projects.spring.io/spring-boot) - [Spring Boot Admin 3.4.5](https://github.com/codecentric/spring-boot-admin) -- [Acp 2025.2.0](https://gitee.com/zhangbinhub/acp) +- [Acp 2025.2.1](https://gitee.com/zhangbinhub/acp) - [sensitive](https://github.com/houbb/sensitive) ## 技术栈 diff --git a/deploy/docker/middleware/docker-compose.yaml b/deploy/docker/middleware/docker-compose.yaml index 572c3984..5bcb2d2d 100644 --- a/deploy/docker/middleware/docker-compose.yaml +++ b/deploy/docker/middleware/docker-compose.yaml @@ -1,7 +1,7 @@ version: "3.7" services: nacos: - image: nacos/nacos-server:v2.5.0 + image: nacos/nacos-server:v2.5.1 container_name: nacos-standalone-mysql restart: always environment: diff --git a/deploy/init/nacos-mysql-2.0.sql b/deploy/init/nacos-mysql-2.0.sql index 1f4e154a..433a90b9 100644 --- a/deploy/init/nacos-mysql-2.0.sql +++ b/deploy/init/nacos-mysql-2.0.sql @@ -63,47 +63,6 @@ CREATE TABLE `config_info_gray` ( KEY `idx_gmt_modified` (`gmt_modified`) ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; -/******************************************/ -/* 表名称 = config_info_beta */ -/******************************************/ -CREATE TABLE `config_info_beta` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; - -/******************************************/ -/* 表名称 = config_info_tag */ -/******************************************/ -CREATE TABLE `config_info_tag` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; - /******************************************/ /* 表名称 = config_tags_relation */ /******************************************/ diff --git a/doc/version_history.md b/doc/version_history.md index 6c022e79..68ddcbf9 100644 --- a/doc/version_history.md +++ b/doc/version_history.md @@ -1,5 +1,12 @@ ## 版本更新记录 +##### v6.7.3 + +- Global + - [Upgrade] 升级依赖 + - Acp 2025.2.1 + - Spring Boot 3.4.4 + ##### v6.7.2 - Global diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 077476ab..bf014be3 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -4,9 +4,9 @@ ext { versions += [ kotlin : "2.1.0", - springBoot : "3.4.3", + springBoot : "3.4.4", springBootAdmin : "3.4.5", - acp : "2025.2.0", + acp : "2025.2.1", sensitive : "1.7.0", sensitiveDeepCopy: "0.0.1", camunda : "7.22.0", -- Gitee