From 04a1a05127253dc52bdcf2a1dc873f4638afb4ab Mon Sep 17 00:00:00 2001 From: tanghc Date: Tue, 16 Jun 2020 18:02:41 +0800 Subject: [PATCH] 3.2.0 --- .../com/gitee/sop/adminserver/entity/ConfigServiceRoute.java | 4 ++-- .../java/com/gitee/sop/gateway/entity/ConfigServiceRoute.java | 4 ++-- .../java/com/gitee/sop/gateway/manager/DbRoutesProcessor.java | 2 +- sop-mysql5.6以下版本.sql | 2 +- sop.sql | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigServiceRoute.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigServiceRoute.java index 0234fb21..30b817af 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigServiceRoute.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigServiceRoute.java @@ -46,8 +46,8 @@ public class ConfigServiceRoute { /** uri后面跟的path, 数据库字段：path */ private String path; - /** 路由执行的顺序, 数据库字段：order */ - private Integer order; + /** 路由执行的顺序, 数据库字段：order_index */ + private Integer orderIndex; /** 是否忽略验证，业务参数验证除外, 数据库字段：ignore_validate */ private Byte ignoreValidate; diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/entity/ConfigServiceRoute.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/entity/ConfigServiceRoute.java index dbed6fa8..855fbfa7 100644 --- a/sop-gateway/src/main/java/com/gitee/sop/gateway/entity/ConfigServiceRoute.java +++ b/sop-gateway/src/main/java/com/gitee/sop/gateway/entity/ConfigServiceRoute.java @@ -46,8 +46,8 @@ public class ConfigServiceRoute { /** uri后面跟的path, 数据库字段：path */ private String path; - /** 路由执行的顺序, 数据库字段：order */ - private Integer order; + /** 路由执行的顺序, 数据库字段：order_index */ + private Integer orderIndex; /** 是否忽略验证，业务参数验证除外, 数据库字段：ignore_validate */ private Byte ignoreValidate; diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/manager/DbRoutesProcessor.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/manager/DbRoutesProcessor.java index ca0a21be..6740f2d8 100644 --- a/sop-gateway/src/main/java/com/gitee/sop/gateway/manager/DbRoutesProcessor.java +++ b/sop-gateway/src/main/java/com/gitee/sop/gateway/manager/DbRoutesProcessor.java @@ -59,7 +59,7 @@ public class DbRoutesProcessor implements RoutesProcessor { configServiceRoute.setMergeResult((byte) routeDefinition.getMergeResult()); configServiceRoute.setStatus((byte) routeDefinition.getStatus()); configServiceRoute.setPermission((byte) routeDefinition.getPermission()); - configServiceRoute.setOrder(routeDefinition.getOrder()); + configServiceRoute.setOrderIndex(routeDefinition.getOrder()); configServiceRoute.setNeedToken((byte)routeDefinition.getNeedToken()); configServiceRoute.setServiceId(serviceId); return configServiceRoute; diff --git a/sop-mysql5.6以下版本.sql b/sop-mysql5.6以下版本.sql index 7d0cd7fa..d56a288c 100644 --- a/sop-mysql5.6以下版本.sql +++ b/sop-mysql5.6以下版本.sql @@ -222,7 +222,7 @@ CREATE TABLE `config_service_route` ( `filters` VARCHAR(256) DEFAULT NULL COMMENT '路由过滤器（SpringCloudGateway专用）', `uri` VARCHAR(128) NOT NULL DEFAULT '' COMMENT '路由规则转发的目标uri', `path` VARCHAR(128) NOT NULL DEFAULT '' COMMENT 'uri后面跟的path', - `order` INT(11) NOT NULL DEFAULT '0' COMMENT '路由执行的顺序', + `order_index` INT(11) NOT NULL DEFAULT '0' COMMENT '路由执行的顺序', `ignore_validate` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '是否忽略验证，业务参数验证除外', `status` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '状态，0：待审核，1：启用，2：禁用', `merge_result` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '是否合并结果', diff --git a/sop.sql b/sop.sql index 4df5d424..a9f95d31 100644 --- a/sop.sql +++ b/sop.sql @@ -224,7 +224,7 @@ CREATE TABLE `config_service_route` ( `filters` varchar(256) DEFAULT NULL COMMENT '路由过滤器（SpringCloudGateway专用）', `uri` varchar(128) NOT NULL DEFAULT '' COMMENT '路由规则转发的目标uri', `path` varchar(128) NOT NULL DEFAULT '' COMMENT 'uri后面跟的path', - `order` int(11) NOT NULL DEFAULT '0' COMMENT '路由执行的顺序', + `order_index` int(11) NOT NULL DEFAULT '0' COMMENT '路由执行的顺序', `ignore_validate` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否忽略验证，业务参数验证除外', `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '状态，0：待审核，1：启用，2：禁用', `merge_result` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否合并结果',