-
Notifications
You must be signed in to change notification settings - Fork 175
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- 主要更新 - [升级] Spring Boot 版本升级至 3.3.2 - [升级] Spring Cloud Alibaba 版本升级至 2023.0.1.2 - [升级] Nacos 版本升级至 2.4.0 - [升级] Debezium 相关组件版本升级至 2.7 - [新增] 新增基于 Aws SDK V2 版本的、响应式对象存储适配支持 - 其它更新 - [发布] 基于 Postgresql 的、重新打包的 Nacos Server 2.4.0 已上传。 - [重构] 大幅调整 OSS 工程各模块定位、实现机制以及代码，重新定义统一调用定义及实现。 - [重构] 重构和调整 OSS 各模块自动配置机制，自动适配阻塞式和响应式环境。 - [重构] 重构 OSS 代码，修正包名、模块名不规范，与工程 groupId 不一致问题。 - [重构] 恢复 Sentinel Dashboard 控制台懒加载配置 - [修复] 修复升级至 Nacos 2.4.0 运行抛出 `java.lang.IllegalStateException: Could not initialize Logback Nacos logging from classpath:nacos-logback14.xml` 问题。fix: #IAECYY - [修复] 修复升级至 Nacos 2.4.0 运行抛出 `[*][variable] already has an associated action supplierl` 问题。fix: #IAECZ5 - [修复] Sentinel 适配新版 sentinel-spring-webmvc-v6x-adapter - [升级] liberica 基础镜像版本升级至 21.0.4-9 - [升级] minio docker 镜像版本升级至 RELEASE.2024-07-16T23-46-41Z - 依赖升级 - [升级] aws-java-sdk-s3 版本升级至 1.12.762 - [升级] software.amazon.awssdk 版本升级至 2.26.21 - [升级] software.amazon.awssdk.crt 版本升级至 0.30.0 - [升级] redisson 版本升级至 3.33.0 - [升级] fastjson2 版升级至 2.0.52 - [升级] weixin-java 版本升级至 4.6.3.B - [升级] alipay-sdk-java 版本升级至 4.39.134.ALL - 注意事项 - Nacos 2.4.0 版本做了很多的改进和提升。但是当前版本还存在较多问题，已知问题已提交至：<https://github.com/alibaba/nacos/issues/12387>。所以，还请谨慎使用。
- Loading branch information
1 parent
28ff31b
commit 28b124a
Showing
45 changed files
with
1,120 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file removed
BIN
-12.3 KB
configurations/backup/alibaba/3.3.1.1/nacos_config_export_20240531173140.zip
Binary file not shown.
Binary file removed
BIN
-12.3 KB
configurations/backup/alibaba/3.3.1.2/nacos_config_export_20240531173140.zip
Binary file not shown.
File renamed without changes.
Binary file removed
BIN
-13 KB
configurations/backup/tencent/3.3.1.1/polaris_config_202405311904.zip
Binary file not shown.
Binary file removed
BIN
-13 KB
configurations/backup/tencent/3.3.1.2/polaris_config_202405311904.zip
Binary file not shown.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| VERSION=3.3.1.3 | ||
| VERSION=3.3.2.0 | ||
| SPRING_PROFILES_ACTIVE=alibaba | ||
| PROFILE=development | ||
| DATABASE=postgresql | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
configurations/docker/docker-compose/linux/herodotus/env.base.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
configurations/docker/docker-compose/linux/herodotus/env.full.debezium.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
configurations/docker/docker-compose/linux/herodotus/env.oss.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| VERSION=3.3.1.3 | ||
| VERSION=3.3.2.0 | ||
| SPRING_PROFILES_ACTIVE=alibaba | ||
| PROFILE=development | ||
| DATABASE=postgresql | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
configurations/docker/docker-compose/windows/herodotus/env.base.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
configurations/docker/docker-compose/windows/herodotus/env.full.base.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
configurations/docker/docker-compose/windows/herodotus/env.full.debezium.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
configurations/docker/docker-compose/windows/herodotus/env.oss.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
221 changes: 221 additions & 0 deletions
221
configurations/scripts/nacos/sqls/nacos-mysql_2.2.3.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,221 @@ | ||
| /* | ||
| * Copyright 1999-2018 Alibaba Group Holding Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| /******************************************/ | ||
| /* 数据库全名 = nacos_config */ | ||
| /* 表名称 = config_info */ | ||
| /******************************************/ | ||
| CREATE TABLE `config_info` ( | ||
| `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', | ||
| `data_id` varchar(255) NOT NULL COMMENT 'data_id', | ||
| `group_id` varchar(128) DEFAULT NULL, | ||
| `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', | ||
| `app_name` varchar(128) DEFAULT NULL, | ||
| `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', | ||
| `c_desc` varchar(256) DEFAULT NULL, | ||
| `c_use` varchar(64) DEFAULT NULL, | ||
| `effect` varchar(64) DEFAULT NULL, | ||
| `type` varchar(64) DEFAULT NULL, | ||
| `c_schema` text, | ||
| `encrypted_data_key` text NOT NULL COMMENT '秘钥', | ||
| PRIMARY KEY (`id`), | ||
| UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) | ||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; | ||
|
|
||
| /******************************************/ | ||
| /* 数据库全名 = nacos_config */ | ||
| /* 表名称 = config_info_aggr */ | ||
| /******************************************/ | ||
| CREATE TABLE `config_info_aggr` ( | ||
| `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', | ||
| `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', | ||
| `content` longtext NOT NULL COMMENT '内容', | ||
| `gmt_modified` datetime NOT NULL COMMENT '修改时间', | ||
| `app_name` varchar(128) DEFAULT NULL, | ||
| `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', | ||
| PRIMARY KEY (`id`), | ||
| UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) | ||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; | ||
|
|
||
|
|
||
| /******************************************/ | ||
| /* 数据库全名 = nacos_config */ | ||
| /* 表名称 = 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` text NOT NULL 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'; | ||
|
|
||
| /******************************************/ | ||
| /* 数据库全名 = nacos_config */ | ||
| /* 表名称 = 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'; | ||
|
|
||
| /******************************************/ | ||
| /* 数据库全名 = nacos_config */ | ||
| /* 表名称 = config_tags_relation */ | ||
| /******************************************/ | ||
| CREATE TABLE `config_tags_relation` ( | ||
| `id` bigint(20) NOT NULL COMMENT 'id', | ||
| `tag_name` varchar(128) NOT NULL COMMENT 'tag_name', | ||
| `tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type', | ||
| `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', | ||
| `nid` bigint(20) NOT NULL AUTO_INCREMENT, | ||
| PRIMARY KEY (`nid`), | ||
| UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`), | ||
| KEY `idx_tenant_id` (`tenant_id`) | ||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation'; | ||
|
|
||
| /******************************************/ | ||
| /* 数据库全名 = nacos_config */ | ||
| /* 表名称 = group_capacity */ | ||
| /******************************************/ | ||
| CREATE TABLE `group_capacity` ( | ||
| `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', | ||
| `group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群', | ||
| `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', | ||
| `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', | ||
| `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', | ||
| `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值', | ||
| `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', | ||
| `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', | ||
| `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', | ||
| `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', | ||
| PRIMARY KEY (`id`), | ||
| UNIQUE KEY `uk_group_id` (`group_id`) | ||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表'; | ||
|
|
||
| /******************************************/ | ||
| /* 数据库全名 = nacos_config */ | ||
| /* 表名称 = his_config_info */ | ||
| /******************************************/ | ||
| CREATE TABLE `his_config_info` ( | ||
| `id` bigint(20) unsigned NOT NULL, | ||
| `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT, | ||
| `data_id` varchar(255) NOT NULL, | ||
| `group_id` varchar(128) NOT NULL, | ||
| `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', | ||
| `content` longtext NOT NULL, | ||
| `md5` varchar(32) DEFAULT NULL, | ||
| `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, | ||
| `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, | ||
| `src_user` text, | ||
| `src_ip` varchar(50) DEFAULT NULL, | ||
| `op_type` char(10) DEFAULT NULL, | ||
| `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', | ||
| `encrypted_data_key` text NOT NULL COMMENT '秘钥', | ||
| PRIMARY KEY (`nid`), | ||
| KEY `idx_gmt_create` (`gmt_create`), | ||
| KEY `idx_gmt_modified` (`gmt_modified`), | ||
| KEY `idx_did` (`data_id`) | ||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造'; | ||
|
|
||
|
|
||
| /******************************************/ | ||
| /* 数据库全名 = nacos_config */ | ||
| /* 表名称 = tenant_capacity */ | ||
| /******************************************/ | ||
| CREATE TABLE `tenant_capacity` ( | ||
| `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', | ||
| `tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID', | ||
| `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', | ||
| `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', | ||
| `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', | ||
| `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数', | ||
| `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', | ||
| `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', | ||
| `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', | ||
| `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', | ||
| PRIMARY KEY (`id`), | ||
| UNIQUE KEY `uk_tenant_id` (`tenant_id`) | ||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表'; | ||
|
|
||
|
|
||
| CREATE TABLE `tenant_info` ( | ||
| `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', | ||
| `kp` varchar(128) NOT NULL COMMENT 'kp', | ||
| `tenant_id` varchar(128) default '' COMMENT 'tenant_id', | ||
| `tenant_name` varchar(128) default '' COMMENT 'tenant_name', | ||
| `tenant_desc` varchar(256) DEFAULT NULL COMMENT 'tenant_desc', | ||
| `create_source` varchar(32) DEFAULT NULL COMMENT 'create_source', | ||
| `gmt_create` bigint(20) NOT NULL COMMENT '创建时间', | ||
| `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间', | ||
| PRIMARY KEY (`id`), | ||
| UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`), | ||
| KEY `idx_tenant_id` (`tenant_id`) | ||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; | ||
|
|
||
| CREATE TABLE `users` ( | ||
| `username` varchar(50) NOT NULL PRIMARY KEY, | ||
| `password` varchar(500) NOT NULL, | ||
| `enabled` boolean NOT NULL | ||
| ); | ||
|
|
||
| CREATE TABLE `roles` ( | ||
| `username` varchar(50) NOT NULL, | ||
| `role` varchar(50) NOT NULL, | ||
| UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE | ||
| ); | ||
|
|
||
| CREATE TABLE `permissions` ( | ||
| `role` varchar(50) NOT NULL, | ||
| `resource` varchar(255) NOT NULL, | ||
| `action` varchar(8) NOT NULL, | ||
| UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE | ||
| ); | ||
|
|
||
| INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); | ||
|
|
||
| INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN'); |
Oops, something went wrong.