无订阅 支付后出现两个订阅

internal/logic/admin/system/getSignatureConfigLogic.go

@@ -0,0 +1,38 @@
+package system
+
+import (
+	"context"
+
+	"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/tool"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+)
+
+type GetSignatureConfigLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+// Get Signature Config
+func NewGetSignatureConfigLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetSignatureConfigLogic {
+	return &GetSignatureConfigLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetSignatureConfigLogic) GetSignatureConfig() (resp *types.SignatureConfig, err error) {
+	resp = &types.SignatureConfig{}
+	configs, err := l.svcCtx.SystemModel.GetSignatureConfig(l.ctx)
+	if err != nil {
+		l.Errorw("[GetSignatureConfig] Database query error", logger.Field("error", err.Error()))
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get signature config error: %v", err.Error())
+	}
+	tool.SystemConfigSliceReflectToStruct(configs, resp)
+	return resp, nil
+}

internal/logic/admin/system/updateSignatureConfigLogic.go

@@ -0,0 +1,53 @@
+package system
+
+import (
+	"context"
+	"reflect"
+
+	"github.com/perfect-panel/server/initialize"
+	"github.com/perfect-panel/server/internal/config"
+	"github.com/perfect-panel/server/internal/model/system"
+	"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/tool"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+	"gorm.io/gorm"
+)
+
+type UpdateSignatureConfigLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+// Update Signature Config
+func NewUpdateSignatureConfigLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateSignatureConfigLogic {
+	return &UpdateSignatureConfigLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *UpdateSignatureConfigLogic) UpdateSignatureConfig(req *types.SignatureConfig) error {
+	v := reflect.ValueOf(*req)
+	t := v.Type()
+	err := l.svcCtx.SystemModel.Transaction(l.ctx, func(db *gorm.DB) error {
+		for i := 0; i < v.NumField(); i++ {
+			fieldName := t.Field(i).Name
+			fieldValue := tool.ConvertValueToString(v.Field(i))
+			if err := db.Model(&system.System{}).Where("`category` = 'signature' and `key` = ?", fieldName).Update("value", fieldValue).Error; err != nil {
+				return err
+			}
+		}
+		return l.svcCtx.Redis.Del(l.ctx, config.SignatureConfigKey, config.GlobalConfigKey).Err()
+	})
+	if err != nil {
+		l.Errorw("[UpdateSignatureConfig] update signature config error", logger.Field("error", err.Error()))
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update signature config error: %v", err.Error())
+	}
+	initialize.Signature(l.svcCtx)
+	return nil
+}

internal/logic/common/getGlobalConfigLogic.go

@@ -47,6 +47,7 @@ func (l *GetGlobalConfigLogic) GetGlobalConfig() (resp *types.GetGlobalConfigRes
 	tool.DeepCopy(&resp.Auth.Email, l.svcCtx.Config.Email)
 	tool.DeepCopy(&resp.Auth.Mobile, l.svcCtx.Config.Mobile)
 	tool.DeepCopy(&resp.Auth.Register, l.svcCtx.Config.Register)
+	tool.DeepCopy(&resp.Signature, l.svcCtx.Config.Signature)
 	tool.DeepCopy(&resp.Verify, l.svcCtx.Config.Verify)
 	tool.DeepCopy(&resp.Invite, l.svcCtx.Config.Invite)
 	tool.SystemConfigSliceReflectToStruct(currencyCfg, &resp.Currency)

internal/logic/public/subscribe/queryUserSubscribeNodeListLogic.go

@@ -113,16 +113,17 @@ func (l *QueryUserSubscribeNodeListLogic) getServers(userSub *user.Subscribe) (u
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find subscribe details error: %v", err.Error())
 	}
 	nodeIds := tool.StringToInt64Slice(subDetails.Nodes)
-	tags := strings.Split(subDetails.NodeTags, ",")
+	tags := normalizeSubscribeNodeTags(subDetails.NodeTags)
 
 	l.Debugf("[Generate Subscribe]nodes: %v, NodeTags: %v", nodeIds, tags)
 
 	enable := true
 
 	_, nodes, err := l.svcCtx.NodeModel.FilterNodeList(l.ctx, &node.FilterNodeParams{
-		Page:    0,
+		Page:    1,
 		Size:    1000,
 		NodeId:  nodeIds,
+		Tag:     tags,
 		Enabled: &enable, // Only get enabled nodes
 	})
 
@@ -213,3 +214,21 @@ func (l *QueryUserSubscribeNodeListLogic) getUserSubscribe(token string) (*user.
 
 	return userSub, nil
 }
+
+func normalizeSubscribeNodeTags(raw string) []string {
+	if raw == "" {
+		return nil
+	}
+
+	parts := strings.Split(raw, ",")
+	cleaned := make([]string, 0, len(parts))
+	for _, tag := range parts {
+		trimmed := strings.TrimSpace(tag)
+		if trimmed == "" {
+			continue
+		}
+		cleaned = append(cleaned, trimmed)
+	}
+
+	return tool.RemoveDuplicateElements(cleaned...)
+}

internal/logic/public/subscribe/queryUserSubscribeNodeListLogic_test.go

@@ -23,3 +23,11 @@ func TestFillUserSubscribeInfoEntitlementFields(t *testing.T) {
 	require.Equal(t, int64(3001), sub.EntitlementOwnerUserId)
 	require.True(t, sub.ReadOnly)
 }
+
+func TestNormalizeSubscribeNodeTags(t *testing.T) {
+	tags := normalizeSubscribeNodeTags("美国, 日本, , 美国,  ,日本")
+	require.Equal(t, []string{"美国", "日本"}, tags)
+
+	empty := normalizeSubscribeNodeTags("")
+	require.Nil(t, empty)
+}