-
Notifications
You must be signed in to change notification settings - Fork 180
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- 主要更新
- [升级] Spring Cloud 版本升级至 2022.0.2
- [重构] 重构多租户功能，优化代码实现
1. 多租户代码提取为单独代码模块，支持独立数据库(Database)、共享数据库(Schema)、共享数据表(Discriminator) 三种模式
2. 默认开启共享数据表(Discriminator)模式, 取消所有表默认添加 TenantId 字段方式，改为按需添加以规避不必要的设计混乱
3. 优化共享数据库(Schema)模式数据源切换逻辑，与独立数据库(Database)分离实现，避免冲突。
4. 增加多租户数据源管理功能，多租户数据源从配置文件配置方式变更为通过数据表进行管理。
5. 优化多租户数据库连接池、数据库事务支持。
- 其它更新
- [新增] 新增前端工程 Authorization Code + PKCE 支持工具代码。
- [新增] 增加 Spring 默认仓库，解决未使用腾讯镜像仓库无法下载 snapshot 或 milestone 版本问题。(PR by tao)
- [优化] 删除 @herodotus/plugins 模块，将其代码移动到主工程。解决基础样式编译后过大以及编译新版本 quasar 问题出错。
- [重构] 删除 data-sdk-p6spy 模块，将相关代码合并至 data-sdk-jpa 模块。
- 依赖更新
- [升级] redisson 版本升级至 3.20.1
- [升级] hutool 版本升级至 5.8.16
- [升级] tencentcloud-sdk-java-sms 版本升级至 3.1.724
- [升级] alipay-sdk-java 版本升级至 4.35.87.ALL- Loading branch information
1 parent
0dc2a5f
commit b6b5b42
Showing
36 changed files
with
418 additions
and
196 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
9 changes: 0 additions & 9 deletions
9
configurations/backup/alibaba/configs/common/dante-cloud-multi-tenancy.yaml
This file was deleted.
Oops, something went wrong.
Binary file removed
BIN
-7.92 KB
configurations/backup/alibaba/imports/3.0.4.2/nacos_config_export_20221125151925.zip
Binary file not shown.
File renamed without changes.
Binary file renamed
BIN
+7.92 KB
....1/nacos_config_export_20221125151925.zip → ....1/nacos_config_export_20230331150837.zip
Binary file not shown.
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 |
|---|---|---|
| @@ -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'); |
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
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
Oops, something went wrong.