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
@@ -0,0 +1,75 @@
|
||||
package client
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"time"
|
||||
)
|
||||
|
||||
type SubscribeApplication struct {
|
||||
Id int64 `gorm:"primary_key"`
|
||||
Name string `gorm:"type:varchar(255);default:'';not null;comment:Application Name"`
|
||||
Icon string `gorm:"type:MEDIUMTEXT;default:null;comment:Application Icon"`
|
||||
Description string `gorm:"type:varchar(255);default:null;comment:Application Description"`
|
||||
Scheme string `gorm:"type:varchar(255);default:'';not null;comment:Scheme"`
|
||||
UserAgent string `gorm:"type:varchar(255);default:'';not null;comment:User Agent"`
|
||||
IsDefault bool `gorm:"type:tinyint(1);not null;default:0;comment:Is Default Application"`
|
||||
SubscribeTemplate string `gorm:"type:MEDIUMTEXT;default:null;comment:Subscribe Template"`
|
||||
OutputFormat string `gorm:"type:varchar(50);default:'yaml';not null;comment:Output Format"`
|
||||
DownloadLink string `gorm:"type:text;not null;comment:Download Link"`
|
||||
CreatedAt time.Time `gorm:"<-:create;comment:Create Time"`
|
||||
UpdatedAt time.Time `gorm:"comment:Update Time"`
|
||||
}
|
||||
|
||||
func (SubscribeApplication) TableName() string {
|
||||
return "subscribe_application"
|
||||
}
|
||||
|
||||
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"`
|
||||
}
|
||||
|
||||
// GetDownloadLink returns the download link for the specified platform.
|
||||
func (d *DownloadLink) GetDownloadLink(platform string) string {
|
||||
if d == nil {
|
||||
return ""
|
||||
}
|
||||
switch platform {
|
||||
case "ios":
|
||||
return d.IOS
|
||||
case "android":
|
||||
return d.Android
|
||||
case "windows":
|
||||
return d.Windows
|
||||
case "mac":
|
||||
return d.Mac
|
||||
case "linux":
|
||||
return d.Linux
|
||||
case "harmony":
|
||||
return d.Harmony
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
// Marshal serializes the DownloadLink to JSON format.
|
||||
func (d *DownloadLink) Marshal() ([]byte, error) {
|
||||
if d == nil {
|
||||
var empty DownloadLink
|
||||
return json.Marshal(empty)
|
||||
}
|
||||
return json.Marshal(d)
|
||||
}
|
||||
|
||||
// Unmarshal parses the JSON-encoded data and stores the result in the DownloadLink.
|
||||
func (d *DownloadLink) Unmarshal(data []byte) error {
|
||||
if data == nil || len(data) == 0 {
|
||||
*d = DownloadLink{}
|
||||
return nil
|
||||
}
|
||||
return json.Unmarshal(data, d)
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
package client
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type (
|
||||
Model interface {
|
||||
subscribeApplicationModel
|
||||
}
|
||||
subscribeApplicationModel interface {
|
||||
Insert(ctx context.Context, data *SubscribeApplication) error
|
||||
FindOne(ctx context.Context, id int64) (*SubscribeApplication, error)
|
||||
Update(ctx context.Context, data *SubscribeApplication) error
|
||||
Delete(ctx context.Context, id int64) error
|
||||
List(ctx context.Context) ([]*SubscribeApplication, error)
|
||||
Transaction(ctx context.Context, fn func(db *gorm.DB) error) error
|
||||
}
|
||||
DefaultSubscribeApplicationModel struct {
|
||||
*gorm.DB
|
||||
}
|
||||
)
|
||||
|
||||
func NewSubscribeApplicationModel(db *gorm.DB) Model {
|
||||
return &DefaultSubscribeApplicationModel{
|
||||
DB: db.Model(&SubscribeApplication{}),
|
||||
}
|
||||
}
|
||||
|
||||
func (m *DefaultSubscribeApplicationModel) Insert(ctx context.Context, data *SubscribeApplication) error {
|
||||
if err := m.WithContext(ctx).Create(data).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *DefaultSubscribeApplicationModel) FindOne(ctx context.Context, id int64) (*SubscribeApplication, error) {
|
||||
var resp SubscribeApplication
|
||||
if err := m.WithContext(ctx).Where("id = ?", id).First(&resp).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &resp, nil
|
||||
}
|
||||
|
||||
func (m *DefaultSubscribeApplicationModel) Update(ctx context.Context, data *SubscribeApplication) error {
|
||||
if _, err := m.FindOne(ctx, data.Id); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := m.WithContext(ctx).Save(data).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *DefaultSubscribeApplicationModel) Delete(ctx context.Context, id int64) error {
|
||||
if err := m.WithContext(ctx).Delete(&SubscribeApplication{}, id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *DefaultSubscribeApplicationModel) Transaction(ctx context.Context, fn func(db *gorm.DB) error) error {
|
||||
tx := m.WithContext(ctx).Begin()
|
||||
if err := fn(tx); err != nil {
|
||||
if rbErr := tx.Rollback().Error; rbErr != nil {
|
||||
return rbErr
|
||||
}
|
||||
return err
|
||||
}
|
||||
return tx.Commit().Error
|
||||
}
|
||||
|
||||
func (m *DefaultSubscribeApplicationModel) List(ctx context.Context) ([]*SubscribeApplication, error) {
|
||||
var resp []*SubscribeApplication
|
||||
if err := m.WithContext(ctx).Find(&resp).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return resp, nil
|
||||
}
|
||||
Reference in New Issue
Block a user