用户可以使用管理员设置的公用线路

pkg/rpc/protos/models/model_ns_route.proto

@@ -5,6 +5,7 @@ package pb;
 
 import "models/model_ns_cluster.proto";
 import "models/model_ns_domain.proto";
+import "models/model_ns_route_category.proto";
 
 // 线路
 message NSRoute {
@@ -13,10 +14,12 @@ message NSRoute {
 	string name = 3;
 	bytes rangesJSON = 4;
 	bool isDeleted = 5;
-	int64 order = 6;
+	int32 order = 6;
 	int64 version = 7;
 	string code = 8;
+	bool isPublic = 9;
 
 	NSCluster nsCluster = 30;
 	NSDomain nsDomain = 31;
+	NSRouteCategory nsRouteCategory = 32;
 }

pkg/rpc/protos/models/model_ns_route_category.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+// 线路分类
+message NSRouteCategory {
+	int64 id = 1;
+	string name = 2;
+	bool isOn = 3;
+	int32 order = 4;
+}

pkg/rpc/protos/service_ns_route.proto

@@ -26,6 +26,10 @@ service NSRouteService {
 	// 读取所有自定义线路
 	rpc findAllNSRoutes (FindAllNSRoutesRequest) returns (FindAllNSRoutesResponse);
 
+	// 读取所有公用的自定义线路
+	// 目前只允许读取系统管理员设置的公用自定义线路
+	rpc findAllPublicNSRoutes (FindAllPublicRoutesRequest) returns (FindAllPublicRoutesResponse);
+
 	// 设置自定义线路排序
 	rpc updateNSRouteOrders (UpdateNSRouteOrdersRequest) returns (RPCSuccess);
 
@@ -49,6 +53,8 @@ message CreateNSRouteRequest {
 	int64 userId = 3;
 	string name = 4;
 	bytes rangesJSON = 5;
+	bool isPublic = 6;
+	int64 nsRouteCategoryId = 7;
 }
 
 message CreateNSRouteResponse {
@@ -60,6 +66,9 @@ message UpdateNSRouteRequest {
 	int64 nsRouteId = 1;
 	string name = 2;
 	bytes rangesJSON = 3;
+	bool isPublic = 4;
+	int64 nsRouteCategoryId = 5;
+	bool isOn = 6;
 }
 
 // 删除自定义线路
@@ -85,15 +94,25 @@ message CountAllNSRoutesRequest {
 
 // 读取所有自定义线路
 message FindAllNSRoutesRequest {
-	int64 nsClusterId = 1;
-	int64 nsDomainId = 2;
-	int64 userId = 3;
+	int64 nsClusterId = 1; // 集群ID
+	int64 nsDomainId = 2; // 域名ID
+	int64 userId = 3; // 用户ID
+	int64 nsRouteCategoryId = 4; // 线路分类ID
 }
 
 message FindAllNSRoutesResponse {
 	repeated NSRoute nsRoutes = 1;
 }
 
+// 读取所有公用的自定义线路
+message FindAllPublicRoutesRequest {
+
+}
+
+message FindAllPublicRoutesResponse {
+	repeated NSRoute nsRoutes = 1;
+}
+
 // 设置自定义线路排序
 message UpdateNSRouteOrdersRequest {
 	repeated int64 nsRouteIds = 1;

pkg/rpc/protos/service_ns_route_category.proto

@@ -0,0 +1,72 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+import "models/model_ns_route_category.proto";
+import "models/rpc_messages.proto";
+
+// 线路分类服务
+service NSRouteCategoryService {
+	// 创建线路分类
+	rpc createNSRouteCategory(CreateNSRouteCategoryRequest) returns (CreateNSRouteCategoryResponse);
+
+	// 修改线路分类
+	rpc updateNSRouteCategory(UpdateNSRouteCategoryRequest) returns (RPCSuccess);
+
+	// 删除线路分类
+	rpc deleteNSRouteCategory(DeleteNSRouteCategoryRequest) returns (RPCSuccess);
+
+	// 列出所有线路分类
+	rpc findAllNSRouteCategories(FindAllNSRouteCategoriesRequest) returns (FindAllNSRouteCategoriesResponse);
+
+	// 对线路分类进行排序
+	rpc updateNSRouteCategoryOrders(UpdateNSRouteCategoryOrders) returns (RPCSuccess);
+
+	// 查找单个线路分类
+	rpc findNSRouteCategory(FindNSRouteCategoryRequest) returns (FindNSRouteCategoryResponse);
+}
+
+// 创建线路分类
+message CreateNSRouteCategoryRequest {
+	string name = 1;
+}
+
+message CreateNSRouteCategoryResponse {
+	int64 nsRouteCategoryId = 1;
+}
+
+// 修改线路分类
+message UpdateNSRouteCategoryRequest {
+	int64 nsRouteCategoryId = 1;
+	string name = 2;
+	bool isOn = 3;
+}
+
+// 删除线路分类
+message DeleteNSRouteCategoryRequest {
+	int64 nsRouteCategoryId = 1;
+}
+
+// 列出所有线路分类
+message FindAllNSRouteCategoriesRequest {
+
+}
+
+message FindAllNSRouteCategoriesResponse {
+	repeated NSRouteCategory nsRouteCategories = 1;
+}
+
+// 对线路分类进行排序
+message UpdateNSRouteCategoryOrders {
+	repeated int64 nsRouteCategoryIds = 1;
+}
+
+// 查找单个线路分类
+message FindNSRouteCategoryRequest {
+	int64 nsRouteCategoryId = 1;
+}
+
+message FindNSRouteCategoryResponse {
+	NSRouteCategory nsRouteCategory = 1;
+}