Skip to content

Commit e8ad59b

Browse files
cadecodecadecode
committed
feat: 引入 gateway 组件，调整依赖关系
1 parent a67f4dd commit e8ad59b

13 files changed

Lines changed: 534 additions & 13 deletions

File tree

‎.docs/sql/nacos_v1.4.6.sql‎

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
1+
/*
2+
* Copyright 1999-2018 Alibaba Group Holding Ltd.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/******************************************/
18+
/* 数据库全名 = nacos_config */
19+
/* 表名称 = config_info */
20+
/******************************************/
21+
CREATE TABLE `config_info` (
22+
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
23+
`data_id` varchar(255) NOT NULL COMMENT 'data_id',
24+
`group_id` varchar(255) DEFAULT NULL,
25+
`content` longtext NOT NULL COMMENT 'content',
26+
`md5` varchar(32) DEFAULT NULL COMMENT 'md5',
27+
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
28+
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
29+
`src_user` text COMMENT 'source user',
30+
`src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip',
31+
`app_name` varchar(128) DEFAULT NULL,
32+
`tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
33+
`c_desc` varchar(256) DEFAULT NULL,
34+
`c_use` varchar(64) DEFAULT NULL,
35+
`effect` varchar(64) DEFAULT NULL,
36+
`type` varchar(64) DEFAULT NULL,
37+
`c_schema` text,
38+
PRIMARY KEY (`id`),
39+
UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`)
40+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info';
41+
42+
/******************************************/
43+
/* 数据库全名 = nacos_config */
44+
/* 表名称 = config_info_aggr */
45+
/******************************************/
46+
CREATE TABLE `config_info_aggr` (
47+
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
48+
`data_id` varchar(255) NOT NULL COMMENT 'data_id',
49+
`group_id` varchar(255) NOT NULL COMMENT 'group_id',
50+
`datum_id` varchar(255) NOT NULL COMMENT 'datum_id',
51+
`content` longtext NOT NULL COMMENT '内容',
52+
`gmt_modified` datetime NOT NULL COMMENT '修改时间',
53+
`app_name` varchar(128) DEFAULT NULL,
54+
`tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
55+
PRIMARY KEY (`id`),
56+
UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`)
57+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段';
58+
59+
60+
/******************************************/
61+
/* 数据库全名 = nacos_config */
62+
/* 表名称 = config_info_beta */
63+
/******************************************/
64+
CREATE TABLE `config_info_beta` (
65+
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
66+
`data_id` varchar(255) NOT NULL COMMENT 'data_id',
67+
`group_id` varchar(128) NOT NULL COMMENT 'group_id',
68+
`app_name` varchar(128) DEFAULT NULL COMMENT 'app_name',
69+
`content` longtext NOT NULL COMMENT 'content',
70+
`beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps',
71+
`md5` varchar(32) DEFAULT NULL COMMENT 'md5',
72+
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
73+
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
74+
`src_user` text COMMENT 'source user',
75+
`src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip',
76+
`tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
77+
PRIMARY KEY (`id`),
78+
UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`)
79+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta';
80+
81+
/******************************************/
82+
/* 数据库全名 = nacos_config */
83+
/* 表名称 = config_info_tag */
84+
/******************************************/
85+
CREATE TABLE `config_info_tag` (
86+
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
87+
`data_id` varchar(255) NOT NULL COMMENT 'data_id',
88+
`group_id` varchar(128) NOT NULL COMMENT 'group_id',
89+
`tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id',
90+
`tag_id` varchar(128) NOT NULL COMMENT 'tag_id',
91+
`app_name` varchar(128) DEFAULT NULL COMMENT 'app_name',
92+
`content` longtext NOT NULL COMMENT 'content',
93+
`md5` varchar(32) DEFAULT NULL COMMENT 'md5',
94+
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
95+
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
96+
`src_user` text COMMENT 'source user',
97+
`src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip',
98+
PRIMARY KEY (`id`),
99+
UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`)
100+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag';
101+
102+
/******************************************/
103+
/* 数据库全名 = nacos_config */
104+
/* 表名称 = config_tags_relation */
105+
/******************************************/
106+
CREATE TABLE `config_tags_relation` (
107+
`id` bigint(20) NOT NULL COMMENT 'id',
108+
`tag_name` varchar(128) NOT NULL COMMENT 'tag_name',
109+
`tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type',
110+
`data_id` varchar(255) NOT NULL COMMENT 'data_id',
111+
`group_id` varchar(128) NOT NULL COMMENT 'group_id',
112+
`tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id',
113+
`nid` bigint(20) NOT NULL AUTO_INCREMENT,
114+
PRIMARY KEY (`nid`),
115+
UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`),
116+
KEY `idx_tenant_id` (`tenant_id`)
117+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation';
118+
119+
/******************************************/
120+
/* 数据库全名 = nacos_config */
121+
/* 表名称 = group_capacity */
122+
/******************************************/
123+
CREATE TABLE `group_capacity` (
124+
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
125+
`group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群',
126+
`quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值',
127+
`usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量',
128+
`max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值',
129+
`max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值',
130+
`max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值',
131+
`max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量',
132+
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
133+
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
134+
PRIMARY KEY (`id`),
135+
UNIQUE KEY `uk_group_id` (`group_id`)
136+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表';
137+
138+
/******************************************/
139+
/* 数据库全名 = nacos_config */
140+
/* 表名称 = his_config_info */
141+
/******************************************/
142+
CREATE TABLE `his_config_info` (
143+
`id` bigint(64) unsigned NOT NULL,
144+
`nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
145+
`data_id` varchar(255) NOT NULL,
146+
`group_id` varchar(128) NOT NULL,
147+
`app_name` varchar(128) DEFAULT NULL COMMENT 'app_name',
148+
`content` longtext NOT NULL,
149+
`md5` varchar(32) DEFAULT NULL,
150+
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
151+
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
152+
`src_user` text,
153+
`src_ip` varchar(50) DEFAULT NULL,
154+
`op_type` char(10) DEFAULT NULL,
155+
`tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
156+
PRIMARY KEY (`nid`),
157+
KEY `idx_gmt_create` (`gmt_create`),
158+
KEY `idx_gmt_modified` (`gmt_modified`),
159+
KEY `idx_did` (`data_id`)
160+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造';
161+
162+
163+
/******************************************/
164+
/* 数据库全名 = nacos_config */
165+
/* 表名称 = tenant_capacity */
166+
/******************************************/
167+
CREATE TABLE `tenant_capacity` (
168+
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
169+
`tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID',
170+
`quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值',
171+
`usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量',
172+
`max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值',
173+
`max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数',
174+
`max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值',
175+
`max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量',
176+
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
177+
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
178+
PRIMARY KEY (`id`),
179+
UNIQUE KEY `uk_tenant_id` (`tenant_id`)
180+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表';
181+
182+
183+
CREATE TABLE `tenant_info` (
184+
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
185+
`kp` varchar(128) NOT NULL COMMENT 'kp',
186+
`tenant_id` varchar(128) default '' COMMENT 'tenant_id',
187+
`tenant_name` varchar(128) default '' COMMENT 'tenant_name',
188+
`tenant_desc` varchar(256) DEFAULT NULL COMMENT 'tenant_desc',
189+
`create_source` varchar(32) DEFAULT NULL COMMENT 'create_source',
190+
`gmt_create` bigint(20) NOT NULL COMMENT '创建时间',
191+
`gmt_modified` bigint(20) NOT NULL COMMENT '修改时间',
192+
PRIMARY KEY (`id`),
193+
UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`),
194+
KEY `idx_tenant_id` (`tenant_id`)
195+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info';
196+
197+
CREATE TABLE `users` (
198+
`username` varchar(50) NOT NULL PRIMARY KEY,
199+
`password` varchar(500) NOT NULL,
200+
`enabled` boolean NOT NULL
201+
);
202+
203+
CREATE TABLE `roles` (
204+
`username` varchar(50) NOT NULL,
205+
`role` varchar(50) NOT NULL,
206+
UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE
207+
);
208+
209+
CREATE TABLE `permissions` (
210+
`role` varchar(50) NOT NULL,
211+
`resource` varchar(255) NOT NULL,
212+
`action` varchar(8) NOT NULL,
213+
UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE
214+
);
215+
216+
INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE);
217+
218+
INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN');

‎common/core/pom.xml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
<artifactId>mica-auto</artifactId>
1919
<scope>provided</scope>
2020
</dependency>
21-
<!--SpringBoot Web-->
21+
<!--web-->
2222
<dependency>
2323
<groupId>org.springframework.boot</groupId>
2424
<artifactId>spring-boot-starter-web</artifactId>
2525
</dependency>
26-
<!--SpringBoot AOP-->
26+
<!--AOP-->
2727
<dependency>
2828
<groupId>org.springframework.boot</groupId>
2929
<artifactId>spring-boot-starter-aop</artifactId>
@@ -33,12 +33,7 @@
3333
<groupId>org.springframework.boot</groupId>
3434
<artifactId>spring-boot-starter-validation</artifactId>
3535
</dependency>
36-
<!--Spring Security-->
37-
<dependency>
38-
<groupId>org.springframework.boot</groupId>
39-
<artifactId>spring-boot-starter-security</artifactId>
40-
</dependency>
41-
<!--SpringBoot 配置批注生成器-->
36+
<!--配置批注生成器-->
4237
<dependency>
4338
<groupId>org.springframework.boot</groupId>
4439
<artifactId>spring-boot-configuration-processor</artifactId>

‎dependencies/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<module>../common</module>
1818
<module>../framework</module>
1919
<module>../example</module>
20+
<module>../gateway</module>
2021
</modules>
2122

2223
<properties>

‎example/example_svc/src/main/resources/bootstrap.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ logging:
22
file:
33
path: /log/uni_boot_admin/example
44

5+
server:
6+
servlet:
7+
context-path: /example
8+
59
spring:
610
application:
711
name: uni-boot-example

‎framework/framework_api/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
<groupId>org.springframework.cloud</groupId>
2727
<artifactId>spring-cloud-starter-loadbalancer</artifactId>
2828
</dependency>
29+
<!--Security-->
30+
<dependency>
31+
<groupId>org.springframework.boot</groupId>
32+
<artifactId>spring-boot-starter-security</artifactId>
33+
</dependency>
2934

3035
<dependency>
3136
<groupId>com.github.cadecode</groupId>
@@ -55,10 +60,5 @@
5560
<groupId>com.github.cadecode</groupId>
5661
<artifactId>uni-boot-common-plugin-concurrent</artifactId>
5762
</dependency>
58-
<!--http-->
59-
<dependency>
60-
<groupId>cn.hutool</groupId>
61-
<artifactId>hutool-http</artifactId>
62-
</dependency>
6363
</dependencies>
6464
</project>

‎framework/framework_svc/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
<artifactId>jasypt-spring-boot-starter</artifactId>
4444
</dependency>
4545

46+
<!--http-->
47+
<dependency>
48+
<groupId>cn.hutool</groupId>
49+
<artifactId>hutool-http</artifactId>
50+
</dependency>
51+
4652
<dependency>
4753
<groupId>com.github.cadecode</groupId>
4854
<artifactId>uni-boot-framework-api</artifactId>

‎framework/framework_svc/src/main/resources/bootstrap.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ logging:
22
file:
33
path: /log/uni_boot_admin/framework
44

5+
server:
6+
servlet:
7+
context-path: /framework
8+
59
spring:
610
application:
711
name: uni-boot-framework

0 commit comments

Comments
 (0)