Modify: clean useless codes

pkg/serializer/setting.go

@@ -9,7 +9,6 @@ type SiteConfig struct {
 	RegCaptcha         bool   `json:"regCaptcha"`
 	ForgetCaptcha      bool   `json:"forgetCaptcha"`
 	EmailActive        bool   `json:"emailActive"`
-	QQLogin            bool   `json:"QQLogin"`
 	Themes             string `json:"themes"`
 	DefaultTheme       string `json:"defaultTheme"`
 	HomepageViewMethod string `json:"home_view_method"`
@@ -67,7 +66,6 @@ func BuildSiteConfig(settings map[string]string, user *model.User) Response {
 			RegCaptcha:         model.IsTrueVal(checkSettingValue(settings, "reg_captcha")),
 			ForgetCaptcha:      model.IsTrueVal(checkSettingValue(settings, "forget_captcha")),
 			EmailActive:        model.IsTrueVal(checkSettingValue(settings, "email_active")),
-			QQLogin:            model.IsTrueVal(checkSettingValue(settings, "qq_login")),
 			Themes:             checkSettingValue(settings, "themes"),
 			DefaultTheme:       checkSettingValue(settings, "defaultTheme"),
 			HomepageViewMethod: checkSettingValue(settings, "home_view_method"),

pkg/serializer/user.go

@@ -44,7 +44,6 @@ type group struct {
 	AllowShare           bool   `json:"allowShare"`
 	AllowRemoteDownload  bool   `json:"allowRemoteDownload"`
 	AllowArchiveDownload bool   `json:"allowArchiveDownload"`
-	ShareFreeEnabled     bool   `json:"shareFree"`
 	ShareDownload        bool   `json:"shareDownload"`
 	CompressEnabled      bool   `json:"compress"`
 	WebDAVEnabled        bool   `json:"webdav"`
@@ -127,7 +126,7 @@ func BuildUserResponse(user model.User) Response {
 
 // BuildUserStorageResponse 序列化用户存储概况响应
 func BuildUserStorageResponse(user model.User) Response {
-	total := user.Group.MaxStorage + user.GetAvailablePackSize()
+	total := user.Group.MaxStorage
 	storageResp := storage{
 		Used:  user.Storage,
 		Free:  total - user.Storage,

pkg/serializer/vas.go

@@ -1,120 +0,0 @@
-package serializer
-
-import (
-	model "github.com/HFO4/cloudreve/models"
-	"github.com/HFO4/cloudreve/pkg/hashid"
-	"github.com/HFO4/cloudreve/pkg/util"
-)
-
-type quota struct {
-	Base  uint64         `json:"base"`
-	Pack  uint64         `json:"pack"`
-	Used  uint64         `json:"used"`
-	Total uint64         `json:"total"`
-	Packs []storagePacks `json:"packs"`
-}
-
-type storagePacks struct {
-	Name           string `json:"name"`
-	Size           uint64 `json:"size"`
-	ActivateDate   string `json:"activate_date"`
-	Expiration     int    `json:"expiration"`
-	ExpirationDate string `json:"expiration_date"`
-}
-
-// MountedFolders 已挂载的目录
-type MountedFolders struct {
-	ID         string `json:"id"`
-	Name       string `json:"name"`
-	PolicyName string `json:"policy_name"`
-}
-
-type policyOptions struct {
-	Name string `json:"name"`
-	ID   string `json:"id"`
-}
-
-// BuildPolicySettingRes 构建存储策略选项选择
-func BuildPolicySettingRes(policies []model.Policy, current *model.Policy) Response {
-	options := make([]policyOptions, 0, len(policies))
-	for _, policy := range policies {
-		options = append(options, policyOptions{
-			Name: policy.Name,
-			ID:   hashid.HashID(policy.ID, hashid.PolicyID),
-		})
-	}
-
-	return Response{
-		Data: map[string]interface{}{
-			"options": options,
-			"current": policyOptions{
-				Name: current.Name,
-				ID:   hashid.HashID(current.ID, hashid.PolicyID),
-			},
-		},
-	}
-}
-
-// BuildUserQuotaResponse 序列化用户存储配额概况响应
-func BuildUserQuotaResponse(user *model.User, packs []model.StoragePack) Response {
-	packSize := user.GetAvailablePackSize()
-	res := quota{
-		Base:  user.Group.MaxStorage,
-		Pack:  packSize,
-		Used:  user.Storage,
-		Total: packSize + user.Group.MaxStorage,
-		Packs: make([]storagePacks, 0, len(packs)),
-	}
-	for _, pack := range packs {
-		res.Packs = append(res.Packs, storagePacks{
-			Name:           pack.Name,
-			Size:           pack.Size,
-			ActivateDate:   pack.ActiveTime.Format("2006-01-02 15:04:05"),
-			Expiration:     int(pack.ExpiredTime.Sub(*pack.ActiveTime).Seconds()),
-			ExpirationDate: pack.ExpiredTime.Format("2006-01-02 15:04:05"),
-		})
-	}
-
-	return Response{
-		Data: res,
-	}
-}
-
-// PackProduct 容量包商品
-type PackProduct struct {
-	ID    int64  `json:"id"`
-	Name  string `json:"name"`
-	Size  uint64 `json:"size"`
-	Time  int64  `json:"time"`
-	Price int    `json:"price"`
-	Score int    `json:"score"`
-}
-
-// GroupProducts 用户组商品
-type GroupProducts struct {
-	ID        int64    `json:"id"`
-	Name      string   `json:"name"`
-	GroupID   uint     `json:"group_id"`
-	Time      int64    `json:"time"`
-	Price     int      `json:"price"`
-	Score     int      `json:"score"`
-	Des       []string `json:"des"`
-	Highlight bool     `json:"highlight"`
-}
-
-// BuildProductResponse 构建增值服务商品响应
-func BuildProductResponse(groups []GroupProducts, packs []PackProduct, alipay, payjs bool, scorePrice int) Response {
-	// 隐藏响应中的用户组ID
-	for i := 0; i < len(groups); i++ {
-		groups[i].GroupID = 0
-	}
-	return Response{
-		Data: map[string]interface{}{
-			"packs":       packs,
-			"groups":      groups,
-			"alipay":      alipay,
-			"payjs":       payjs,
-			"score_price": scorePrice,
-		},
-	}
-}