Skip to content

Commit ca97ffc

Browse files
xchooxxchoox
committed
Merge remote-tracking branch 'origin/feat_serviceManager' into feat_serviceManager
2 parents 4262ec7 + 9d3b264 commit ca97ffc

File tree

55 files changed

+524
-275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+524
-275
lines changed

‎db/init/mysql/schema.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2057,12 +2057,12 @@ CREATE TABLE `rule` (
20572057
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'primary key id',
20582058
`selector_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'selector id',
20592059
`match_mode` int(0) NOT NULL COMMENT 'matching mode (0 and 1 or)',
2060-
`name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'rule name',
2060+
`rule_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'rule name',
20612061
`enabled` tinyint(0) NOT NULL COMMENT 'whether to open (0 close, 1 open) ',
20622062
`loged` tinyint(0) NOT NULL COMMENT 'whether to log or not (0 no print, 1 print) ',
20632063
`match_restful` tinyint(0) NOT NULL COMMENT 'whether to match restful(0 cache, 1 not cache)',
20642064
`namespace_id` varchar(50) NOT NULL COMMENT 'namespace id',
2065-
`sort` int(0) NOT NULL COMMENT 'sort',
2065+
`sort_code` int(0) NOT NULL COMMENT 'sort',
20662066
`handle` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'processing logic (here for different plug-ins, there will be different fields to identify different processes, all data in JSON format is stored)',
20672067
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT 'create time',
20682068
`date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT 'update time',
@@ -2318,7 +2318,7 @@ DROP TABLE IF EXISTS `tag`;
23182318
CREATE TABLE `tag`
23192319
(
23202320
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'primary key id',
2321-
`name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'tag name',
2321+
`tag_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'tag name',
23222322
`tag_desc` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'tag description',
23232323
`parent_tag_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'parent tag_id',
23242324
`ext` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'extension info',

‎db/init/ob/schema.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,12 +1985,12 @@ CREATE TABLE `rule` (
19851985
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'primary key id',
19861986
`selector_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'selector id',
19871987
`match_mode` int(0) NOT NULL COMMENT 'matching mode (0 and 1 or)',
1988-
`name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'rule name',
1988+
`rule_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'rule name',
19891989
`enabled` tinyint(0) NOT NULL COMMENT 'whether to open (0 close, 1 open) ',
19901990
`loged` tinyint(0) NOT NULL COMMENT 'whether to log or not (0 no print, 1 print) ',
19911991
`match_restful` tinyint(0) NOT NULL COMMENT 'whether to match restful(0 cache, 1 not cache)',
19921992
`namespace_id` varchar(50) NOT NULL COMMENT 'namespace id',
1993-
`sort` int(0) NOT NULL COMMENT 'sort',
1993+
`sort_code` int(0) NOT NULL COMMENT 'sort',
19941994
`handle` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'processing logic (here for different plug-ins, there will be different fields to identify different processes, all data in JSON format is stored)',
19951995
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT 'create time',
19961996
`date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT 'update time',
@@ -2233,7 +2233,7 @@ DROP TABLE IF EXISTS `tag`;
22332233
CREATE TABLE `tag`
22342234
(
22352235
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'primary key id',
2236-
`name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'tag name',
2236+
`tag_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'tag name',
22372237
`tag_desc` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'tag description',
22382238
`parent_tag_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'parent tag_id',
22392239
`ext` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'extension info',

‎db/init/og/create-table.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1912,12 +1912,12 @@ CREATE TABLE "public"."rule" (
19121912
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
19131913
"selector_id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
19141914
"match_mode" int4 NOT NULL,
1915-
"name" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
1915+
"rule_name" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
19161916
"enabled" int2 NOT NULL,
19171917
"loged" int2 NOT NULL,
19181918
"match_restful" int2 NOT NULL,
19191919
"namespace_id" varchar(50) COLLATE "pg_catalog"."default" NOT NULL,
1920-
"sort" int4 NOT NULL,
1920+
"sort_code" int4 NOT NULL,
19211921
"handle" text COLLATE "pg_catalog"."default",
19221922
"date_created" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
19231923
"date_updated" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
@@ -1926,12 +1926,12 @@ CREATE TABLE "public"."rule" (
19261926
COMMENT ON COLUMN "public"."rule"."id" IS 'primary key id';
19271927
COMMENT ON COLUMN "public"."rule"."selector_id" IS 'selector id';
19281928
COMMENT ON COLUMN "public"."rule"."match_mode" IS 'matching mode (0 and 1 or)';
1929-
COMMENT ON COLUMN "public"."rule"."name" IS 'rule name';
1929+
COMMENT ON COLUMN "public"."rule"."rule_name" IS 'rule name';
19301930
COMMENT ON COLUMN "public"."rule"."enabled" IS 'whether to open (0 close, 1 open) ';
19311931
COMMENT ON COLUMN "public"."rule"."loged" IS 'whether to log or not (0 no print, 1 print) ';
19321932
COMMENT ON COLUMN "public"."rule"."match_restful" IS 'whether to match restful(0 cache, 1 not cache)';
19331933
COMMENT ON COLUMN "public"."rule"."namespace_id" IS 'namespace id';
1934-
COMMENT ON COLUMN "public"."rule"."sort" IS 'sort';
1934+
COMMENT ON COLUMN "public"."rule"."sort_code" IS 'sort';
19351935
COMMENT ON COLUMN "public"."rule"."handle" IS 'processing logic (here for different plug-ins, there will be different fields to identify different processes, all data in JSON format is stored)';
19361936
COMMENT ON COLUMN "public"."rule"."date_created" IS 'create time';
19371937
COMMENT ON COLUMN "public"."rule"."date_updated" IS 'update time';
@@ -2345,7 +2345,7 @@ ALTER TABLE "public"."shenyu_dict" ADD CONSTRAINT "shenyu_dict_pkey" PRIMARY KEY
23452345
DROP TABLE IF EXISTS "public"."tag";
23462346
CREATE TABLE "public"."tag" (
23472347
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
2348-
"name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
2348+
"tag_name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
23492349
"tag_desc" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
23502350
"parent_tag_id" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
23512351
"ext" varchar(1024) COLLATE "pg_catalog"."default",

‎db/init/oracle/schema.sql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,12 @@ create table rule
194194
id VARCHAR2(128) not null PRIMARY KEY,
195195
selector_id VARCHAR2(128) not null,
196196
match_mode NUMBER(10) not null,
197-
name VARCHAR2(128) not null,
197+
rule_name VARCHAR2(128) not null,
198198
enabled NUMBER(3) not null,
199199
loged NUMBER(3) not null,
200200
match_restful NUMBER(3) not null,
201-
namespace_id VARCHAR2(50) not null,
202-
sort NUMBER(10) not null,
201+
namespace_id VARCHAR2(50) not null,
202+
sort_code NUMBER(10) not null,
203203
handle CLOB,
204204
date_created timestamp(3) default SYSDATE not null,
205205
date_updated timestamp(3) default SYSDATE not null
@@ -211,7 +211,7 @@ comment on column RULE.selector_id
211211
is 'selector id';
212212
comment on column RULE.match_mode
213213
is 'matching mode (0 and 1 or)';
214-
comment on column RULE.name
214+
comment on column RULE.rule_name
215215
is 'rule name';
216216
comment on column RULE.enabled
217217
is 'whether to open (0 not open, 1 open)';
@@ -221,7 +221,7 @@ comment on column RULE.match_restful
221221
is 'whether to match restful(0 cache, 1 not cache)';
222222
comment on column RULE.namespace_id
223223
is 'namespace id';
224-
comment on column RULE.sort
224+
comment on column RULE.sort_code
225225
is 'sort';
226226
comment on column RULE.handle
227227
is 'processing logic (here for different plug-ins, there will be different fields to identify different processes, all data in JSON format is stored)';
@@ -2455,7 +2455,7 @@ INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX (permission(id)) */ INTO permission (id, o
24552455
create table tag
24562456
(
24572457
id VARCHAR2(128) not null,
2458-
name VARCHAR2(255) not null,
2458+
tag_name VARCHAR2(255) not null,
24592459
tag_desc VARCHAR2(255) not null,
24602460
parent_tag_id VARCHAR2(128) not null,
24612461
ext VARCHAR2(1024) not null,

‎db/init/pg/create-table.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2040,12 +2040,12 @@ CREATE TABLE "public"."rule" (
20402040
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
20412041
"selector_id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
20422042
"match_mode" int4 NOT NULL,
2043-
"name" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
2043+
"rule_name" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
20442044
"enabled" int2 NOT NULL,
20452045
"loged" int2 NOT NULL,
20462046
"match_restful" int2 NOT NULL,
20472047
"namespace_id" varchar(50) COLLATE "pg_catalog"."default" NOT NULL,
2048-
"sort" int4 NOT NULL,
2048+
"sort_code" int4 NOT NULL,
20492049
"handle" text COLLATE "pg_catalog"."default",
20502050
"date_created" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
20512051
"date_updated" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
@@ -2054,12 +2054,12 @@ CREATE TABLE "public"."rule" (
20542054
COMMENT ON COLUMN "public"."rule"."id" IS 'primary key id';
20552055
COMMENT ON COLUMN "public"."rule"."selector_id" IS 'selector id';
20562056
COMMENT ON COLUMN "public"."rule"."match_mode" IS 'matching mode (0 and 1 or)';
2057-
COMMENT ON COLUMN "public"."rule"."name" IS 'rule name';
2057+
COMMENT ON COLUMN "public"."rule"."rule_name" IS 'rule name';
20582058
COMMENT ON COLUMN "public"."rule"."enabled" IS 'whether to open (0 close, 1 open) ';
20592059
COMMENT ON COLUMN "public"."rule"."loged" IS 'whether to log or not (0 no print, 1 print) ';
20602060
COMMENT ON COLUMN "public"."rule"."match_restful" IS 'whether to match restful(0 cache, 1 not cache)';
20612061
COMMENT ON COLUMN "public"."rule"."namespace_id" IS 'namespace id';
2062-
COMMENT ON COLUMN "public"."rule"."sort" IS 'sort';
2062+
COMMENT ON COLUMN "public"."rule"."sort_code" IS 'sort';
20632063
COMMENT ON COLUMN "public"."rule"."handle" IS 'processing logic (here for different plug-ins, there will be different fields to identify different processes, all data in JSON format is stored)';
20642064
COMMENT ON COLUMN "public"."rule"."date_created" IS 'create time';
20652065
COMMENT ON COLUMN "public"."rule"."date_updated" IS 'update time';
@@ -2472,7 +2472,7 @@ ALTER TABLE "public"."shenyu_dict" ADD CONSTRAINT "shenyu_dict_pkey" PRIMARY KEY
24722472
DROP TABLE IF EXISTS "public"."tag";
24732473
CREATE TABLE "public"."tag" (
24742474
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
2475-
"name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
2475+
"ta_name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
24762476
"tag_desc" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
24772477
"parent_tag_id" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
24782478
"ext" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,

‎db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,3 +270,6 @@ ALTER TABLE `rule` MODIFY COLUMN `handle` text;
270270
ALTER TABLE `selector` CHANGE COLUMN `type` `selector_type` int(0) NOT NULL COMMENT 'type (0, full flow, 1 custom flow)';
271271
ALTER TABLE `selector` CHANGE COLUMN `sort` `sort_code` int(0) NOT NULL COMMENT 'sort';
272272
ALTER TABLE `selector` CHANGE COLUMN `name` `selector_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'selector name';
273+
ALTER TABLE `tag` CHANGE COLUMN `name` `tag_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'tag name';
274+
ALTER TABLE `rule` CHANGE COLUMN `sort` `sort_code` int(0) NOT NULL COMMENT 'sort';
275+
ALTER TABLE `rule` CHANGE COLUMN `name` `rule_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'rule name';

‎db/upgrade/2.7.0-upgrade-2.7.1-ob.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,4 +262,7 @@ INSERT INTO `permission` (`id`, `object_id`, `resource_id`, `date_created`, `dat
262262
ALTER TABLE `rule` MODIFY COLUMN `handle` text;
263263
ALTER TABLE `selector` CHANGE COLUMN `type` `selector_type` int(0) NOT NULL COMMENT 'type (0, full flow, 1 custom flow)';
264264
ALTER TABLE `selector` CHANGE COLUMN `sort` `sort_code` int(0) NOT NULL COMMENT 'sort';
265-
ALTER TABLE `selector` CHANGE COLUMN `name` `selector_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'selector name';
265+
ALTER TABLE `selector` CHANGE COLUMN `name` `selector_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'selector name';
266+
ALTER TABLE `tag` CHANGE COLUMN `name` `tag_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'tag name';
267+
ALTER TABLE `rule` CHANGE COLUMN `sort` `sort_code` int(0) NOT NULL COMMENT 'sort';
268+
ALTER TABLE `rule` CHANGE COLUMN `name` `rule_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'rule name';

‎db/upgrade/2.7.0-upgrade-2.7.1-og.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,3 +287,6 @@ ALTER TABLE "public"."rule" ALTER COLUMN "handle" TYPE text;
287287
ALTER TABLE "public"."selector" RENAME COLUMN "type" TO "selector_type";
288288
ALTER TABLE "public"."selector" RENAME COLUMN "sort" TO "sort_code";
289289
ALTER TABLE "public"."selector" RENAME COLUMN "name" TO "selector_name";
290+
ALTER TABLE "public"."tag" RENAME COLUMN "name" TO "tag_name";
291+
ALTER TABLE "public"."rule" RENAME COLUMN "sort" TO "sort_code";
292+
ALTER TABLE "public"."rule" RENAME COLUMN "name" TO "rule_name";

‎db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,4 +576,7 @@ ALTER TABLE rule DROP COLUMN handle;
576576
ALTER TABLE rule RENAME COLUMN handle_new TO handle;
577577
ALTER TABLE selector RENAME COLUMN "type" TO "selector_type";
578578
ALTER TABLE selector RENAME COLUMN "sort" TO "sort_code";
579-
ALTER TABLE selector RENAME COLUMN "name" TO "selector_name";
579+
ALTER TABLE selector RENAME COLUMN "name" TO "selector_name";
580+
ALTER TABLE tag RENAME COLUMN "name" TO "tag_name";
581+
ALTER TABLE rule RENAME COLUMN "sort" TO "sort_code";
582+
ALTER TABLE rule RENAME COLUMN "name" TO "rule_name";

‎db/upgrade/2.7.0-upgrade-2.7.1-pg.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,4 +284,7 @@ INSERT INTO "public"."permission" VALUES ('1953049887387303905', '13463585604272
284284
ALTER TABLE "public"."rule" ALTER COLUMN "handle" TYPE text;
285285
ALTER TABLE "public"."selector" RENAME COLUMN "type" TO "selector_type";
286286
ALTER TABLE "public"."selector" RENAME COLUMN "sort" TO "sort_code";
287-
ALTER TABLE "public"."selector" RENAME COLUMN "name" TO "selector_name";
287+
ALTER TABLE "public"."selector" RENAME COLUMN "name" TO "selector_name";
288+
ALTER TABLE "public"."tag" RENAME COLUMN "name" TO "tag_name";
289+
ALTER TABLE "public"."rule" RENAME COLUMN "sort" TO "sort_code";
290+
ALTER TABLE "public"."rule" RENAME COLUMN "name" TO "rule_name";

0 commit comments

Comments
 (0)