Develop (#64)
* fix(database): correct name entry for SingBox in initialization script * fix(purchase): update gift amount deduction logic and handle zero-amount order status * feat: add type and default fields to rule group requests and update related logic * feat(rule): implement logic to set a default rule group during creation and update * fix(rule): add type and default fields to rule group model and update related logic * feat(proxy): enhance proxy group handling and sorting logic * refactor(proxy): replace hardcoded group names with constants for better maintainability * fix(proxy): update group selection logic to skip empty and default names * feat(proxy): enhance proxy and group handling with new configuration options * feat(surge): add Surge adapter support and enhance subscription URL handling * feat(traffic): implement traffic reset logic for subscription cycles * feat(auth): improve email and mobile config unmarshalling with default values * fix(auth) upbind email not update * fix(order) discount set default 1 * fix(order) discount set default 1 * fix: refactor surfboard proxy handling and enhance configuration template * fix(renewal) discount set default 1 * feat(loon): add Loon configuration template and enhance proxy handling * feat(subscription): update user subscription status based on expiration time * fix(renewal): update subscription retrieval method to use token instead of order ID * feat(order): enhance order processing logic with improved error handling and user subscription management * fix(order): improve code quality and fix critical bugs in order processing logic - Fix inconsistent logging calls across all order logic files - Fix critical gift amount deduction logic bug in renewal process - Fix variable shadowing errors in database transactions - Add comprehensive Go-standard documentation comments - Improve log prefix consistency for better debugging - Remove redundant discount validation code * fix(docker): add build argument for version in Docker image build process * feat(version): add endpoint to retrieve application version information * fix(auth): improve user authentication method logic and update user cache * feat(user): add ordering functionality to user list retrieval * fix(RevenueStatistics) fill list * fix(UserStatistics) fill list * fix(user): implement user cache clearing after auth method operations * fix(auth): enhance OAuth login logic with improved request handling and user registration flow * fix(user): implement sorting for authentication methods based on priority * fix(user): correct ordering clause for user retrieval based on filter * refactor(user): streamline cache management and enhance cache clearing logic * feat(logs) set logs volume in develop * fix(handler): implement browser interception to deny access for specific user agents * fix(resetTraffic) reset daily server * refactor(trojan): remove unused parameter and clean up logging in slice * fix(middleware): add domain length check and improve user-agent handling * fix(middleware): reorder domain processing and enhance user-agent handling * fix(resetTraffic): update subscription reset logic to use expire_time for monthly and yearly checks * fix(scheduler): update reset traffic task schedule to run daily at 00:30 * fix(traffic): enhance traffic reset logic for subscriptions and adjust status checks * fix(activateOrder): update traffic reset logic to include reset day check * feat(marketing): add batch email task management API and logic * feat(application): implement CRUD operations for subscribe applications * feat(types): add user agent limit and list to subscription configuration * feat(application): update subscription application requests to include structured download links * feat(application): add scheme field and download link handling to subscribe application * feat(application): add endpoint to retrieve client information * feat(application): move DownloadLink and SubscribeApplication types to types.api * feat(application): add DownloadLink and SubscribeClient types, update client response structure * feat(application): remove ProxyTemplate field from application API * feat(application): implement adapter for client configuration and add preview template functionality * feat(application): move DownloadLink type to types.api and remove from common.api * feat(application): update PreviewSubscribeTemplate to return structured response * feat(application): remove ProxyTemplate field from application API * feat(application): enhance cache key generation for user list and server data * feat(subscribe): add ClearCache method to manage subscription cache invalidation * feat(payment): add Description field to PaymentMethodDetail response * feat(subscribe): update next reset time calculation to use ExpireTime * feat(purchase): include handling fee in total amount calculation * feat(subscribe): add V2SubscribeHandler and logic for enhanced subscription management * feat(subscribe): add output format configuration to subscription adapter * feat(application): default data --------- Co-authored-by: Chang lue Tsen <tension@ppanel.dev> Co-authored-by: NoWay <Bob455668@hotmail.com>
This commit is contained in:
Leif Draven
@@ -255,6 +255,26 @@ type BatchDeleteUserRequest struct {
|
||||
Ids []int64 `json:"ids" validate:"required"`
|
||||
}
|
||||
|
||||
type BatchSendEmailTask struct {
|
||||
Id int64 `json:"id"`
|
||||
Subject string `json:"subject"`
|
||||
Content string `json:"content"`
|
||||
Recipients string `json:"recipients"`
|
||||
Scope string `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"`
|
||||
}
|
||||
|
||||
type BindOAuthCallbackRequest struct {
|
||||
Method string `json:"method"`
|
||||
Callback interface{} `json:"callback"`
|
||||
@@ -372,6 +392,18 @@ type CreateApplicationVersionRequest struct {
|
||||
ApplicationId int64 `json:"application_id" validate:"required"`
|
||||
}
|
||||
|
||||
type CreateBatchSendEmailTaskRequest struct {
|
||||
Subject string `json:"subject"`
|
||||
Content string `json:"content"`
|
||||
Scope string `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"`
|
||||
}
|
||||
|
||||
type CreateCouponRequest struct {
|
||||
Name string `json:"name" validate:"required"`
|
||||
Code string `json:"code,omitempty"`
|
||||
@@ -455,6 +487,18 @@ type CreateRuleGroupRequest struct {
|
||||
Enable bool `json:"enable"`
|
||||
}
|
||||
|
||||
type CreateSubscribeApplicationRequest struct {
|
||||
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"`
|
||||
}
|
||||
|
||||
type CreateSubscribeGroupRequest struct {
|
||||
Name string `json:"name" validate:"required"`
|
||||
Description string `json:"description"`
|
||||
@@ -586,6 +630,10 @@ type DeleteRuleGroupRequest struct {
|
||||
Id int64 `json:"id" validate:"required"`
|
||||
}
|
||||
|
||||
type DeleteSubscribeApplicationRequest struct {
|
||||
Id int64 `json:"id"`
|
||||
}
|
||||
|
||||
type DeleteSubscribeGroupRequest struct {
|
||||
Id int64 `json:"id" validate:"required"`
|
||||
}
|
||||
@@ -617,6 +665,15 @@ type Document struct {
|
||||
UpdatedAt int64 `json:"updated_at"`
|
||||
}
|
||||
|
||||
type DownloadLink struct {
|
||||
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"`
|
||||
}
|
||||
|
||||
type EPayNotifyRequest struct {
|
||||
Pid int64 `json:"pid" form:"pid"`
|
||||
TradeNo string `json:"trade_no" form:"trade_no"`
|
||||
@@ -706,6 +763,29 @@ type GetAvailablePaymentMethodsResponse struct {
|
||||
List []PaymentMethod `json:"list"`
|
||||
}
|
||||
|
||||
type GetBatchSendEmailTaskListRequest struct {
|
||||
Page int `form:"page"`
|
||||
Size int `form:"size"`
|
||||
Scope string `form:"scope,omitempty"`
|
||||
Status *uint8 `form:"status,omitempty"`
|
||||
}
|
||||
|
||||
type GetBatchSendEmailTaskListResponse struct {
|
||||
Total int64 `json:"total"`
|
||||
List []BatchSendEmailTask `json:"list"`
|
||||
}
|
||||
|
||||
type GetBatchSendEmailTaskStatusRequest struct {
|
||||
Id int64 `json:"id"`
|
||||
}
|
||||
|
||||
type GetBatchSendEmailTaskStatusResponse struct {
|
||||
Status uint8 `json:"status"`
|
||||
Current int64 `json:"current"`
|
||||
Total int64 `json:"total"`
|
||||
Errors string `json:"errors"`
|
||||
}
|
||||
|
||||
type GetCouponListRequest struct {
|
||||
Page int64 `form:"page" validate:"required"`
|
||||
Size int64 `form:"size" validate:"required"`
|
||||
@@ -837,6 +917,16 @@ type GetPaymentMethodListResponse struct {
|
||||
List []PaymentMethodDetail `json:"list"`
|
||||
}
|
||||
|
||||
type GetPreSendEmailCountRequest struct {
|
||||
Scope string `json:"scope"`
|
||||
RegisterStartTime int64 `json:"register_start_time,omitempty"`
|
||||
RegisterEndTime int64 `json:"register_end_time,omitempty"`
|
||||
}
|
||||
|
||||
type GetPreSendEmailCountResponse struct {
|
||||
Count int64 `json:"count"`
|
||||
}
|
||||
|
||||
type GetRuleGroupResponse struct {
|
||||
Total int64 `json:"total"`
|
||||
List []ServerRuleGroup `json:"list"`
|
||||
@@ -867,6 +957,21 @@ type GetStatResponse struct {
|
||||
Protocol []string `json:"protocol"`
|
||||
}
|
||||
|
||||
type GetSubscribeApplicationListRequest struct {
|
||||
Page int `form:"page"`
|
||||
Size int `form:"size"`
|
||||
}
|
||||
|
||||
type GetSubscribeApplicationListResponse struct {
|
||||
Total int64 `json:"total"`
|
||||
List []SubscribeApplication `json:"list"`
|
||||
}
|
||||
|
||||
type GetSubscribeClientResponse struct {
|
||||
Total int64 `json:"total"`
|
||||
List []SubscribeClient `json:"list"`
|
||||
}
|
||||
|
||||
type GetSubscribeDetailsRequest struct {
|
||||
Id int64 `form:"id" validate:"required"`
|
||||
}
|
||||
@@ -1285,6 +1390,14 @@ type PreUnsubscribeResponse struct {
|
||||
DeductionAmount int64 `json:"deduction_amount"`
|
||||
}
|
||||
|
||||
type PreviewSubscribeTemplateRequest struct {
|
||||
Id int64 `form:"id"`
|
||||
}
|
||||
|
||||
type PreviewSubscribeTemplateResponse struct {
|
||||
Template string `json:"template"` // 预览的模板内容
|
||||
}
|
||||
|
||||
type PrivacyPolicyConfig struct {
|
||||
PrivacyPolicy string `json:"privacy_policy"`
|
||||
}
|
||||
@@ -1634,6 +1747,10 @@ type SortItem struct {
|
||||
Sort int64 `json:"sort" validate:"required"`
|
||||
}
|
||||
|
||||
type StopBatchSendEmailTaskRequest struct {
|
||||
Id int64 `json:"id"`
|
||||
}
|
||||
|
||||
type StripePayment struct {
|
||||
Method string `json:"method"`
|
||||
ClientSecret string `json:"client_secret"`
|
||||
@@ -1667,11 +1784,38 @@ type Subscribe struct {
|
||||
UpdatedAt int64 `json:"updated_at"`
|
||||
}
|
||||
|
||||
type SubscribeApplication struct {
|
||||
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"`
|
||||
}
|
||||
|
||||
type SubscribeClient struct {
|
||||
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"`
|
||||
}
|
||||
|
||||
type SubscribeConfig struct {
|
||||
SingleModel bool `json:"single_model"`
|
||||
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"`
|
||||
}
|
||||
|
||||
type SubscribeDiscount struct {
|
||||
@@ -1974,6 +2118,19 @@ type UpdateRuleGroupRequest struct {
|
||||
Enable bool `json:"enable"`
|
||||
}
|
||||
|
||||
type UpdateSubscribeApplicationRequest struct {
|
||||
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"`
|
||||
}
|
||||
|
||||
type UpdateSubscribeGroupRequest struct {
|
||||
Id int64 `json:"id" validate:"required"`
|
||||
Name string `json:"name" validate:"required"`
|
||||
@@ -2273,6 +2430,10 @@ type VerifyEmailRequest struct {
|
||||
Code string `json:"code" validate:"required"`
|
||||
}
|
||||
|
||||
type VersionResponse struct {
|
||||
Version string `json:"version"`
|
||||
}
|
||||
|
||||
type Vless struct {
|
||||
Port int `json:"port" validate:"required"`
|
||||
Flow string `json:"flow" validate:"required"`
|
||||
|
||||
Reference in New Issue
Block a user