Merge branch 'old' into main

apis/admin/subscribe.api

@@ -102,6 +102,9 @@ type (
 	BatchDeleteSubscribeRequest {
 		Ids []int64 `json:"ids" validate:"required"`
 	}
+	ResetAllSubscribeTokenResponse {
+		Success bool `json:"success"`
+	}
 )
 
 @server (
@@ -157,5 +160,9 @@ service ppanel {
 	@doc "Subscribe sort"
 	@handler SubscribeSort
 	post /sort (SubscribeSortRequest)
+
+	@doc "Reset all subscribe tokens"
+	@handler ResetAllSubscribeToken
+	post /reset_all_token returns (ResetAllSubscribeTokenResponse)
 }
 

apis/admin/system.api

@@ -19,8 +19,13 @@ type (
 		Periods []TimePeriod `json:"periods"`
 	}
 	PreViewNodeMultiplierResponse {
-		CurrentTime string `json:"current_time"`
-		Ratio float32 `json:"ratio"`
+		CurrentTime string  `json:"current_time"`
+		Ratio       float32 `json:"ratio"`
+	}
+	ModuleConfig {
+		Secret         string `json:"secret"` // 通讯密钥
+		ServiceName    string `json:"service_name"` // 服务名称
+		ServiceVersion string `json:"service_version"` // 服务版本
 	}
 )
 
@@ -125,5 +130,9 @@ service ppanel {
 	@doc "PreView Node Multiplier"
 	@handler PreViewNodeMultiplier
 	get /node_multiplier/preview returns (PreViewNodeMultiplierResponse)
+
+	@doc "Get Module Config"
+	@handler GetModuleConfig
+	get /module returns (ModuleConfig)
 }
 

apis/admin/tool.api

@@ -17,6 +17,14 @@ type (
 	VersionResponse {
 		Version string `json:"version"`
 	}
+	QueryIPLocationRequest {
+		IP string `form:"ip" validate:"required"`
+	}
+	QueryIPLocationResponse {
+		Country string `json:"country"`
+		Region  string `json:"region,omitempty"`
+		City    string `json:"city"`
+	}
 )
 
 @server (
@@ -36,5 +44,9 @@ service ppanel {
 	@doc "Get Version"
 	@handler GetVersion
 	get /version returns (VersionResponse)
+
+	@doc "Query IP Location"
+	@handler QueryIPLocation
+	get /ip/location (QueryIPLocationRequest) returns (QueryIPLocationResponse)
 }
 

apis/auth/auth.api

@@ -11,11 +11,13 @@ info (
 type (
 	// User login request
 	UserLoginRequest {
-		Email     string `json:"email" validate:"required"`
-		Password  string `json:"password" validate:"required"`
-		IP        string `header:"X-Original-Forwarded-For"`
-		UserAgent string `header:"User-Agent"`
-		CfToken   string `json:"cf_token,optional"`
+		Identifier string `json:"identifier"`
+		Email      string `json:"email" validate:"required"`
+		Password   string `json:"password" validate:"required"`
+		IP         string `header:"X-Original-Forwarded-For"`
+		UserAgent  string `header:"User-Agent"`
+		LoginType  string `header:"Login-Type"`
+		CfToken    string `json:"cf_token,optional"`
 	}
 	// Check user is exist request
 	CheckUserRequest {
@@ -27,22 +29,26 @@ type (
 	}
 	// User login response
 	UserRegisterRequest {
-		Email     string `json:"email" validate:"required"`
-		Password  string `json:"password" validate:"required"`
-		Invite    string `json:"invite,optional"`
-		Code      string `json:"code,optional"`
-		IP        string `header:"X-Original-Forwarded-For"`
-		UserAgent string `header:"User-Agent"`
-		CfToken   string `json:"cf_token,optional"`
+		Identifier string `json:"identifier"`
+		Email      string `json:"email" validate:"required"`
+		Password   string `json:"password" validate:"required"`
+		Invite     string `json:"invite,optional"`
+		Code       string `json:"code,optional"`
+		IP         string `header:"X-Original-Forwarded-For"`
+		UserAgent  string `header:"User-Agent"`
+		LoginType  string `header:"Login-Type"`
+		CfToken    string `json:"cf_token,optional"`
 	}
 	// User login response
 	ResetPasswordRequest {
-		Email     string `json:"email" validate:"required"`
-		Password  string `json:"password" validate:"required"`
-		Code      string `json:"code,optional"`
-		IP        string `header:"X-Original-Forwarded-For"`
-		UserAgent string `header:"User-Agent"`
-		CfToken   string `json:"cf_token,optional"`
+		Identifier string `json:"identifier"`
+		Email      string `json:"email" validate:"required"`
+		Password   string `json:"password" validate:"required"`
+		Code       string `json:"code,optional"`
+		IP         string `header:"X-Original-Forwarded-For"`
+		UserAgent  string `header:"User-Agent"`
+		LoginType  string `header:"Login-Type"`
+		CfToken    string `json:"cf_token,optional"`
 	}
 	LoginResponse {
 		Token string `json:"token"`
@@ -60,12 +66,14 @@ type (
 	}
 	// login request
 	TelephoneLoginRequest {
+		Identifier        string `json:"identifier"`
 		Telephone         string `json:"telephone" validate:"required"`
 		TelephoneCode     string `json:"telephone_code"`
 		TelephoneAreaCode string `json:"telephone_area_code" validate:"required"`
 		Password          string `json:"password"`
 		IP                string `header:"X-Original-Forwarded-For"`
 		UserAgent         string `header:"User-Agent"`
+		LoginType         string `header:"Login-Type"`
 		CfToken           string `json:"cf_token,optional"`
 	}
 	// Check user is exist request
@@ -79,6 +87,7 @@ type (
 	}
 	// User login response
 	TelephoneRegisterRequest {
+		Identifier        string `json:"identifier"`
 		Telephone         string `json:"telephone" validate:"required"`
 		TelephoneAreaCode string `json:"telephone_area_code" validate:"required"`
 		Password          string `json:"password" validate:"required"`
@@ -86,16 +95,19 @@ type (
 		Code              string `json:"code,optional"`
 		IP                string `header:"X-Original-Forwarded-For"`
 		UserAgent         string `header:"User-Agent"`
+		LoginType         string `header:"Login-Type,optional"`
 		CfToken           string `json:"cf_token,optional"`
 	}
 	// User login response
 	TelephoneResetPasswordRequest {
+		Identifier        string `json:"identifier"`
 		Telephone         string `json:"telephone" validate:"required"`
 		TelephoneAreaCode string `json:"telephone_area_code" validate:"required"`
 		Password          string `json:"password" validate:"required"`
 		Code              string `json:"code,optional"`
 		IP                string `header:"X-Original-Forwarded-For"`
 		UserAgent         string `header:"User-Agent"`
+		LoginType         string `header:"Login-Type,optional"`
 		CfToken           string `json:"cf_token,optional"`
 	}
 	AppleLoginCallbackRequest {
@@ -107,11 +119,18 @@ type (
 		Code  string `form:"code"`
 		State string `form:"state"`
 	}
+	DeviceLoginRequest {
+		Identifier string `json:"identifier" validate:"required"`
+		IP         string `header:"X-Original-Forwarded-For"`
+		UserAgent  string `json:"user_agent" validate:"required"`
+		CfToken    string `json:"cf_token,optional"`
+	}
 )
 
 @server (
-	prefix: v1/auth
-	group:  auth
+	prefix:     v1/auth
+	group:      auth
+	middleware: DeviceMiddleware
 )
 service ppanel {
 	@doc "User login"
@@ -145,6 +164,10 @@ service ppanel {
 	@doc "Reset password"
 	@handler TelephoneResetPassword
 	post /reset/telephone (TelephoneResetPasswordRequest) returns (LoginResponse)
+
+	@doc "Device Login"
+	@handler DeviceLogin
+	post /login/device (DeviceLoginRequest) returns (LoginResponse)
 }
 
 @server (

apis/common.api

@@ -87,11 +87,17 @@ type (
 		Total int64             `json:"total"`
 		List  []SubscribeClient `json:"list"`
 	}
+	HeartbeatResponse {
+		Status    bool   `json:"status"`
+		Message   string `json:"message,omitempty"`
+		Timestamp int64  `json:"timestamp,omitempty"`
+	}
 )
 
 @server (
-	prefix: v1/common
-	group:  common
+	prefix:     v1/common
+	group:      common
+	middleware: DeviceMiddleware
 )
 service ppanel {
 	@doc "Get global config"
@@ -129,5 +135,9 @@ service ppanel {
 	@doc "Get Client"
 	@handler GetClient
 	get /client returns (GetSubscribeClientResponse)
+
+	@doc "Heartbeat"
+	@handler Heartbeat
+	get /heartbeat returns (HeartbeatResponse)
 }
 

apis/public/announcement.api

@@ -13,7 +13,7 @@ import "../types.api"
 @server (
 	prefix:     v1/public/announcement
 	group:      public/announcement
-	middleware: AuthMiddleware
+	middleware: AuthMiddleware,DeviceMiddleware
 )
 service ppanel {
 	@doc "Query announcement"

apis/public/document.api

@@ -13,7 +13,7 @@ import "../types.api"
 @server (
 	prefix:     v1/public/document
 	group:      public/document
-	middleware: AuthMiddleware
+	middleware: AuthMiddleware,DeviceMiddleware
 )
 service ppanel {
 	@doc "Get document list"

apis/public/order.api

@@ -13,7 +13,7 @@ import "../types.api"
 @server (
 	prefix:     v1/public/order
 	group:      public/order
-	middleware: AuthMiddleware
+	middleware: AuthMiddleware,DeviceMiddleware
 )
 service ppanel {
 	@doc "Pre create order"

apis/public/payment.api

@@ -13,7 +13,7 @@ import "../types.api"
 @server (
 	prefix:     v1/public/payment
 	group:      public/payment
-	middleware: AuthMiddleware
+	middleware: AuthMiddleware,DeviceMiddleware
 )
 service ppanel {
 	@doc "Get available payment methods"

apis/public/portal.api

@@ -68,8 +68,9 @@ type (
 )
 
 @server (
-	prefix: v1/public/portal
-	group:  public/portal
+	prefix:     v1/public/portal
+	group:      public/portal
+	middleware: DeviceMiddleware
 )
 service ppanel {
 	@doc "Get available payment methods"

apis/public/subscribe.api

@@ -14,16 +14,54 @@ type (
 	QuerySubscribeListRequest {
 		Language string `form:"language"`
 	}
+	QueryUserSubscribeNodeListResponse {
+		List []UserSubscribeInfo `json:"list"`
+	}
+	UserSubscribeInfo {
+		Id          int64                    `json:"id"`
+		UserId      int64                    `json:"user_id"`
+		OrderId     int64                    `json:"order_id"`
+		SubscribeId int64                    `json:"subscribe_id"`
+		StartTime   int64                    `json:"start_time"`
+		ExpireTime  int64                    `json:"expire_time"`
+		FinishedAt  int64                    `json:"finished_at"`
+		ResetTime   int64                    `json:"reset_time"`
+		Traffic     int64                    `json:"traffic"`
+		Download    int64                    `json:"download"`
+		Upload      int64                    `json:"upload"`
+		Token       string                   `json:"token"`
+		Status      uint8                    `json:"status"`
+		CreatedAt   int64                    `json:"created_at"`
+		UpdatedAt   int64                    `json:"updated_at"`
+		IsTryOut    bool                     `json:"is_try_out"`
+		Nodes       []*UserSubscribeNodeInfo `json:"nodes"`
+	}
+	UserSubscribeNodeInfo {
+		Id        int64    `json:"id"`
+		Name      string   `json:"name"`
+		Uuid      string   `json:"uuid"`
+		Protocol  string   `json:"protocol"`
+		Port      uint16   `json:"port"`
+		Address   string   `json:"address"`
+		Tags      []string `json:"tags"`
+		Country   string   `json:"country"`
+		City      string   `json:"city"`
+		CreatedAt int64    `json:"created_at"`
+	}
 )
 
 @server (
 	prefix:     v1/public/subscribe
 	group:      public/subscribe
-	middleware: AuthMiddleware
+	middleware: AuthMiddleware,DeviceMiddleware
 )
 service ppanel {
 	@doc "Get subscribe list"
 	@handler QuerySubscribeList
 	get /list (QuerySubscribeListRequest) returns (QuerySubscribeListResponse)
+
+	@doc "Get user subscribe node info"
+	@handler QueryUserSubscribeNodeList
+	get /node/list returns (QueryUserSubscribeNodeListResponse)
 }
 

apis/public/ticket.api

@@ -45,7 +45,7 @@ type (
 @server (
 	prefix:     v1/public/ticket
 	group:      public/ticket
-	middleware: AuthMiddleware
+	middleware: AuthMiddleware,DeviceMiddleware
 )
 service ppanel {
 	@doc "Get ticket list"

apis/public/user.api

@@ -97,12 +97,48 @@ type (
 		Email string `json:"email" validate:"required"`
 		Code  string `json:"code" validate:"required"`
 	}
+	GetDeviceListResponse {
+		List  []UserDevice `json:"list"`
+		Total int64        `json:"total"`
+	}
+	UnbindDeviceRequest {
+		Id int64 `json:"id" validate:"required"`
+	}
+	UpdateUserSubscribeNoteRequest {
+		UserSubscribeId int64  `json:"user_subscribe_id" validate:"required"`
+		Note            string `json:"note" validate:"max=500"`
+	}
+	UpdateUserRulesRequest {
+		Rules []string `json:"rules" validate:"required"`
+	}
+	CommissionWithdrawRequest {
+		Amount  int64  `json:"amount"`
+		Content string `json:"content"`
+	}
+	WithdrawalLog {
+		Id        int64  `json:"id"`
+		UserId    int64  `json:"user_id"`
+		Amount    int64  `json:"amount"`
+		Content   string `json:"content"`
+		Status    uint8  `json:"status"`
+		Reason    string `json:"reason,omitempty"`
+		CreatedAt int64  `json:"created_at"`
+		UpdatedAt int64  `json:"updated_at"`
+	}
+	QueryWithdrawalLogListRequest {
+		Page int `form:"page"`
+		Size int `form:"size"`
+	}
+	QueryWithdrawalLogListResponse {
+		List  []WithdrawalLog `json:"list"`
+		Total int64           `json:"total"`
+	}
 )
 
 @server (
 	prefix:     v1/public/user
 	group:      public/user
-	middleware: AuthMiddleware
+	middleware: AuthMiddleware,DeviceMiddleware
 )
 service ppanel {
 	@doc "Query User Info"
@@ -192,5 +228,29 @@ service ppanel {
 	@doc "Update Bind Email"
 	@handler UpdateBindEmail
 	put /bind_email (UpdateBindEmailRequest)
+
+	@doc "Get Device List"
+	@handler GetDeviceList
+	get /devices returns (GetDeviceListResponse)
+
+	@doc "Unbind Device"
+	@handler UnbindDevice
+	put /unbind_device (UnbindDeviceRequest)
+
+	@doc "Update User Subscribe Note"
+	@handler UpdateUserSubscribeNote
+	put /subscribe_note (UpdateUserSubscribeNoteRequest)
+
+	@doc "Update User Rules"
+	@handler UpdateUserRules
+	put /rules (UpdateUserRulesRequest)
+
+	@doc "Commission Withdraw"
+	@handler CommissionWithdraw
+	post /commission_withdraw (CommissionWithdrawRequest) returns (WithdrawalLog)
+
+	@doc "Query Withdrawal Log"
+	@handler QueryWithdrawalLog
+	get /withdrawal_log (QueryWithdrawalLogListRequest) returns (QueryWithdrawalLogListResponse)
 }
 

apis/types.api

@@ -28,6 +28,7 @@ type (
 		EnableTradeNotify     bool             `json:"enable_trade_notify"`
 		AuthMethods           []UserAuthMethod `json:"auth_methods"`
 		UserDevices           []UserDevice     `json:"user_devices"`
+		Rules                 []string         `json:"rules"`
 		CreatedAt             int64            `json:"created_at"`
 		UpdatedAt             int64            `json:"updated_at"`
 		DeletedAt             int64            `json:"deleted_at,omitempty"`
@@ -115,6 +116,7 @@ type (
 	AuthConfig {
 		Mobile   MobileAuthenticateConfig `json:"mobile"`
 		Email    EmailAuthticateConfig    `json:"email"`
+		Device   DeviceAuthticateConfig   `json:"device"`
 		Register PubilcRegisterConfig     `json:"register"`
 	}
 	PubilcRegisterConfig {
@@ -134,6 +136,12 @@ type (
 		EnableDomainSuffix bool   `json:"enable_domain_suffix"`
 		DomainSuffixList   string `json:"domain_suffix_list"`
 	}
+	DeviceAuthticateConfig {
+		Enable         bool `json:"enable"`
+		ShowAds        bool `json:"show_ads"`
+		EnableSecurity bool `json:"enable_security"`
+		OnlyRealDevice bool `json:"only_real_device"`
+	}
 	RegisterConfig {
 		StopRegister            bool   `json:"stop_register"`
 		EnableTrial             bool   `json:"enable_trial"`
@@ -464,6 +472,7 @@ type (
 		Upload      int64     `json:"upload"`
 		Token       string    `json:"token"`
 		Status      uint8     `json:"status"`
+		Short       string    `json:"short"`
 		CreatedAt   int64     `json:"created_at"`
 		UpdatedAt   int64     `json:"updated_at"`
 	}