HI-VPN/hi-server
4
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

refactor: 更新项目引用路径从perfect-panel/ppanel-server到perfect-panel/server

Browse Source 
feat: 添加版本和构建时间变量
fix: 修正短信队列类型注释错误
style: 清理未使用的代码和测试文件
docs: 更新安装文档中的下载链接
chore: 迁移数据库脚本添加日志和订阅配置
This commit is contained in:
shanshanzhong
2025-10-13 01:33:03 -07:00
parent 393b42f35a
commit c582087c0f
974 changed files with 23609 additions and 23398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/logic/admin/payment/createPaymentMethodLogic.go
+72 -32
View File
@@ -3,16 +3,20 @@ package payment
import (
"context"
"encoding/json"
"fmt"
"github.com/perfect-panel/ppanel-server/pkg/random"
"github.com/perfect-panel/server/pkg/payment/stripe"
"gorm.io/gorm"
paymentModel "github.com/perfect-panel/ppanel-server/internal/model/payment"
"github.com/perfect-panel/ppanel-server/internal/svc"
"github.com/perfect-panel/ppanel-server/internal/types"
"github.com/perfect-panel/ppanel-server/pkg/logger"
"github.com/perfect-panel/ppanel-server/pkg/payment"
"github.com/perfect-panel/ppanel-server/pkg/tool"
"github.com/perfect-panel/ppanel-server/pkg/xerr"
"github.com/perfect-panel/server/pkg/random"
paymentModel "github.com/perfect-panel/server/internal/model/payment"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
"github.com/perfect-panel/server/pkg/logger"
"github.com/perfect-panel/server/pkg/payment"
"github.com/perfect-panel/server/pkg/tool"
"github.com/perfect-panel/server/pkg/xerr"
"github.com/pkg/errors"
)
@@ -50,9 +54,42 @@ func (l *CreatePaymentMethodLogic) CreatePaymentMethod(req *types.CreatePaymentM
Enable: req.Enable,
Token: random.KeyNew(8, 1),
}
if err := l.svcCtx.PaymentModel.Insert(l.ctx, paymentMethod); err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "insert payment method error: %s", err.Error())
err = l.svcCtx.PaymentModel.Transaction(l.ctx, func(tx *gorm.DB) error {
if req.Platform == "Stripe" {
var cfg paymentModel.StripeConfig
if err = cfg.Unmarshal([]byte(paymentMethod.Config)); err != nil {
l.Errorf("[CreatePaymentMethod] unmarshal stripe config error: %s", err.Error())
return errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "unmarshal stripe config error: %s", err.Error())
}
if cfg.SecretKey == "" {
l.Error("[CreatePaymentMethod] stripe secret key is empty")
return errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "stripe secret key is empty")
}
// Create Stripe webhook endpoint
client := stripe.NewClient(stripe.Config{
SecretKey: cfg.SecretKey,
PublicKey: cfg.PublicKey,
})
url := fmt.Sprintf("%s/v1/notify/Stripe/%s", req.Domain, paymentMethod.Token)
endpoint, err := client.CreateWebhookEndpoint(url)
if err != nil {
l.Errorw("[CreatePaymentMethod] create stripe webhook endpoint error", logger.Field("error", err.Error()))
return errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "create stripe webhook endpoint error: %s", err.Error())
}
cfg.WebhookSecret = endpoint.Secret
content, _ := cfg.Marshal()
paymentMethod.Config = string(content)
}
if err = tx.Model(&paymentModel.Payment{}).Create(paymentMethod).Error; err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "insert payment method error: %s", err.Error())
}
return nil
})
if err != nil {
return nil, err
}
resp = &types.PaymentConfig{}
tool.DeepCopy(resp, paymentMethod)
var configMap map[string]interface{}
@@ -64,33 +101,36 @@ func (l *CreatePaymentMethodLogic) CreatePaymentMethod(req *types.CreatePaymentM
func parsePaymentPlatformConfig(ctx context.Context, platform payment.Platform, config interface{}) string {
data, err := json.Marshal(config)
if err != nil {
logger.WithContext(ctx).Errorw("parse payment platform config error", logger.Field("platform", platform), logger.Field("config", config), logger.Field("error", err.Error()))
logger.WithContext(ctx).Errorw("marshal config error", logger.Field("platform", platform), logger.Field("config", config), logger.Field("error", err.Error()))
return ""
}
// 通用处理函数
handleConfig := func(name string, target interface {
Unmarshal([]byte) error
Marshal() ([]byte, error)
}) string {
if err = target.Unmarshal(data); err != nil {
logger.WithContext(ctx).Errorw("parse "+name+" config error", logger.Field("config", string(data)), logger.Field("error", err.Error()))
return ""
}
content, err := target.Marshal()
if err != nil {
logger.WithContext(ctx).Errorw("marshal "+name+" config error", logger.Field("error", err.Error()))
return ""
}
return string(content)
}
switch platform {
case payment.Stripe:
stripe := &paymentModel.StripeConfig{}
if err := stripe.Unmarshal(string(data)); err != nil {
logger.WithContext(ctx).Errorw("parse stripe config error", logger.Field("config", string(data)), logger.Field("error", err.Error()))
}
return stripe.Marshal()
return handleConfig("Stripe", &paymentModel.StripeConfig{})
case payment.AlipayF2F:
alipay := &paymentModel.AlipayF2FConfig{}
if err := alipay.Unmarshal(string(data)); err != nil {
logger.WithContext(ctx).Errorw("parse alipay config error", logger.Field("config", string(data)), logger.Field("error", err.Error()))
}
return alipay.Marshal()
return handleConfig("Alipay", &paymentModel.AlipayF2FConfig{})
case payment.EPay:
epay := &paymentModel.EPayConfig{}
if err := epay.Unmarshal(string(data)); err != nil {
logger.WithContext(ctx).Errorw("parse epay config error", logger.Field("config", string(data)), logger.Field("error", err.Error()))
}
return epay.Marshal()
case payment.Payssion:
payssion := &paymentModel.PayssionConfig{}
if err := payssion.Unmarshal(string(data)); err != nil {
logger.WithContext(ctx).Errorw("parse payssion config error", logger.Field("config", string(data)), logger.Field("error", err.Error()))
}
return payssion.Marshal()
return handleConfig("Epay", &paymentModel.EPayConfig{})
case payment.CryptoSaaS:
return handleConfig("CryptoSaaS", &paymentModel.CryptoSaaSConfig{})
default:
return ""
}
internal/logic/admin/payment/deletePaymentMethodLogic.go
+4 -4
View File
@@ -3,10 +3,10 @@ package payment
import (
"context"
"github.com/perfect-panel/ppanel-server/internal/svc"
"github.com/perfect-panel/ppanel-server/internal/types"
"github.com/perfect-panel/ppanel-server/pkg/logger"
"github.com/perfect-panel/ppanel-server/pkg/xerr"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
"github.com/perfect-panel/server/pkg/logger"
"github.com/perfect-panel/server/pkg/xerr"
"github.com/pkg/errors"
)
internal/logic/admin/payment/getPaymentMethodListLogic.go
+18 -17
View File
@@ -4,13 +4,13 @@ import (
"context"
"encoding/json"
paymentPlatform "github.com/perfect-panel/ppanel-server/pkg/payment"
paymentPlatform "github.com/perfect-panel/server/pkg/payment"
"github.com/perfect-panel/ppanel-server/internal/model/payment"
"github.com/perfect-panel/ppanel-server/internal/svc"
"github.com/perfect-panel/ppanel-server/internal/types"
"github.com/perfect-panel/ppanel-server/pkg/logger"
"github.com/perfect-panel/ppanel-server/pkg/xerr"
"github.com/perfect-panel/server/internal/model/payment"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
"github.com/perfect-panel/server/pkg/logger"
"github.com/perfect-panel/server/pkg/xerr"
"github.com/pkg/errors"
)
@@ -55,17 +55,18 @@ func (l *GetPaymentMethodListLogic) GetPaymentMethodList(req *types.GetPaymentMe
}
}
resp.List[i] = types.PaymentMethodDetail{
Id: v.Id,
Name: v.Name,
Platform: v.Platform,
Icon: v.Icon,
Domain: v.Domain,
Config: config,
FeeMode: v.FeeMode,
FeePercent: v.FeePercent,
FeeAmount: v.FeeAmount,
Enable: *v.Enable,
NotifyURL: notifyUrl,
Id: v.Id,
Name: v.Name,
Platform: v.Platform,
Icon: v.Icon,
Domain: v.Domain,
Config: config,
FeeMode: v.FeeMode,
FeePercent: v.FeePercent,
FeeAmount: v.FeeAmount,
Enable: *v.Enable,
NotifyURL: notifyUrl,
Description: v.Description,
}
}
return
internal/logic/admin/payment/getPaymentPlatformLogic.go
+4 -4
View File
@@ -3,10 +3,10 @@ package payment
import (
"context"
"github.com/perfect-panel/ppanel-server/internal/svc"
"github.com/perfect-panel/ppanel-server/internal/types"
"github.com/perfect-panel/ppanel-server/pkg/logger"
"github.com/perfect-panel/ppanel-server/pkg/payment"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
"github.com/perfect-panel/server/pkg/logger"
"github.com/perfect-panel/server/pkg/payment"
)
type GetPaymentPlatformLogic struct {
internal/logic/admin/payment/updatePaymentMethodLogic.go
+8 -8
View File
@@ -4,12 +4,12 @@ import (
"context"
"encoding/json"
"github.com/perfect-panel/ppanel-server/internal/svc"
"github.com/perfect-panel/ppanel-server/internal/types"
"github.com/perfect-panel/ppanel-server/pkg/logger"
"github.com/perfect-panel/ppanel-server/pkg/payment"
"github.com/perfect-panel/ppanel-server/pkg/tool"
"github.com/perfect-panel/ppanel-server/pkg/xerr"
"github.com/perfect-panel/server/internal/svc"
"github.com/perfect-panel/server/internal/types"
"github.com/perfect-panel/server/pkg/logger"
"github.com/perfect-panel/server/pkg/payment"
"github.com/perfect-panel/server/pkg/tool"
"github.com/perfect-panel/server/pkg/xerr"
"github.com/pkg/errors"
)
@@ -19,7 +19,7 @@ type UpdatePaymentMethodLogic struct {
svcCtx *svc.ServiceContext
}
// Update Payment Method
// NewUpdatePaymentMethodLogic Update Payment Method
func NewUpdatePaymentMethodLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdatePaymentMethodLogic {
return &UpdatePaymentMethodLogic{
Logger: logger.WithContext(ctx),
@@ -39,7 +39,7 @@ func (l *UpdatePaymentMethodLogic) UpdatePaymentMethod(req *types.UpdatePaymentM
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find payment method error: %s", err.Error())
}
config := parsePaymentPlatformConfig(l.ctx, payment.ParsePlatform(req.Platform), req.Config)
tool.DeepCopy(method, req)
tool.DeepCopy(method, req, tool.CopyWithIgnoreEmpty(false))
method.Config = config
if err := l.svcCtx.PaymentModel.Update(l.ctx, method); err != nil {
l.Errorw("update payment method error", logger.Field("id", req.Id), logger.Field("error", err.Error()))