Merge old/master into main, resolving conflicts by preferring old in workflows and removing deprecated adapter files

apis/admin/application.api

@@ -0,0 +1,96 @@
+syntax = "v1"
+
+info (
+	title:   "Application API"
+	desc:    "API for ppanel"
+	author:  "Tension"
+	email:   "tension@ppanel.com"
+	version: "0.0.1"
+)
+
+import "../types.api"
+
+type (
+	SubscribeApplication {
+		Id                int64        `json:"id"`
+		Name              string       `json:"name"`
+		Description       string       `json:"description,omitempty"`
+		Icon              string       `json:"icon,omitempty"`
+		Scheme            string       `json:"scheme,omitempty"`
+		UserAgent         string       `json:"user_agent"`
+		IsDefault         bool         `json:"is_default"`
+		SubscribeTemplate string       `json:"template"`
+		OutputFormat      string       `json:"output_format"`
+		DownloadLink      DownloadLink `json:"download_link,omitempty"`
+		CreatedAt         int64        `json:"created_at"`
+		UpdatedAt         int64        `json:"updated_at"`
+	}
+	GetSubscribeApplicationListResponse {
+		Total int64                  `json:"total"`
+		List  []SubscribeApplication `json:"list"`
+	}
+	CreateSubscribeApplicationRequest {
+		Name              string       `json:"name"`
+		Description       string       `json:"description,omitempty"`
+		Icon              string       `json:"icon,omitempty"`
+		Scheme            string       `json:"scheme,omitempty"`
+		UserAgent         string       `json:"user_agent"`
+		IsDefault         bool         `json:"is_default"`
+		SubscribeTemplate string       `json:"template"`
+		OutputFormat      string       `json:"output_format"`
+		DownloadLink      DownloadLink `json:"download_link"`
+	}
+	UpdateSubscribeApplicationRequest {
+		Id                int64        `json:"id"`
+		Name              string       `json:"name"`
+		Description       string       `json:"description,omitempty"`
+		Icon              string       `json:"icon,omitempty"`
+		Scheme            string       `json:"scheme,omitempty"`
+		UserAgent         string       `json:"user_agent"`
+		IsDefault         bool         `json:"is_default"`
+		SubscribeTemplate string       `json:"template"`
+		OutputFormat      string       `json:"output_format"`
+		DownloadLink      DownloadLink `json:"download_link,omitempty"`
+	}
+	DeleteSubscribeApplicationRequest {
+		Id int64 `json:"id"`
+	}
+	GetSubscribeApplicationListRequest {
+		Page int `form:"page"`
+		Size int `form:"size"`
+	}
+	PreviewSubscribeTemplateRequest {
+		Id int64 `form:"id"`
+	}
+	PreviewSubscribeTemplateResponse {
+		Template string `json:"template"` // 预览的模板内容
+	}
+)
+
+@server (
+	prefix:     v1/admin/application
+	group:      admin/application
+	middleware: AuthMiddleware
+)
+service ppanel {
+	@doc "Create subscribe application"
+	@handler CreateSubscribeApplication
+	post / (CreateSubscribeApplicationRequest) returns (SubscribeApplication)
+
+	@doc "Update subscribe application"
+	@handler UpdateSubscribeApplication
+	put /subscribe_application (UpdateSubscribeApplicationRequest) returns (SubscribeApplication)
+
+	@doc "Get subscribe application list"
+	@handler GetSubscribeApplicationList
+	get /subscribe_application_list (GetSubscribeApplicationListRequest) returns (GetSubscribeApplicationListResponse)
+
+	@doc "Delete subscribe application"
+	@handler DeleteSubscribeApplication
+	delete /subscribe_application (DeleteSubscribeApplicationRequest)
+
+	@doc "Preview Template"
+	@handler PreviewSubscribeTemplate
+	get /preview (PreviewSubscribeTemplateRequest) returns (PreviewSubscribeTemplateResponse)
+}
+

apis/admin/console.api

@@ -21,7 +21,7 @@ type (
 		Download int64 `json:"download"`
 	}
 	ServerTotalDataResponse {
-		OnlineUserIPs                 int64               `json:"online_user_ips"`
+		OnlineUsers                   int64               `json:"online_users"`
 		OnlineServers                 int64               `json:"online_servers"`
 		OfflineServers                int64               `json:"offline_servers"`
 		TodayUpload                   int64               `json:"today_upload"`

apis/admin/log.api

@@ -12,19 +12,184 @@ import "../types.api"
 
 type (
 	GetMessageLogListRequest {
-		Page     int    `form:"page"`
-		Size     int    `form:"size"`
-		Type     string `form:"type"`
-		Platform string `form:"platform,omitempty"`
-		To       string `form:"to,omitempty"`
-		Subject  string `form:"subject,omitempty"`
-		Content  string `form:"content,omitempty"`
-		Status   int    `form:"status,omitempty"`
+		Page   int    `form:"page"`
+		Size   int    `form:"size"`
+		Type   uint8  `form:"type"`
+		Search string `form:"search,optional"`
 	}
 	GetMessageLogListResponse {
 		Total int64        `json:"total"`
 		List  []MessageLog `json:"list"`
 	}
+	FilterLogParams {
+		Page   int    `form:"page"`
+		Size   int    `form:"size"`
+		Date   string `form:"date,optional"`
+		Search string `form:"search,optional"`
+	}
+	FilterEmailLogResponse {
+		Total int64        `json:"total"`
+		List  []MessageLog `json:"list"`
+	}
+	FilterMobileLogResponse {
+		Total int64        `json:"total"`
+		List  []MessageLog `json:"list"`
+	}
+	SubscribeLog {
+		UserId          int64  `json:"user_id"`
+		Token           string `json:"token"`
+		UserAgent       string `json:"user_agent"`
+		ClientIP        string `json:"client_ip"`
+		UserSubscribeId int64  `json:"user_subscribe_id"`
+		Timestamp       int64  `json:"timestamp"`
+	}
+	FilterSubscribeLogRequest {
+		FilterLogParams
+		UserId          int64 `form:"user_id,optional"`
+		UserSubscribeId int64 `form:"user_subscribe_id,optional"`
+	}
+	FilterSubscribeLogResponse {
+		Total int64          `json:"total"`
+		List  []SubscribeLog `json:"list"`
+	}
+	LoginLog {
+		UserId    int64  `json:"user_id"`
+		Method    string `json:"method"`
+		LoginIP   string `json:"login_ip"`
+		UserAgent string `json:"user_agent"`
+		Success   bool   `json:"success"`
+		Timestamp int64  `json:"timestamp"`
+	}
+	FilterLoginLogRequest {
+		FilterLogParams
+		UserId int64 `form:"user_id,optional"`
+	}
+	FilterLoginLogResponse {
+		Total int64      `json:"total"`
+		List  []LoginLog `json:"list"`
+	}
+	RegisterLog {
+		UserId     int64  `json:"user_id"`
+		AuthMethod string `json:"auth_method"`
+		Identifier string `json:"identifier"`
+		RegisterIP string `json:"register_ip"`
+		UserAgent  string `json:"user_agent"`
+		Timestamp  int64  `json:"timestamp"`
+	}
+	FilterRegisterLogRequest {
+		FilterLogParams
+		UserId int64 `form:"user_id,optional"`
+	}
+	FilterRegisterLogResponse {
+		Total int64         `json:"total"`
+		List  []RegisterLog `json:"list"`
+	}
+	ResetSubscribeLog {
+		Type            uint16 `json:"type"`
+		UserId          int64  `json:"user_id"`
+		UserSubscribeId int64  `json:"user_subscribe_id"`
+		OrderNo         string `json:"order_no,omitempty"`
+		Timestamp       int64  `json:"timestamp"`
+	}
+	FilterResetSubscribeLogRequest {
+		FilterLogParams
+		UserSubscribeId int64 `form:"user_subscribe_id,optional"`
+	}
+	FilterResetSubscribeLogResponse {
+		Total int64               `json:"total"`
+		List  []ResetSubscribeLog `json:"list"`
+	}
+	UserSubscribeTrafficLog {
+		SubscribeId int64  `json:"subscribe_id"` // Subscribe ID
+		UserId      int64  `json:"user_id"` // User ID
+		Upload      int64  `json:"upload"` // Upload traffic in bytes
+		Download    int64  `json:"download"` // Download traffic in bytes
+		Total       int64  `json:"total"` // Total traffic in bytes (Upload + Download)
+		Date        string `json:"date"` // Date in YYYY-MM-DD format
+		Details     bool   `json:"details"` // Whether to show detailed traffic
+	}
+	FilterSubscribeTrafficRequest {
+		FilterLogParams
+		UserId          int64 `form:"user_id,optional"`
+		UserSubscribeId int64 `form:"user_subscribe_id,optional"`
+	}
+	FilterSubscribeTrafficResponse {
+		Total int64                     `json:"total"`
+		List  []UserSubscribeTrafficLog `json:"list"`
+	}
+	ServerTrafficLog {
+		ServerId int64  `json:"server_id"` // Server ID
+		Upload   int64  `json:"upload"` // Upload traffic in bytes
+		Download int64  `json:"download"` // Download traffic in bytes
+		Total    int64  `json:"total"` // Total traffic in bytes (Upload + Download)
+		Date     string `json:"date"` // Date in YYYY-MM-DD format
+		Details  bool   `json:"details"` // Whether to show detailed traffic
+	}
+	FilterServerTrafficLogRequest {
+		FilterLogParams
+		ServerId int64 `form:"server_id,optional"`
+	}
+	FilterServerTrafficLogResponse {
+		Total int64              `json:"total"`
+		List  []ServerTrafficLog `json:"list"`
+	}
+	FilterBalanceLogRequest {
+		FilterLogParams
+		UserId int64 `form:"user_id,optional"`
+	}
+	FilterBalanceLogResponse {
+		Total int64        `json:"total"`
+		List  []BalanceLog `json:"list"`
+	}
+	FilterCommissionLogRequest {
+		FilterLogParams
+		UserId int64 `form:"user_id,optional"`
+	}
+	FilterCommissionLogResponse {
+		Total int64           `json:"total"`
+		List  []CommissionLog `json:"list"`
+	}
+	GiftLog {
+		Type        uint16 `json:"type"`
+		userId      int64  `json:"user_id"`
+		OrderNo     string `json:"order_no"`
+		SubscribeId int64  `json:"subscribe_id"`
+		Amount      int64  `json:"amount"`
+		Balance     int64  `json:"balance"`
+		Remark      string `json:"remark,omitempty"`
+		Timestamp   int64  `json:"timestamp"`
+	}
+	FilterGiftLogRequest {
+		FilterLogParams
+		UserId int64 `form:"user_id,optional"`
+	}
+	FilterGiftLogResponse {
+		Total int64     `json:"total"`
+		List  []GiftLog `json:"list"`
+	}
+	TrafficLogDetails {
+		Id          int64 `json:"id"`
+		ServerId    int64 `json:"server_id"`
+		UserId      int64 `json:"user_id"`
+		SubscribeId int64 `json:"subscribe_id"`
+		Download    int64 `json:"download"`
+		Upload      int64 `json:"upload"`
+		Timestamp   int64 `json:"timestamp"`
+	}
+	FilterTrafficLogDetailsRequest {
+		FilterLogParams
+		ServerId    int64 `form:"server_id,optional"`
+		SubscribeId int64 `form:"subscribe_id,optional"`
+		UserId      int64 `form:"user_id,optional"`
+	}
+	FilterTrafficLogDetailsResponse {
+		Total int64               `json:"total"`
+		List  []TrafficLogDetails `json:"list"`
+	}
+	LogSetting {
+		AutoClear *bool `json:"auto_clear"`
+		ClearDays int64 `json:"clear_days"`
+	}
 )
 
 @server (
@@ -36,5 +201,61 @@ service ppanel {
 	@doc "Get message log list"
 	@handler GetMessageLogList
 	get /message/list (GetMessageLogListRequest) returns (GetMessageLogListResponse)
+
+	@doc "Filter email log"
+	@handler FilterEmailLog
+	get /email/list (FilterLogParams) returns (FilterEmailLogResponse)
+
+	@doc "Filter mobile log"
+	@handler FilterMobileLog
+	get /mobile/list (FilterLogParams) returns (FilterMobileLogResponse)
+
+	@doc "Filter subscribe log"
+	@handler FilterSubscribeLog
+	get /subscribe/list (FilterSubscribeLogRequest) returns (FilterSubscribeLogResponse)
+
+	@doc "Filter login log"
+	@handler FilterLoginLog
+	get /login/list (FilterLoginLogRequest) returns (FilterLoginLogResponse)
+
+	@doc "Filter register log"
+	@handler FilterRegisterLog
+	get /register/list (FilterRegisterLogRequest) returns (FilterRegisterLogResponse)
+
+	@doc "Filter reset subscribe log"
+	@handler FilterResetSubscribeLog
+	get /subscribe/reset/list (FilterResetSubscribeLogRequest) returns (FilterResetSubscribeLogResponse)
+
+	@doc "Filter user subscribe traffic log"
+	@handler FilterUserSubscribeTrafficLog
+	get /subscribe/traffic/list (FilterSubscribeTrafficRequest) returns (FilterSubscribeTrafficResponse)
+
+	@doc "Filter server traffic log"
+	@handler FilterServerTrafficLog
+	get /server/traffic/list (FilterServerTrafficLogRequest) returns (FilterServerTrafficLogResponse)
+
+	@doc "Filter balance log"
+	@handler FilterBalanceLog
+	get /balance/list (FilterBalanceLogRequest) returns (FilterBalanceLogResponse)
+
+	@doc "Filter commission log"
+	@handler FilterCommissionLog
+	get /commission/list (FilterCommissionLogRequest) returns (FilterCommissionLogResponse)
+
+	@doc "Filter gift log"
+	@handler FilterGiftLog
+	get /gift/list (FilterGiftLogRequest) returns (FilterGiftLogResponse)
+
+	@doc "Filter traffic log details"
+	@handler FilterTrafficLogDetails
+	get /traffic/details (FilterTrafficLogDetailsRequest) returns (FilterTrafficLogDetailsResponse)
+
+	@doc "Get log setting"
+	@handler GetLogSetting
+	get /setting returns (LogSetting)
+
+	@doc "Update log setting"
+	@handler UpdateLogSetting
+	post /setting (LogSetting)
 }
 

apis/admin/marketing.api

@@ -0,0 +1,167 @@
+syntax = "v1"
+
+info (
+	title:   "Marketing API"
+	desc:    "API for ppanel"
+	author:  "Tension"
+	email:   "tension@ppanel.com"
+	version: "0.0.1"
+)
+
+type (
+	CreateBatchSendEmailTaskRequest {
+		Subject           string `json:"subject"`
+		Content           string `json:"content"`
+		Scope             int8   `json:"scope"`
+		RegisterStartTime int64  `json:"register_start_time,omitempty"`
+		RegisterEndTime   int64  `json:"register_end_time,omitempty"`
+		Additional        string `json:"additional,omitempty"`
+		Scheduled         int64  `json:"scheduled,omitempty"`
+		Interval          uint8  `json:"interval,omitempty"`
+		Limit             uint64 `json:"limit,omitempty"`
+	}
+	BatchSendEmailTask {
+		Id                int64  `json:"id"`
+		Subject           string `json:"subject"`
+		Content           string `json:"content"`
+		Recipients        string `json:"recipients"`
+		Scope             int8   `json:"scope"`
+		RegisterStartTime int64  `json:"register_start_time"`
+		RegisterEndTime   int64  `json:"register_end_time"`
+		Additional        string `json:"additional"`
+		Scheduled         int64  `json:"scheduled"`
+		Interval          uint8  `json:"interval"`
+		Limit             uint64 `json:"limit"`
+		Status            uint8  `json:"status"`
+		Errors            string `json:"errors"`
+		Total             uint64 `json:"total"`
+		Current           uint64 `json:"current"`
+		CreatedAt         int64  `json:"created_at"`
+		UpdatedAt         int64  `json:"updated_at"`
+	}
+	GetBatchSendEmailTaskListRequest {
+		Page   int    `form:"page"`
+		Size   int    `form:"size"`
+		Scope  *int8  `form:"scope,omitempty"`
+		Status *uint8 `form:"status,omitempty"`
+	}
+	GetBatchSendEmailTaskListResponse {
+		Total int64                `json:"total"`
+		List  []BatchSendEmailTask `json:"list"`
+	}
+	StopBatchSendEmailTaskRequest {
+		Id int64 `json:"id"`
+	}
+	GetPreSendEmailCountRequest {
+		Scope             int8  `json:"scope"`
+		RegisterStartTime int64 `json:"register_start_time,omitempty"`
+		RegisterEndTime   int64 `json:"register_end_time,omitempty"`
+	}
+	GetPreSendEmailCountResponse {
+		Count int64 `json:"count"`
+	}
+	GetBatchSendEmailTaskStatusRequest {
+		Id int64 `json:"id"`
+	}
+	GetBatchSendEmailTaskStatusResponse {
+		Status  uint8  `json:"status"`
+		Current int64  `json:"current"`
+		Total   int64  `json:"total"`
+		Errors  string `json:"errors"`
+	}
+	CreateQuotaTaskRequest {
+		Subscribers  []int64 `json:"subscribers"`
+		IsActive     *bool   `json:"is_active"`
+		StartTime    int64   `json:"start_time"`
+		EndTime      int64   `json:"end_time"`
+		ResetTraffic bool    `json:"reset_traffic"`
+		Days         uint64  `json:"days"`
+		GiftType     uint8   `json:"gift_type"`
+		GiftValue    uint64  `json:"gift_value"`
+	}
+	QuotaTask {
+		Id           int64   `json:"id"`
+		Subscribers  []int64 `json:"subscribers"`
+		IsActive     *bool   `json:"is_active"`
+		StartTime    int64   `json:"start_time"`
+		EndTime      int64   `json:"end_time"`
+		ResetTraffic bool    `json:"reset_traffic"`
+		Days         uint64  `json:"days"`
+		GiftType     uint8   `json:"gift_type"`
+		GiftValue    uint64  `json:"gift_value"`
+		Objects      []int64 `json:"objects"` // UserSubscribe IDs
+		Status       uint8   `json:"status"`
+		Total        int64   `json:"total"`
+		Current      int64   `json:"current"`
+		Errors       string  `json:"errors"`
+		CreatedAt    int64   `json:"created_at"`
+		UpdatedAt    int64   `json:"updated_at"`
+	}
+	QueryQuotaTaskPreCountRequest {
+		Subscribers []int64 `json:"subscribers"`
+		IsActive    *bool   `json:"is_active"`
+		StartTime   int64   `json:"start_time"`
+		EndTime     int64   `json:"end_time"`
+	}
+	QueryQuotaTaskPreCountResponse {
+		Count int64 `json:"count"`
+	}
+	QueryQuotaTaskListRequest {
+		Page   int    `form:"page"`
+		Size   int    `form:"size"`
+		Status *uint8 `form:"status,omitempty"`
+	}
+	QueryQuotaTaskListResponse {
+		Total int64       `json:"total"`
+		List  []QuotaTask `json:"list"`
+	}
+	QueryQuotaTaskStatusRequest {
+		Id int64 `json:"id"`
+	}
+	QueryQuotaTaskStatusResponse {
+		Status  uint8  `json:"status"`
+		Current int64  `json:"current"`
+		Total   int64  `json:"total"`
+		Errors  string `json:"errors"`
+	}
+)
+
+@server (
+	prefix:     v1/admin/marketing
+	group:      admin/marketing
+	middleware: AuthMiddleware
+)
+service ppanel {
+	@doc "Create a batch send email task"
+	@handler CreateBatchSendEmailTask
+	post /email/batch/send (CreateBatchSendEmailTaskRequest)
+
+	@doc "Get batch send email task list"
+	@handler GetBatchSendEmailTaskList
+	get /email/batch/list (GetBatchSendEmailTaskListRequest) returns (GetBatchSendEmailTaskListResponse)
+
+	@doc "Stop a batch send email task"
+	@handler StopBatchSendEmailTask
+	post /email/batch/stop (StopBatchSendEmailTaskRequest)
+
+	@doc "Get pre-send email count"
+	@handler GetPreSendEmailCount
+	post /email/batch/pre-send-count (GetPreSendEmailCountRequest) returns (GetPreSendEmailCountResponse)
+
+	@doc "Get batch send email task status"
+	@handler GetBatchSendEmailTaskStatus
+	post /email/batch/status (GetBatchSendEmailTaskStatusRequest) returns (GetBatchSendEmailTaskStatusResponse)
+
+	@doc "Create a quota task"
+	@handler CreateQuotaTask
+	post /quota/create (CreateQuotaTaskRequest)
+
+	@doc "Query quota task pre-count"
+	@handler QueryQuotaTaskPreCount
+	post /quota/pre-count (QueryQuotaTaskPreCountRequest) returns (QueryQuotaTaskPreCountResponse)
+
+	@doc "Query quota task list"
+	@handler QueryQuotaTaskList
+	get /quota/list (QueryQuotaTaskListRequest) returns (QueryQuotaTaskListResponse)
+}
+

apis/admin/server.api

@@ -11,108 +11,134 @@ info (
 import "../types.api"
 
 type (
-	GetNodeServerListRequest {
-		Page    int    `form:"page" validate:"required"`
-		Size    int    `form:"size" validate:"required"`
-		Tags    string `form:"tags,omitempty"`
-		GroupId int64  `form:"group_id,omitempty"`
-		Search  string `form:"search,omitempty"`
+	ServerOnlineIP {
+		IP       string `json:"ip"`
+		Protocol string `json:"protocol"`
 	}
-	GetNodeServerListResponse {
+	ServerOnlineUser {
+		IP          []ServerOnlineIP `json:"ip"`
+		UserId      int64            `json:"user_id"`
+		Subscribe   string           `json:"subscribe"`
+		SubscribeId int64            `json:"subscribe_id"`
+		Traffic     int64            `json:"traffic"`
+		ExpiredAt   int64            `json:"expired_at"`
+	}
+	ServerStatus {
+		Cpu      float64            `json:"cpu"`
+		Mem      float64            `json:"mem"`
+		Disk     float64            `json:"disk"`
+		Protocol string             `json:"protocol"`
+		Online   []ServerOnlineUser `json:"online"`
+		Status   string             `json:"status"`
+	}
+	Server {
+		Id             int64        `json:"id"`
+		Name           string       `json:"name"`
+		Country        string       `json:"country"`
+		City           string       `json:"city"`
+		Address        string       `json:"address"`
+		Sort           int          `json:"sort"`
+		Protocols      []Protocol   `json:"protocols"`
+		LastReportedAt int64        `json:"last_reported_at"`
+		Status         ServerStatus `json:"status"`
+		CreatedAt      int64        `json:"created_at"`
+		UpdatedAt      int64        `json:"updated_at"`
+	}
+	CreateServerRequest {
+		Name      string     `json:"name"`
+		Country   string     `json:"country,omitempty"`
+		City      string     `json:"city,omitempty"`
+		Address   string     `json:"address"`
+		Sort      int        `json:"sort,omitempty"`
+		Protocols []Protocol `json:"protocols"`
+	}
+	UpdateServerRequest {
+		Id        int64      `json:"id"`
+		Name      string     `json:"name"`
+		Country   string     `json:"country,omitempty"`
+		City      string     `json:"city,omitempty"`
+		Address   string     `json:"address"`
+		Sort      int        `json:"sort,omitempty"`
+		Protocols []Protocol `json:"protocols"`
+	}
+	DeleteServerRequest {
+		Id int64 `json:"id"`
+	}
+	FilterServerListRequest {
+		Page   int    `form:"page"`
+		Size   int    `form:"size"`
+		Search string `form:"search,omitempty"`
+	}
+	FilterServerListResponse {
 		Total int64    `json:"total"`
 		List  []Server `json:"list"`
 	}
-	UpdateNodeRequest {
-		Id           int64       `json:"id" validate:"required"`
-		Tags         []string    `json:"tags"`
-		Country      string      `json:"country"`
-		City         string      `json:"city"`
-		Name         string      `json:"name" validate:"required"`
-		ServerAddr   string      `json:"server_addr" validate:"required"`
-		RelayMode    string      `json:"relay_mode"`
-		RelayNode    []NodeRelay `json:"relay_node"`
-		SpeedLimit   int         `json:"speed_limit"`
-		TrafficRatio float32     `json:"traffic_ratio"`
-		GroupId      int64       `json:"group_id"`
-		Protocol     string      `json:"protocol" validate:"required"`
-		Config       interface{} `json:"config" validate:"required"`
-		Enable       *bool       `json:"enable"`
-		Sort         int64       `json:"sort"`
+	GetServerProtocolsRequest {
+		Id int64 `form:"id"`
+	}
+	GetServerProtocolsResponse {
+		Protocols []Protocol `json:"protocols"`
+	}
+	Node {
+		Id        int64    `json:"id"`
+		Name      string   `json:"name"`
+		Tags      []string `json:"tags"`
+		Port      uint16   `json:"port"`
+		Address   string   `json:"address"`
+		ServerId  int64    `json:"server_id"`
+		Protocol  string   `json:"protocol"`
+		Enabled   *bool    `json:"enabled"`
+		Sort      int      `json:"sort,omitempty"`
+		CreatedAt int64    `json:"created_at"`
+		UpdatedAt int64    `json:"updated_at"`
 	}
 	CreateNodeRequest {
-		Name         string      `json:"name" validate:"required"`
-		Tags         []string    `json:"tags"`
-		Country      string      `json:"country"`
-		City         string      `json:"city"`
-		ServerAddr   string      `json:"server_addr" validate:"required"`
-		RelayMode    string      `json:"relay_mode"`
-		RelayNode    []NodeRelay `json:"relay_node"`
-		SpeedLimit   int         `json:"speed_limit"`
-		TrafficRatio float32     `json:"traffic_ratio"`
-		GroupId      int64       `json:"group_id"`
-		Protocol     string      `json:"protocol" validate:"required"`
-		Config       interface{} `json:"config" validate:"required"`
-		Enable       *bool       `json:"enable"`
-		Sort         int64       `json:"sort"`
+		Name     string   `json:"name"`
+		Tags     []string `json:"tags,omitempty"`
+		Port     uint16   `json:"port"`
+		Address  string   `json:"address"`
+		ServerId int64    `json:"server_id"`
+		Protocol string   `json:"protocol"`
+		Enabled  *bool    `json:"enabled"`
+	}
+	UpdateNodeRequest {
+		Id       int64    `json:"id"`
+		Name     string   `json:"name"`
+		Tags     []string `json:"tags,omitempty"`
+		Port     uint16   `json:"port"`
+		Address  string   `json:"address"`
+		ServerId int64    `json:"server_id"`
+		Protocol string   `json:"protocol"`
+		Enabled  *bool    `json:"enabled"`
+	}
+	ToggleNodeStatusRequest {
+		Id     int64 `json:"id"`
+		Enable *bool `json:"enable"`
 	}
 	DeleteNodeRequest {
-		Id int64 `json:"id" validate:"required"`
+		Id int64 `json:"id"`
 	}
-	GetNodeGroupListResponse {
-		Total int64         `json:"total"`
-		List  []ServerGroup `json:"list"`
+	FilterNodeListRequest {
+		Page   int    `form:"page"`
+		Size   int    `form:"size"`
+		Search string `form:"search,omitempty"`
 	}
-	CreateNodeGroupRequest {
-		Name        string `json:"name" validate:"required"`
-		Description string `json:"description"`
+	FilterNodeListResponse {
+		Total int64  `json:"total"`
+		List  []Node `json:"list"`
 	}
-	UpdateNodeGroupRequest {
-		Id          int64  `json:"id" validate:"required"`
-		Name        string `json:"name" validate:"required"`
-		Description string `json:"description"`
+	HasMigrateSeverNodeResponse {
+		HasMigrate bool `json:"has_migrate"`
 	}
-	DeleteNodeGroupRequest {
-		Id int64 `json:"id" validate:"required"`
+	MigrateServerNodeResponse {
+		Succee  uint64 `json:"succee"`
+		Fail    uint64 `json:"fail"`
+		Message string `json:"message,omitempty"`
 	}
-	BatchDeleteNodeRequest {
-		Ids []int64 `json:"ids" validate:"required"`
-	}
-	BatchDeleteNodeGroupRequest {
-		Ids []int64 `json:"ids" validate:"required"`
-	}
-	GetNodeDetailRequest {
-		Id int64 `form:"id" validate:"required"`
-	}
-	NodeSortRequest {
+	ResetSortRequest {
 		Sort []SortItem `json:"sort"`
 	}
-	CreateRuleGroupRequest {
-		Name   string   `json:"name" validate:"required"`
-		Icon   string   `json:"icon"`
-		Type   string   `json:"type"`
-		Tags   []string `json:"tags"`
-		Rules  string   `json:"rules"`
-		Default bool    `json:"default"`
-		Enable bool     `json:"enable"`
-	}
-	UpdateRuleGroupRequest {
-		Id     int64    `json:"id" validate:"required"`
-		Icon   string   `json:"icon"`
-		Type   string   `json:"type"`
-		Name   string   `json:"name" validate:"required"`
-		Tags   []string `json:"tags"`
-		Rules  string   `json:"rules"`
-		Default bool    `json:"default"`
-		Enable bool     `json:"enable"`
-	}
-	DeleteRuleGroupRequest {
-		Id int64 `json:"id" validate:"required"`
-	}
-	GetRuleGroupResponse {
-		Total int64             `json:"total"`
-		List  []ServerRuleGroup `json:"list"`
-	}
-	GetNodeTagListResponse {
+	QueryNodeTagResponse {
 		Tags []string `json:"tags"`
 	}
 )
@@ -123,72 +149,64 @@ type (
 	middleware: AuthMiddleware
 )
 service ppanel {
-	@doc "Get node tag list"
-	@handler GetNodeTagList
-	get /tag/list returns (GetNodeTagListResponse)
+	@doc "Create Server"
+	@handler CreateServer
+	post /create (CreateServerRequest)
 
-	@doc "Get node list"
-	@handler GetNodeList
-	get /list (GetNodeServerListRequest) returns (GetNodeServerListResponse)
+	@doc "Update Server"
+	@handler UpdateServer
+	post /update (UpdateServerRequest)
 
-	@doc "Get node detail"
-	@handler GetNodeDetail
-	get /detail (GetNodeDetailRequest) returns (Server)
+	@doc "Delete Server"
+	@handler DeleteServer
+	post /delete (DeleteServerRequest)
 
-	@doc "Update node"
-	@handler UpdateNode
-	put / (UpdateNodeRequest)
+	@doc "Filter Server List"
+	@handler FilterServerList
+	get /list (FilterServerListRequest) returns (FilterServerListResponse)
 
-	@doc "Create node"
+	@doc "Get Server Protocols"
+	@handler GetServerProtocols
+	get /protocols (GetServerProtocolsRequest) returns (GetServerProtocolsResponse)
+
+	@doc "Create Node"
 	@handler CreateNode
-	post / (CreateNodeRequest)
+	post /node/create (CreateNodeRequest)
 
-	@doc "Delete node"
+	@doc "Update Node"
+	@handler UpdateNode
+	post /node/update (UpdateNodeRequest)
+
+	@doc "Delete Node"
 	@handler DeleteNode
-	delete / (DeleteNodeRequest)
+	post /node/delete (DeleteNodeRequest)
 
-	@doc "Batch delete node"
-	@handler BatchDeleteNode
-	delete /batch (BatchDeleteNodeRequest)
+	@doc "Filter Node List"
+	@handler FilterNodeList
+	get /node/list (FilterNodeListRequest) returns (FilterNodeListResponse)
 
-	@doc "Get node group list"
-	@handler GetNodeGroupList
-	get /group/list returns (GetNodeGroupListResponse)
+	@doc "Toggle Node Status"
+	@handler ToggleNodeStatus
+	post /node/status/toggle (ToggleNodeStatusRequest)
 
-	@doc "Create node group"
-	@handler CreateNodeGroup
-	post /group (CreateNodeGroupRequest)
+	@doc "Check if there is any server or node to migrate"
+	@handler HasMigrateSeverNode
+	get /migrate/has returns (HasMigrateSeverNodeResponse)
 
-	@doc "Update node group"
-	@handler UpdateNodeGroup
-	put /group (UpdateNodeGroupRequest)
+	@doc "Migrate server and node data to new database"
+	@handler MigrateServerNode
+	post /migrate/run returns (MigrateServerNodeResponse)
 
-	@doc "Delete node group"
-	@handler DeleteNodeGroup
-	delete /group (DeleteNodeGroupRequest)
+	@doc "Reset server sort"
+	@handler ResetSortWithServer
+	post /server/sort (ResetSortRequest)
 
-	@doc "Batch delete node group"
-	@handler BatchDeleteNodeGroup
-	delete /group/batch (BatchDeleteNodeGroupRequest)
+	@doc "Reset node sort"
+	@handler ResetSortWithNode
+	post /node/sort (ResetSortRequest)
 
-	@doc "Node sort "
-	@handler NodeSort
-	post /sort (NodeSortRequest)
-
-	@doc "Create rule group"
-	@handler CreateRuleGroup
-	post /rule_group (CreateRuleGroupRequest)
-
-	@doc "Update rule group"
-	@handler UpdateRuleGroup
-	put /rule_group (UpdateRuleGroupRequest)
-
-	@doc "Delete rule group"
-	@handler DeleteRuleGroup
-	delete /rule_group (DeleteRuleGroupRequest)
-
-	@doc "Get rule group list"
-	@handler GetRuleGroupList
-	get /rule_group_list returns (GetRuleGroupResponse)
+	@doc "Query all node tags"
+	@handler QueryNodeTag
+	get /node/tags returns (QueryNodeTagResponse)
 }
 

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,9 +46,8 @@ type (
 		SpeedLimit     int64               `json:"speed_limit"`
 		DeviceLimit    int64               `json:"device_limit"`
 		Quota          int64               `json:"quota"`
-		GroupId        int64               `json:"group_id"`
-		ServerGroup    []int64             `json:"server_group"`
-		Server         []int64             `json:"server"`
+		Nodes          []int64             `json:"nodes"`
+		NodeTags       []string            `json:"node_tags"`
 		Show           *bool               `json:"show"`
 		Sell           *bool               `json:"sell"`
 		DeductionRatio int64               `json:"deduction_ratio"`
@@ -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,9 +69,8 @@ type (
 		SpeedLimit     int64               `json:"speed_limit"`
 		DeviceLimit    int64               `json:"device_limit"`
 		Quota          int64               `json:"quota"`
-		GroupId        int64               `json:"group_id"`
-		ServerGroup    []int64             `json:"server_group"`
-		Server         []int64             `json:"server"`
+		Nodes          []int64             `json:"nodes"`
+		NodeTags       []string            `json:"node_tags"`
 		Show           *bool               `json:"show"`
 		Sell           *bool               `json:"sell"`
 		Sort           int64               `json:"sort"`
@@ -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

@@ -11,50 +11,6 @@ info (
 import "../types.api"
 
 type (
-	// Update application request
-	UpdateApplicationRequest {
-		Id            int64               `json:"id" validate:"required"`
-		Icon          string              `json:"icon"`
-		Name          string              `json:"name"`
-		Description   string              `json:"description"`
-		SubscribeType string              `json:"subscribe_type"`
-		Platform      ApplicationPlatform `json:"platform"`
-	}
-	// Create application request
-	CreateApplicationRequest {
-		Icon          string              `json:"icon"`
-		Name          string              `json:"name"`
-		Description   string              `json:"description"`
-		SubscribeType string              `json:"subscribe_type"`
-		Platform      ApplicationPlatform `json:"platform"`
-	}
-	// Update application request
-	UpdateApplicationVersionRequest {
-		Id            int64  `json:"id" validate:"required"`
-		Url           string `json:"url"`
-		Version       string `json:"version" validate:"required"`
-		Description   string `json:"description"`
-		Platform      string `json:"platform" validate:"required,oneof=windows mac linux android ios harmony"`
-		IsDefault     bool   `json:"is_default"`
-		ApplicationId int64  `json:"application_id" validate:"required"`
-	}
-	// Create application request
-	CreateApplicationVersionRequest {
-		Url           string `json:"url"`
-		Version       string `json:"version" validate:"required"`
-		Description   string `json:"description"`
-		Platform      string `json:"platform" validate:"required,oneof=windows mac linux android ios harmony"`
-		IsDefault     bool   `json:"is_default"`
-		ApplicationId int64  `json:"application_id" validate:"required"`
-	}
-	// Delete application request
-	DeleteApplicationRequest {
-		Id int64 `json:"id" validate:"required"`
-	}
-	// Delete application request
-	DeleteApplicationVersionRequest {
-		Id int64 `json:"id" validate:"required"`
-	}
 	GetNodeMultiplierResponse {
 		Periods []TimePeriod `json:"periods"`
 	}
@@ -62,6 +18,10 @@ type (
 	SetNodeMultiplierRequest {
 		Periods []TimePeriod `json:"periods"`
 	}
+	PreViewNodeMultiplierResponse {
+		CurrentTime string `json:"current_time"`
+		Ratio float32 `json:"ratio"`
+	}
 )
 
 @server (
@@ -86,46 +46,6 @@ service ppanel {
 	@handler UpdateSubscribeConfig
 	put /subscribe_config (SubscribeConfig)
 
-	@doc "Get subscribe type"
-	@handler GetSubscribeType
-	get /subscribe_type returns (SubscribeType)
-
-	@doc "update application config"
-	@handler UpdateApplicationConfig
-	put /application_config (ApplicationConfig)
-
-	@doc "get application config"
-	@handler GetApplicationConfig
-	get /application_config returns (ApplicationConfig)
-
-	@doc "Get application"
-	@handler GetApplication
-	get /application returns (ApplicationResponse)
-
-	@doc "Update application"
-	@handler UpdateApplication
-	put /application (UpdateApplicationRequest)
-
-	@doc "Create application"
-	@handler CreateApplication
-	post /application (CreateApplicationRequest)
-
-	@doc "Delete application"
-	@handler DeleteApplication
-	delete /application (DeleteApplicationRequest)
-
-	@doc "Update application version"
-	@handler UpdateApplicationVersion
-	put /application_version (UpdateApplicationVersionRequest)
-
-	@doc "Create application version"
-	@handler CreateApplicationVersion
-	post /application_version (CreateApplicationVersionRequest)
-
-	@doc "Delete application"
-	@handler DeleteApplicationVersion
-	delete /application_version (DeleteApplicationVersionRequest)
-
 	@doc "Get register config"
 	@handler GetRegisterConfig
 	get /register_config returns (RegisterConfig)
@@ -201,5 +121,9 @@ service ppanel {
 	@doc "Update Verify Code Config"
 	@handler UpdateVerifyCodeConfig
 	put /verify_code_config (VerifyCodeConfig)
+
+	@doc "PreView Node Multiplier"
+	@handler PreViewNodeMultiplier
+	get /node_multiplier/preview returns (PreViewNodeMultiplierResponse)
 }
 

apis/admin/tool.api

@@ -14,6 +14,9 @@ type (
 	LogResponse {
 		List interface{} `json:"list"`
 	}
+	VersionResponse {
+		Version string `json:"version"`
+	}
 )
 
 @server (
@@ -29,5 +32,9 @@ service ppanel {
 	@doc "Restart System"
 	@handler RestartSystem
 	get /restart
+
+	@doc "Get Version"
+	@handler GetVersion
+	get /version returns (VersionResponse)
 }
 

apis/admin/user.api

@@ -32,18 +32,19 @@ type (
 		Id int64 `form:"id" validate:"required"`
 	}
 	UpdateUserBasiceInfoRequest {
-		UserId     int64  `json:"user_id" validate:"required"`
-		Password   string `json:"password"`
-		Avatar     string `json:"avatar"`
-		Balance    int64  `json:"balance"`
-		Commission int64  `json:"commission"`
-		GiftAmount int64  `json:"gift_amount"`
-		Telegram   int64  `json:"telegram"`
-		ReferCode  string `json:"refer_code"`
-		RefererId  int64  `json:"referer_id"`
-		Remark     string `json:"remark"`
-		Enable     bool   `json:"enable"`
-		IsAdmin    bool   `json:"is_admin"`
+		UserId             int64  `json:"user_id" validate:"required"`
+		Password           string `json:"password"`
+		Avatar             string `json:"avatar"`
+		Balance            int64  `json:"balance"`
+		Commission         int64  `json:"commission"`
+		ReferralPercentage uint8  `json:"referral_percentage"`
+		OnlyFirstPurchase  bool   `json:"only_first_purchase"`
+		GiftAmount         int64  `json:"gift_amount"`
+		Telegram           int64  `json:"telegram"`
+		ReferCode          string `json:"refer_code"`
+		RefererId          int64  `json:"referer_id"`
+		Enable             bool   `json:"enable"`
+		IsAdmin            bool   `json:"is_admin"`
 	}
 	UpdateUserNotifySettingRequest {
 		UserId                int64 `json:"user_id" validate:"required"`
@@ -53,18 +54,20 @@ type (
 		EnableTradeNotify     bool  `json:"enable_trade_notify"`
 	}
 	CreateUserRequest {
-		Email             string `json:"email"`
-		Telephone         string `json:"telephone"`
-		TelephoneAreaCode string `json:"telephone_area_code"`
-		Password          string `json:"password"`
-		ProductId         int64  `json:"product_id"`
-		Duration          int64  `json:"duration"`
-		RefererUser       string `json:"referer_user"`
-		ReferCode         string `json:"refer_code"`
-		Balance           int64  `json:"balance"`
-		Commission        int64  `json:"commission"`
-		GiftAmount        int64  `json:"gift_amount"`
-		IsAdmin           bool   `json:"is_admin"`
+		Email              string `json:"email"`
+		Telephone          string `json:"telephone"`
+		TelephoneAreaCode  string `json:"telephone_area_code"`
+		Password           string `json:"password"`
+		ProductId          int64  `json:"product_id"`
+		Duration           int64  `json:"duration"`
+		ReferralPercentage uint8  `json:"referral_percentage"`
+		OnlyFirstPurchase  bool   `json:"only_first_purchase"`
+		RefererUser        string `json:"referer_user"`
+		ReferCode          string `json:"refer_code"`
+		Balance            int64  `json:"balance"`
+		Commission         int64  `json:"commission"`
+		GiftAmount         int64  `json:"gift_amount"`
+		IsAdmin            bool   `json:"is_admin"`
 	}
 	UserSubscribeDetail {
 		Id          int64     `json:"id"`
@@ -165,6 +168,15 @@ type (
 		List  []UserLoginLog `json:"list"`
 		Total int64          `json:"total"`
 	}
+	GetUserSubscribeResetTrafficLogsRequest {
+		Page            int   `form:"page"`
+		Size            int   `form:"size"`
+		UserSubscribeId int64 `form:"user_subscribe_id"`
+	}
+	GetUserSubscribeResetTrafficLogsResponse {
+		List  []ResetSubscribeTrafficLog `json:"list"`
+		Total int64                      `json:"total"`
+	}
 	DeleteUserSubscribeRequest {
 		UserSubscribeId int64 `json:"user_subscribe_id"`
 	}
@@ -252,6 +264,10 @@ service ppanel {
 	@handler GetUserSubscribeLogs
 	get /subscribe/logs (GetUserSubscribeLogsRequest) returns (GetUserSubscribeLogsResponse)
 
+	@doc "Get user subcribe reset traffic logs"
+	@handler GetUserSubscribeResetTrafficLogs
+	get /subscribe/reset/logs (GetUserSubscribeResetTrafficLogsRequest) returns (GetUserSubscribeResetTrafficLogsResponse)
+
 	@doc "Get user subcribe traffic logs"
 	@handler GetUserSubscribeTrafficLogs
 	get /subscribe/traffic_logs (GetUserSubscribeTrafficLogsRequest) returns (GetUserSubscribeTrafficLogsResponse)

apis/app/announcement.api

@@ -1,23 +0,0 @@
-syntax = "v1"
-
-info (
-	title:   "Announcement API"
-	desc:    "API for ppanel"
-	author:  "Tension"
-	email:   "tension@ppanel.com"
-	version: "0.0.1"
-)
-
-import "../types.api"
-
-@server (
-	prefix:     v1/app/announcement
-	group:      app/announcement
-	middleware: AppMiddleware,AuthMiddleware
-)
-service ppanel {
-	@doc "Query announcement"
-	@handler QueryAnnouncement
-	get /list (QueryAnnouncementRequest) returns (QueryAnnouncementResponse)
-}
-

apis/app/auth.api

@@ -1,104 +0,0 @@
-syntax = "v1"
-
-info (
-	title:   "App Auth Api"
-	desc:    "API for ppanel"
-	author:  "Tension"
-	email:   "tension@ppanel.com"
-	version: "0.0.1"
-)
-
-import (
-	"../types.api"
-)
-
-type (
-	AppAuthCheckRequest {
-		Method     string `json:"method" validate:"required" validate:"required,oneof=device email mobile"`
-		Account    string `json:"account"`
-		Identifier string `json:"identifier" validate:"required"`
-		UserAgent  string `json:"user_agent" validate:"required,oneof=windows mac linux android ios harmony"`
-		AreaCode   string `json:"area_code"`
-	}
-	AppAuthCheckResponse {
-		Status bool
-	}
-	AppAuthRequest {
-		Method     string `json:"method" validate:"required" validate:"required,oneof=device email mobile"`
-		Account    string `json:"account"`
-		Password   string `json:"password"`
-		Identifier string `json:"identifier" validate:"required"`
-		UserAgent  string `json:"user_agent" validate:"required,oneof=windows mac linux android ios harmony"`
-		Code       string `json:"code"`
-		Invite     string `json:"invite"`
-		AreaCode   string `json:"area_code"`
-		CfToken    string `json:"cf_token,optional"`
-	}
-	AppAuthRespone {
-		Token string `json:"token"`
-	}
-	AppSendCodeRequest {
-		Method   string `json:"method" validate:"required" validate:"required,oneof=email mobile"`
-		Account  string `json:"account"`
-		AreaCode string `json:"area_code"`
-		CfToken  string `json:"cf_token,optional"`
-	}
-	AppSendCodeRespone {
-		Status bool   `json:"status"`
-		Code   string `json:"code,omitempty"`
-	}
-	AppConfigRequest {
-		UserAgent string `json:"user_agent" validate:"required,oneof=windows mac linux android ios harmony"`
-	}
-	AppConfigResponse {
-		EncryptionKey          string   `json:"encryption_key"`
-		EncryptionMethod       string   `json:"encryption_method"`
-		Domains                []string `json:"domains"`
-		StartupPicture         string   `json:"startup_picture"`
-		StartupPictureSkipTime int64    `json:"startup_picture_skip_time"`
-		Application            AppInfo  `json:"applications"`
-		OfficialEmail          string   `json:"official_email"`
-		OfficialWebsite        string   `json:"official_website"`
-		OfficialTelegram       string   `json:"official_telegram"`
-		OfficialTelephone      string   `json:"official_telephone"`
-		InvitationLink         string   `json:"invitation_link"`
-		KrWebsiteId            string   `json:"kr_website_id"`
-	}
-	AppInfo {
-		Id                 int64  `json:"id"`
-		Name               string `json:"name"`
-		Description        string `json:"description"`
-		Url                string `json:"url"`
-		Version            string `json:"version"`
-		VersionDescription string `json:"version_description"`
-		IsDefault          bool   `json:"is_default"`
-	}
-)
-
-@server (
-	prefix:     v1/app/auth
-	group:      app/auth
-	middleware: AppMiddleware
-)
-service ppanel {
-	@doc "Check Account"
-	@handler Check
-	post /check (AppAuthCheckRequest) returns (AppAuthCheckResponse)
-
-	@doc "Login"
-	@handler Login
-	post /login (AppAuthRequest) returns (AppAuthRespone)
-
-	@doc "Register"
-	@handler Register
-	post /register (AppAuthRequest) returns (AppAuthRespone)
-
-	@doc "Reset Password"
-	@handler ResetPassword
-	post /reset_password (AppAuthRequest) returns (AppAuthRespone)
-
-	@doc "GetAppConfig"
-	@handler GetAppConfig
-	post /config (AppConfigRequest) returns (AppConfigResponse)
-}
-

apis/app/document.api

@@ -1,27 +0,0 @@
-syntax = "v1"
-
-info (
-	title:   "Document API"
-	desc:    "API for ppanel"
-	author:  "Tension"
-	email:   "tension@ppanel.com"
-	version: "0.0.1"
-)
-
-import "../types.api"
-
-@server (
-	prefix:     v1/app/document
-	group:      app/document
-	middleware: AppMiddleware,AuthMiddleware
-)
-service ppanel {
-	@doc "Get document list"
-	@handler QueryDocumentList
-	get /list returns (QueryDocumentListResponse)
-
-	@doc "Get document detail"
-	@handler QueryDocumentDetail
-	get /detail (QueryDocumentDetailRequest) returns (Document)
-}
-

apis/app/node.api

@@ -1,40 +0,0 @@
-syntax = "v1"
-
-info (
-	title:   "App Node Api"
-	desc:    "API for ppanel"
-	author:  "Tension"
-	email:   "tension@ppanel.com"
-	version: "0.0.1"
-)
-
-import "../types.api"
-
-type (
-	AppRuleGroupListResponse {
-		Total int64             `json:"total"`
-		List  []ServerRuleGroup `json:"list"`
-	}
-	AppUserSubscbribeNodeRequest {
-		Id int64 `form:"id"  validate:"required"`
-	}
-	AppUserSubscbribeNodeResponse {
-		List []AppUserSubscbribeNode `json:"list"`
-	}
-)
-
-@server (
-	prefix:     v1/app/node
-	group:      app/node
-	middleware: AppMiddleware,AuthMiddleware
-)
-service ppanel {
-	@doc "Get Node list"
-	@handler GetNodeList
-	get /list (AppUserSubscbribeNodeRequest) returns (AppUserSubscbribeNodeResponse)
-
-	@doc "Get rule group list"
-	@handler GetRuleGroupList
-	get /rule_group_list returns (AppRuleGroupListResponse)
-}
-

apis/app/order.api

@@ -1,57 +0,0 @@
-syntax = "v1"
-
-info (
-	title:   "Order API"
-	desc:    "API for ppanel"
-	author:  "Tension"
-	email:   "tension@ppanel.com"
-	version: "0.0.1"
-)
-
-import (
-	"../types.api"
-)
-
-@server (
-	prefix:     v1/app/order
-	group:      app/order
-	middleware: AppMiddleware,AuthMiddleware
-)
-service ppanel {
-	@doc "Pre create order"
-	@handler PreCreateOrder
-	post /pre (PurchaseOrderRequest) returns (PreOrderResponse)
-
-	@doc "purchase Subscription"
-	@handler Purchase
-	post /purchase (PurchaseOrderRequest) returns (PurchaseOrderResponse)
-
-	@doc "Renewal Subscription"
-	@handler Renewal
-	post /renewal (RenewalOrderRequest) returns (RenewalOrderResponse)
-
-	@doc "Reset traffic"
-	@handler ResetTraffic
-	post /reset (ResetTrafficOrderRequest) returns (ResetTrafficOrderResponse)
-
-	@doc "Recharge"
-	@handler Recharge
-	post /recharge (RechargeOrderRequest) returns (RechargeOrderResponse)
-
-	@doc "Checkout order"
-	@handler CheckoutOrder
-	post /checkout (CheckoutOrderRequest) returns (CheckoutOrderResponse)
-
-	@doc "Close order"
-	@handler CloseOrder
-	post /close (CloseOrderRequest)
-
-	@doc "Get order"
-	@handler QueryOrderDetail
-	get /detail (QueryOrderDetailRequest) returns (OrderDetail)
-
-	@doc "Get order list"
-	@handler QueryOrderList
-	get /list (QueryOrderListRequest) returns (QueryOrderListResponse)
-}
-

apis/app/payment.api

@@ -1,23 +0,0 @@
-syntax = "v1"
-
-info (
-	title:   "payment API"
-	desc:    "API for ppanel"
-	author:  "Tension"
-	email:   "tension@ppanel.com"
-	version: "0.0.1"
-)
-
-import "../types.api"
-
-@server (
-	prefix:     v1/app/payment
-	group:      app/payment
-	middleware: AppMiddleware,AuthMiddleware
-)
-service ppanel {
-	@doc "Get available payment methods"
-	@handler GetAvailablePaymentMethods
-	get /methods returns (GetAvailablePaymentMethodsResponse)
-}
-

apis/app/subscribe.api

@@ -1,65 +0,0 @@
-syntax = "v1"
-
-info (
-	title:   "Subscribe API"
-	desc:    "API for ppanel"
-	author:  "Tension"
-	email:   "tension@ppanel.com"
-	version: "0.0.1"
-)
-
-import "../types.api"
-
-type (
-	QueryUserSubscribeResp {
-		Data []UserSubscribeData `json:"data"`
-	}
-	UserSubscribeData {
-		SubscribeId     int64 `json:"subscribe_id"`
-		UserSubscribeId int64 `json:"user_subscribe_id"`
-	}
-	UserSubscribeResetPeriodRequest {
-		UserSubscribeId int64 `json:"user_subscribe_id"`
-	}
-	UserSubscribeResetPeriodResponse {
-		Status bool `json:"status"`
-	}
-	AppUserSubscribeRequest {
-		ContainsNodes *bool `form:"contains_nodes"`
-	}
-	AppUserSubscbribeResponse {
-		List []AppUserSubcbribe `json:"list"`
-	}
-)
-
-@server (
-	prefix:     v1/app/subscribe
-	group:      app/subscribe
-	middleware: AppMiddleware,AuthMiddleware
-)
-service ppanel {
-	@doc "Get subscribe list"
-	@handler QuerySubscribeList
-	get /list returns (QuerySubscribeListResponse)
-
-	@doc "Get subscribe group list"
-	@handler QuerySubscribeGroupList
-	get /group/list returns (QuerySubscribeGroupListResponse)
-
-	@doc "Get application config"
-	@handler QueryApplicationConfig
-	get /application/config returns (ApplicationResponse)
-
-	@doc "Get  Already subscribed to package"
-	@handler QueryUserAlreadySubscribe
-	get /user/already_subscribe returns (QueryUserSubscribeResp)
-
-	@doc "Get Available subscriptions for users"
-	@handler QueryUserAvailableUserSubscribe
-	get /user/available_subscribe (AppUserSubscribeRequest) returns (AppUserSubscbribeResponse)
-
-	@doc "Reset user subscription period"
-	@handler ResetUserSubscribePeriod
-	post /reset/period (UserSubscribeResetPeriodRequest) returns (UserSubscribeResetPeriodResponse)
-}
-

apis/app/user.api

@@ -1,86 +0,0 @@
-syntax = "v1"
-
-info (
-	title:   "App User Api"
-	desc:    "API for ppanel"
-	author:  "Tension"
-	email:   "tension@ppanel.com"
-	version: "0.0.1"
-)
-
-import (
-	"../types.api"
-)
-
-type (
-	UserInfoResponse {
-		Id          int64            `json:"id"`
-		Balance     int64            `json:"balance"`
-		Email       string           `json:"email"`
-		RefererId   int64            `json:"referer_id"`
-		ReferCode   string           `json:"refer_code"`
-		Avatar      string           `json:"avatar"`
-		AreaCode    string           `json:"area_code"`
-		Telephone   string           `json:"telephone"`
-		Devices     []UserDevice     `json:"devices"`
-		AuthMethods []UserAuthMethod `json:"auth_methods"`
-	}
-	UpdatePasswordRequeset {
-		Password    string `json:"password"`
-		NewPassword string `json:"new_password"`
-	}
-	DeleteAccountRequest {
-		Method string `json:"method" validate:"required" validate:"required,oneof=email telephone device"`
-		Code   string `json:"code"`
-	}
-	GetUserOnlineTimeStatisticsResponse {
-		WeeklyStats       []WeeklyStat      `json:"weekly_stats"`
-		ConnectionRecords ConnectionRecords `json:"connection_records"`
-	}
-	WeeklyStat {
-		Day     int     `json:"day"`
-		DayName string  `json:"day_name"`
-		Hours   float64 `json:"hours"`
-	}
-	ConnectionRecords {
-		CurrentContinuousDays   int64 `json:"current_continuous_days"`
-		HistoryContinuousDays   int64 `json:"history_continuous_days"`
-		LongestSingleConnection int64 `json:"longest_single_connection"`
-	}
-)
-
-@server (
-	prefix:     v1/app/user
-	group:      app/user
-	middleware: AppMiddleware,AuthMiddleware
-)
-service ppanel {
-	@doc "query user info"
-	@handler QueryUserInfo
-	get /info returns (UserInfoResponse)
-
-	@doc "Update Password "
-	@handler UpdatePassword
-	put /password (UpdatePasswordRequeset)
-
-	@doc "Delete Account"
-	@handler DeleteAccount
-	delete /account (DeleteAccountRequest)
-
-	@doc "Get user subcribe traffic logs"
-	@handler GetUserSubscribeTrafficLogs
-	get /subscribe/traffic_logs (GetUserSubscribeTrafficLogsRequest) returns (GetUserSubscribeTrafficLogsResponse)
-
-	@doc "Get user online time total"
-	@handler GetUserOnlineTimeStatistics
-	get /online_time/statistics returns (GetUserOnlineTimeStatisticsResponse)
-
-	@doc "Query User Affiliate List"
-	@handler QueryUserAffiliateList
-	get /affiliate/list (QueryUserAffiliateListRequest) returns (QueryUserAffiliateListResponse)
-
-	@doc "Query User Affiliate Count"
-	@handler QueryUserAffiliate
-	get /affiliate/count returns (QueryUserAffiliateCountResponse)
-}
-

apis/app/ws.api

@@ -1,21 +0,0 @@
-syntax = "v1"
-
-info (
-	title:   "App Heartbeat Api"
-	desc:    "API for ppanel"
-	author:  "Tension"
-	email:   "tension@ppanel.com"
-	version: "0.0.1"
-)
-
-@server (
-	prefix:     v1/app/ws
-	group:      app/ws
-	middleware: AuthMiddleware
-)
-service ppanel {
-	@doc "App heartbeat"
-	@handler AppWs
-	get /:userid/:identifier
-}
-

apis/auth/auth.api

@@ -65,6 +65,7 @@ type (
 		TelephoneAreaCode string `json:"telephone_area_code" validate:"required"`
 		Password          string `json:"password"`
 		IP                string `header:"X-Original-Forwarded-For"`
+		UserAgent         string `header:"User-Agent"`
 		CfToken           string `json:"cf_token,optional"`
 	}
 	// Check user is exist request
@@ -84,6 +85,7 @@ type (
 		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"`
 	}
 	// User login response
@@ -93,6 +95,7 @@ type (
 		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"`
 	}
 	AppleLoginCallbackRequest {

apis/common.api

@@ -35,10 +35,6 @@ type (
 	GetTosResponse {
 		TosContent string `json:"tos_content"`
 	}
-	GetAppcationResponse {
-		Config       ApplicationConfig         `json:"config"`
-		Applications []ApplicationResponseInfo `json:"applications"`
-	}
 	// GetCodeRequest Get code request
 	SendCodeRequest {
 		Email string `json:"email" validate:"required"`
@@ -78,6 +74,19 @@ type (
 	CheckVerificationCodeRespone {
 		Status bool `json:"status"`
 	}
+	SubscribeClient {
+		Id           int64        `json:"id"`
+		Name         string       `json:"name"`
+		Description  string       `json:"description,omitempty"`
+		Icon         string       `json:"icon,omitempty"`
+		Scheme       string       `json:"scheme,omitempty"`
+		IsDefault    bool         `json:"is_default"`
+		DownloadLink DownloadLink `json:"download_link,omitempty"`
+	}
+	GetSubscribeClientResponse {
+		Total int64             `json:"total"`
+		List  []SubscribeClient `json:"list"`
+	}
 )
 
 @server (
@@ -89,10 +98,6 @@ service ppanel {
 	@handler GetGlobalConfig
 	get /site/config returns (GetGlobalConfigResponse)
 
-	@doc "Get Tos Content"
-	@handler GetApplication
-	get /application returns (GetAppcationResponse)
-
 	@doc "Get Tos Content"
 	@handler GetTos
 	get /site/tos returns (GetTosResponse)
@@ -120,5 +125,9 @@ service ppanel {
 	@doc "Check verification code"
 	@handler CheckVerificationCode
 	post /check_verification_code (CheckVerificationCodeRequest) returns (CheckVerificationCodeRespone)
+
+	@doc "Get Client"
+	@handler GetClient
+	get /client returns (GetSubscribeClientResponse)
 }
 

apis/node/node.api

@@ -11,6 +11,10 @@ info (
 import "../types.api"
 
 type (
+	OnlineUser {
+		SID int64  `json:"uid"`
+		IP  string `json:"ip"`
+	}
 	ShadowsocksProtocol {
 		Port   int    `json:"port"`
 		Method string `json:"method"`
@@ -89,6 +93,20 @@ type (
 		ServerCommon
 		Users []OnlineUser `json:"users"`
 	}
+	QueryServerConfigRequest {
+		ServerID  int64    `path:"server_id"`
+		SecretKey string   `form:"secret_key"`
+		Protocols []string `form:"protocols,omitempty"`
+	}
+	QueryServerConfigResponse {
+		TrafficReportThreshold int64          `json:"traffic_report_threshold"`
+		IPStrategy             string         `json:"ip_strategy"`
+		DNS                    []NodeDNS      `json:"dns"`
+		Block                  []string       `json:"block"`
+		Outbound               []NodeOutbound `json:"outbound"`
+		Protocols              []Protocol     `json:"protocols"`
+		Total                  int64          `json:"total"`
+	}
 )
 
 @server (
@@ -118,3 +136,13 @@ service ppanel {
 	post /online (OnlineUsersRequest)
 }
 
+@server (
+	prefix: v2/server
+	group:  server
+)
+service ppanel {
+	@doc "Get Server Protocol Config"
+	@handler QueryServerProtocolConfig
+	get /:server_id (QueryServerConfigRequest) returns (QueryServerConfigResponse)
+}
+

apis/public/portal.api

@@ -25,6 +25,9 @@ type (
 	PortalPurchaseResponse {
 		OrderNo string `json:"order_no"`
 	}
+	GetSubscriptionRequest {
+		Language string `form:"language"`
+	}
 	GetSubscriptionResponse {
 		List []Subscribe `json:"list"`
 	}
@@ -75,7 +78,7 @@ service ppanel {
 
 	@doc "Get Subscription"
 	@handler GetSubscription
-	get /subscribe returns (GetSubscriptionResponse)
+	get /subscribe (GetSubscriptionRequest) returns (GetSubscriptionResponse)
 
 	@doc "Pre Purchase Order"
 	@handler PrePurchaseOrder

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,14 +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)
-
-	@doc "Get application config"
-	@handler QueryApplicationConfig
-	get /application/config returns (ApplicationResponse)
+	get /list (QuerySubscribeListRequest) returns (QuerySubscribeListResponse)
 }
 

apis/public/user.api

@@ -25,15 +25,8 @@ type (
 		Total int64           `json:"total"`
 	}
 	QueryUserBalanceLogListResponse {
-		List  []UserBalanceLog `json:"list"`
-		Total int64            `json:"total"`
-	}
-	CommissionLog {
-		Id        int64  `json:"id"`
-		UserId    int64  `json:"user_id"`
-		OrderNo   string `json:"order_no"`
-		Amount    int64  `json:"amount"`
-		CreatedAt int64  `json:"created_at"`
+		List  []BalanceLog `json:"list"`
+		Total int64        `json:"total"`
 	}
 	QueryUserCommissionLogListRequest {
 		Page int `form:"page"`

apis/swagger_admin.api

@@ -24,5 +24,7 @@ import (
 	"./admin/auth.api"
 	"./admin/log.api"
 	"./admin/ads.api"
+	"./admin/marketing.api"
+	"./admin/application.api"
 )
 

apis/swagger_app.api

@@ -1,22 +0,0 @@
-syntax = "v1"
-
-info (
-	title:   "App API"
-	desc:    "API for ppanel"
-	author:  "Tension"
-	email:   "tension@ppanel.com"
-	version: "0.0.1"
-)
-
-import (
-	"./app/auth.api"
-	"./app/user.api"
-	"./app/node.api"
-	"./app/ws.api"
-	"./app/order.api"
-	"./app/announcement.api"
-	"./app/payment.api"
-	"./app/document.api"
-	"./app/subscribe.api"
-)
-

apis/types.api

@@ -14,6 +14,8 @@ type (
 		Avatar                string           `json:"avatar"`
 		Balance               int64            `json:"balance"`
 		Commission            int64            `json:"commission"`
+		ReferralPercentage    uint8            `json:"referral_percentage"`
+		OnlyFirstPurchase     bool             `json:"only_first_purchase"`
 		GiftAmount            int64            `json:"gift_amount"`
 		Telegram              int64            `json:"telegram"`
 		ReferCode             string           `json:"refer_code"`
@@ -63,6 +65,8 @@ type (
 		SubscribePath   string `json:"subscribe_path"`
 		SubscribeDomain string `json:"subscribe_domain"`
 		PanDomain       bool   `json:"pan_domain"`
+		UserAgentLimit  bool   `json:"user_agent_limit"`
+		UserAgentList   string `json:"user_agent_list"`
 	}
 	VerifyCodeConfig {
 		VerifyCodeExpireTime int64 `json:"verify_code_expire_time"`
@@ -148,9 +152,27 @@ type (
 		EnableResetPasswordVerify bool   `json:"enable_reset_password_verify"`
 	}
 	NodeConfig {
-		NodeSecret       string `json:"node_secret"`
-		NodePullInterval int64  `json:"node_pull_interval"`
-		NodePushInterval int64  `json:"node_push_interval"`
+		NodeSecret             string         `json:"node_secret"`
+		NodePullInterval       int64          `json:"node_pull_interval"`
+		NodePushInterval       int64          `json:"node_push_interval"`
+		TrafficReportThreshold int64          `json:"traffic_report_threshold"`
+		IPStrategy             string         `json:"ip_strategy"`
+		DNS                    []NodeDNS      `json:"dns"`
+		Block                  []string       `json:"block"`
+		Outbound               []NodeOutbound `json:"outbound"`
+	}
+	NodeDNS {
+		Proto   string   `json:"proto"`
+		Address string   `json:"address"`
+		Domains []string `json:"domains"`
+	}
+	NodeOutbound {
+		Name     string   `json:"name"`
+		Protocol string   `json:"protocol"`
+		Address  string   `json:"address"`
+		Port     int64    `json:"port"`
+		Password string   `json:"password"`
+		Rules    []string `json:"rules"`
 	}
 	InviteConfig {
 		ForcedInvite                bool  `json:"forced_invite"`
@@ -182,6 +204,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"`
@@ -192,9 +215,8 @@ type (
 		SpeedLimit     int64               `json:"speed_limit"`
 		DeviceLimit    int64               `json:"device_limit"`
 		Quota          int64               `json:"quota"`
-		GroupId        int64               `json:"group_id"`
-		ServerGroup    []int64             `json:"server_group"`
-		Server         []int64             `json:"server"`
+		Nodes          []int64             `json:"nodes"`
+		NodeTags       []string            `json:"node_tags"`
 		Show           bool                `json:"show"`
 		Sell           bool                `json:"sell"`
 		Sort           int64               `json:"sort"`
@@ -273,37 +295,37 @@ type (
 		Host        string `json:"host"`
 		ServiceName string `json:"service_name"`
 	}
-	Server {
-		Id           int64       `json:"id"`
-		Tags         []string    `json:"tags"`
-		Country      string      `json:"country"`
-		City         string      `json:"city"`
-		Name         string      `json:"name"`
-		ServerAddr   string      `json:"server_addr"`
-		RelayMode    string      `json:"relay_mode"`
-		RelayNode    []NodeRelay `json:"relay_node"`
-		SpeedLimit   int         `json:"speed_limit"`
-		TrafficRatio float32     `json:"traffic_ratio"`
-		GroupId      int64       `json:"group_id"`
-		Protocol     string      `json:"protocol"`
-		Config       interface{} `json:"config"`
-		Enable       *bool       `json:"enable"`
-		CreatedAt    int64       `json:"created_at"`
-		UpdatedAt    int64       `json:"updated_at"`
-		Status       *NodeStatus `json:"status"`
-		Sort         int64       `json:"sort"`
-	}
-	OnlineUser {
-		SID int64  `json:"uid"`
-		IP  string `json:"ip"`
-	}
-	NodeStatus {
-		Online    interface{} `json:"online"`
-		Cpu       float64     `json:"cpu"`
-		Mem       float64     `json:"mem"`
-		Disk      float64     `json:"disk"`
-		UpdatedAt int64       `json:"updated_at"`
-	}
+	// Server {
+	//  Id           int64       `json:"id"`
+	//  Tags         []string    `json:"tags"`
+	//  Country      string      `json:"country"`
+	//  City         string      `json:"city"`
+	//  Name         string      `json:"name"`
+	//  ServerAddr   string      `json:"server_addr"`
+	//  RelayMode    string      `json:"relay_mode"`
+	//  RelayNode    []NodeRelay `json:"relay_node"`
+	//  SpeedLimit   int         `json:"speed_limit"`
+	//  TrafficRatio float32     `json:"traffic_ratio"`
+	//  GroupId      int64       `json:"group_id"`
+	//  Protocol     string      `json:"protocol"`
+	//  Config       interface{} `json:"config"`
+	//  Enable       *bool       `json:"enable"`
+	//  CreatedAt    int64       `json:"created_at"`
+	//  UpdatedAt    int64       `json:"updated_at"`
+	//  Status       *NodeStatus `json:"status"`
+	//  Sort         int64       `json:"sort"`
+	// }
+	// OnlineUser {
+	//  SID int64  `json:"uid"`
+	//  IP  string `json:"ip"`
+	// }
+	// NodeStatus {
+	//  Online    interface{} `json:"online"`
+	//  Cpu       float64     `json:"cpu"`
+	//  Mem       float64     `json:"mem"`
+	//  Disk      float64     `json:"disk"`
+	//  UpdatedAt int64       `json:"updated_at"`
+	// }
 	ServerGroup {
 		Id          int64  `json:"id"`
 		Name        string `json:"name"`
@@ -445,15 +467,6 @@ type (
 		CreatedAt   int64     `json:"created_at"`
 		UpdatedAt   int64     `json:"updated_at"`
 	}
-	UserBalanceLog {
-		Id        int64 `json:"id"`
-		UserId    int64 `json:"user_id"`
-		Amount    int64 `json:"amount"`
-		Type      uint8 `json:"type"`
-		OrderId   int64 `json:"order_id"`
-		Balance   int64 `json:"balance"`
-		CreatedAt int64 `json:"created_at"`
-	}
 	UserAffiliate {
 		Avatar       string `json:"avatar"`
 		Identifier   string `json:"identifier"`
@@ -474,14 +487,6 @@ type (
 		Port   int    `json:"port"`
 		Prefix string `json:"prefix"`
 	}
-	ApplicationConfig {
-		AppId                  int64    `json:"app_id"`
-		EncryptionKey          string   `json:"encryption_key"`
-		EncryptionMethod       string   `json:"encryption_method"`
-		Domains                []string `json:"domains" validate:"required"`
-		StartupPicture         string   `json:"startup_picture"`
-		StartupPictureSkipTime int64    `json:"startup_picture_skip_time"`
-	}
 	UserDevice {
 		Id         int64  `json:"id"`
 		Ip         string `json:"ip"`
@@ -516,7 +521,7 @@ type (
 		Id        int64    `json:"id"`
 		Icon      string   `json:"icon"`
 		Name      string   `json:"name" validate:"required"`
-		Type 	  string   `json:"type"`
+		Type      string   `json:"type"`
 		Tags      []string `json:"tags"`
 		Rules     string   `json:"rules"`
 		Enable    bool     `json:"enable"`
@@ -531,7 +536,7 @@ type (
 		Token           string `json:"token"`
 		IP              string `json:"ip"`
 		UserAgent       string `json:"user_agent"`
-		CreatedAt       int64  `json:"created_at"`
+		Timestamp       int64  `json:"timestamp"`
 	}
 	UserLoginLog {
 		Id        int64  `json:"id"`
@@ -539,18 +544,17 @@ type (
 		LoginIP   string `json:"login_ip"`
 		UserAgent string `json:"user_agent"`
 		Success   bool   `json:"success"`
-		CreatedAt int64  `json:"created_at"`
+		Timestamp int64  `json:"timestamp"`
 	}
 	MessageLog {
-		Id        int64  `json:"id"`
-		Type      string `json:"type"`
-		Platform  string `json:"platform"`
-		To        string `json:"to"`
-		Subject   string `json:"subject"`
-		Content   string `json:"content"`
-		Status    int    `json:"status"`
-		CreatedAt int64  `json:"created_at"`
-		UpdatedAt int64  `json:"updated_at"`
+		Id        int64       `json:"id"`
+		Type      uint8       `json:"type"`
+		Platform  string      `json:"platform"`
+		To        string      `json:"to"`
+		Subject   string      `json:"subject"`
+		Content   interface{} `json:"content"`
+		Status    uint8       `json:"status"`
+		CreatedAt int64       `json:"created_at"`
 	}
 	Ads {
 		Id          int    `json:"id"`
@@ -754,5 +758,84 @@ type (
 		CreatedAt    int64    `json:"created_at"`
 		Download     int64    `json:"download"`
 	}
+	DownloadLink {
+		IOS     string `json:"ios,omitempty"`
+		Android string `json:"android,omitempty"`
+		Windows string `json:"windows,omitempty"`
+		Mac     string `json:"mac,omitempty"`
+		Linux   string `json:"linux,omitempty"`
+		Harmony string `json:"harmony,omitempty"`
+	}
+	ResetSubscribeTrafficLog {
+		Id              int64  `json:"id"`
+		Type            uint16 `json:"type"`
+		UserSubscribeId int64  `json:"user_subscribe_id"`
+		OrderNo         string `json:"order_no,omitempty"`
+		Timestamp       int64  `json:"timestamp"`
+	}
+	BalanceLog {
+		Type      uint16 `json:"type"`
+		UserId    int64  `json:"user_id"`
+		Amount    int64  `json:"amount"`
+		OrderNo   string `json:"order_no,omitempty"`
+		Balance   int64  `json:"balance"`
+		Timestamp int64  `json:"timestamp"`
+	}
+	CommissionLog {
+		Type      uint16 `json:"type"`
+		UserId    int64  `json:"user_id"`
+		Amount    int64  `json:"amount"`
+		OrderNo   string `json:"order_no"`
+		Timestamp int64  `json:"timestamp"`
+	}
+	Protocol {
+		Type                    string  `json:"type"`
+		Port                    uint16  `json:"port"`
+		Enable                  bool    `json:"enable"`
+		Security                string  `json:"security,omitempty"`
+		SNI                     string  `json:"sni,omitempty"`
+		AllowInsecure           bool    `json:"allow_insecure,omitempty"`
+		Fingerprint             string  `json:"fingerprint,omitempty"`
+		RealityServerAddr       string  `json:"reality_server_addr,omitempty"`
+		RealityServerPort       int     `json:"reality_server_port,omitempty"`
+		RealityPrivateKey       string  `json:"reality_private_key,omitempty"`
+		RealityPublicKey        string  `json:"reality_public_key,omitempty"`
+		RealityShortId          string  `json:"reality_short_id,omitempty"`
+		Transport               string  `json:"transport,omitempty"`
+		Host                    string  `json:"host,omitempty"`
+		Path                    string  `json:"path,omitempty"`
+		ServiceName             string  `json:"service_name,omitempty"`
+		Cipher                  string  `json:"cipher,omitempty"`
+		ServerKey               string  `json:"server_key,omitempty"`
+		Flow                    string  `json:"flow,omitempty"`
+		HopPorts                string  `json:"hop_ports,omitempty"`
+		HopInterval             int     `json:"hop_interval,omitempty"`
+		ObfsPassword            string  `json:"obfs_password,omitempty"`
+		DisableSNI              bool    `json:"disable_sni,omitempty"`
+		ReduceRtt               bool    `json:"reduce_rtt,omitempty"`
+		UDPRelayMode            string  `json:"udp_relay_mode,omitempty"`
+		CongestionController    string  `json:"congestion_controller,omitempty"`
+		Multiplex               string  `json:"multiplex,omitempty"` // mux, eg: off/low/medium/high
+		PaddingScheme           string  `json:"padding_scheme,omitempty"` // padding scheme
+		UpMbps                  int     `json:"up_mbps,omitempty"` // upload speed limit
+		DownMbps                int     `json:"down_mbps,omitempty"` // download speed limit
+		Obfs                    string  `json:"obfs,omitempty"` // obfs, 'none', 'http', 'tls'
+		ObfsHost                string  `json:"obfs_host,omitempty"` // obfs host
+		ObfsPath                string  `json:"obfs_path,omitempty"` // obfs path
+		XhttpMode               string  `json:"xhttp_mode,omitempty"` // xhttp mode
+		XhttpExtra              string  `json:"xhttp_extra,omitempty"` // xhttp extra path
+		Encryption              string  `json:"encryption,omitempty"` // encryption，'none', 'mlkem768x25519plus'
+		EncryptionMode          string  `json:"encryption_mode,omitempty"` // encryption mode，'native', 'xorpub', 'random'
+		EncryptionRtt           string  `json:"encryption_rtt,omitempty"` // encryption rtt，'0rtt', '1rtt'
+		EncryptionTicket        string  `json:"encryption_ticket,omitempty"` // encryption ticket
+		EncryptionServerPadding string  `json:"encryption_server_padding,omitempty"` // encryption server padding
+		EncryptionPrivateKey    string  `json:"encryption_private_key,omitempty"` // encryption private key
+		EncryptionClientPadding string  `json:"encryption_client_padding,omitempty"` // encryption client padding
+		EncryptionPassword      string  `json:"encryption_password,omitempty"` // encryption password
+		Ratio                   float64 `json:"ratio,omitempty"` // Traffic ratio, default is 1
+		CertMode                string  `json:"cert_mode,omitempty"` // Certificate mode, `none`｜`http`｜`dns`｜`self`
+		CertDNSProvider         string  `json:"cert_dns_provider,omitempty"` // DNS provider for certificate
+		CertDNSEnv              string  `json:"cert_dns_env,omitempty"` // Environment for DNS provider
+	}
 )