feat(subscribe): add Language field to subscription models and update query logic

apis/admin/subscribe.api

@@ -35,6 +35,7 @@ type (
 	}
 	CreateSubscribeRequest {
 		Name           string              `json:"name" validate:"required"`
+		Language       string              `json:"language"`
 		Description    string              `json:"description"`
 		UnitPrice      int64               `json:"unit_price"`
 		UnitTime       string              `json:"unit_time"`
@@ -45,7 +46,6 @@ type (
 		SpeedLimit     int64               `json:"speed_limit"`
 		DeviceLimit    int64               `json:"device_limit"`
 		Quota          int64               `json:"quota"`
-		GroupId        int64               `json:"group_id"`
 		Nodes          []int64             `json:"nodes"`
 		NodeTags       []string            `json:"node_tags"`
 		Show           *bool               `json:"show"`
@@ -58,6 +58,7 @@ type (
 	UpdateSubscribeRequest {
 		Id             int64               `json:"id" validate:"required"`
 		Name           string              `json:"name" validate:"required"`
+		Language       string              `json:"language"`
 		Description    string              `json:"description"`
 		UnitPrice      int64               `json:"unit_price"`
 		UnitTime       string              `json:"unit_time"`
@@ -68,7 +69,6 @@ type (
 		SpeedLimit     int64               `json:"speed_limit"`
 		DeviceLimit    int64               `json:"device_limit"`
 		Quota          int64               `json:"quota"`
-		GroupId        int64               `json:"group_id"`
 		Nodes          []int64             `json:"nodes"`
 		NodeTags       []string            `json:"node_tags"`
 		Show           *bool               `json:"show"`
@@ -83,10 +83,10 @@ type (
 		Sort []SortItem `json:"sort"`
 	}
 	GetSubscribeListRequest {
-		Page    int64  `form:"page" validate:"required"`
-		Size    int64  `form:"size" validate:"required"`
-		GroupId int64  `form:"group_id,omitempty"`
-		Search  string `form:"search,omitempty"`
+		Page     int64  `form:"page" validate:"required"`
+		Size     int64  `form:"size" validate:"required"`
+		Language string `form:"language,omitempty"`
+		Search   string `form:"search,omitempty"`
 	}
 	SubscribeItem {
 		Subscribe

apis/admin/system.api

@@ -42,10 +42,6 @@ service ppanel {
 	@handler UpdateSubscribeConfig
 	put /subscribe_config (SubscribeConfig)
 
-	@doc "Get subscribe type"
-	@handler GetSubscribeType
-	get /subscribe_type returns (SubscribeType)
-
 	@doc "Get register config"
 	@handler GetRegisterConfig
 	get /register_config returns (RegisterConfig)

apis/public/subscribe.api

@@ -10,6 +10,12 @@ info (
 
 import "../types.api"
 
+type (
+	QuerySubscribeListRequest {
+		Language string `form:"language"`
+	}
+)
+
 @server (
 	prefix:     v1/public/subscribe
 	group:      public/subscribe
@@ -18,10 +24,6 @@ import "../types.api"
 service ppanel {
 	@doc "Get subscribe list"
 	@handler QuerySubscribeList
-	get /list returns (QuerySubscribeListResponse)
-
-	@doc "Get subscribe group list"
-	@handler QuerySubscribeGroupList
-	get /group/list returns (QuerySubscribeGroupListResponse)
+	get /list (QuerySubscribeListRequest) returns (QuerySubscribeListResponse)
 }
 

apis/types.api

@@ -185,6 +185,7 @@ type (
 	Subscribe {
 		Id             int64               `json:"id"`
 		Name           string              `json:"name"`
+		Language       string              `json:"language"`
 		Description    string              `json:"description"`
 		UnitPrice      int64               `json:"unit_price"`
 		UnitTime       string              `json:"unit_time"`
@@ -195,7 +196,6 @@ type (
 		SpeedLimit     int64               `json:"speed_limit"`
 		DeviceLimit    int64               `json:"device_limit"`
 		Quota          int64               `json:"quota"`
-		GroupId        int64               `json:"group_id"`
 		Nodes          []int64             `json:"nodes"`
 		NodeTags       []string            `json:"node_tags"`
 		Show           bool                `json:"show"`