Browse Source

:art: 支持链滴积分兑换扩容云端存储 https://github.com/siyuan-note/siyuan/issues/7055

Liang Ding 2 years ago
parent
commit
19682141ef

+ 1 - 0
app/appearance/langs/en_US.json

@@ -1,4 +1,5 @@
 {
 {
+  "pointExchangeSize": "Point Exchange {size}",
   "panel": "Panel",
   "panel": "Panel",
   "copyPath": "Copy Path",
   "copyPath": "Copy Path",
   "workspaceList": "Workspaces",
   "workspaceList": "Workspaces",

+ 1 - 0
app/appearance/langs/es_ES.json

@@ -1,4 +1,5 @@
 {
 {
+  "pointExchangeSize": "Intercambio de puntos {tamaño}",
   "panel": "Panel",
   "panel": "Panel",
   "copyPath": "Copiar ruta",
   "copyPath": "Copiar ruta",
   "workspaceList": "Áreas de trabajo",
   "workspaceList": "Áreas de trabajo",

+ 1 - 0
app/appearance/langs/fr_FR.json

@@ -1,4 +1,5 @@
 {
 {
+  "pointExchangeSize": "Échange de points {taille}",
   "panel": "Panneau",
   "panel": "Panneau",
   "copyPath": "Copier le chemin",
   "copyPath": "Copier le chemin",
   "workspaceList": "Espaces de travail",
   "workspaceList": "Espaces de travail",

+ 1 - 0
app/appearance/langs/zh_CHT.json

@@ -1,4 +1,5 @@
 {
 {
+  "pointExchangeSize": "積分兌換 {size}",
   "panel": "面板",
   "panel": "面板",
   "copyPath": "複製路徑",
   "copyPath": "複製路徑",
   "workspaceList": "工作空間列表",
   "workspaceList": "工作空間列表",

+ 1 - 0
app/appearance/langs/zh_CN.json

@@ -1,4 +1,5 @@
 {
 {
+  "pointExchangeSize": "积分兑换 {size}",
   "panel": "面板",
   "panel": "面板",
   "copyPath": "复制路径",
   "copyPath": "复制路径",
   "workspaceList": "工作空间列表",
   "workspaceList": "工作空间列表",

+ 1 - 1
app/src/config/repos.ts

@@ -165,7 +165,7 @@ const bindProviderEvent = () => {
             <li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.backup}<span class="b3-list-item__meta">${response.data.backup ? response.data.backup.hSize : "0B"}</span></li>
             <li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.backup}<span class="b3-list-item__meta">${response.data.backup ? response.data.backup.hSize : "0B"}</span></li>
             <li class="b3-list-item" style="cursor: auto;"><a href="https://ld246.com/settings/file?type=3" target="_blank">${window.siyuan.languages.cdn}</a><span class="b3-list-item__meta">${response.data.hAssetSize}</span></li>
             <li class="b3-list-item" style="cursor: auto;"><a href="https://ld246.com/settings/file?type=3" target="_blank">${window.siyuan.languages.cdn}</a><span class="b3-list-item__meta">${response.data.hAssetSize}</span></li>
             <li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.total}<span class="b3-list-item__meta">${response.data.hSize}</span></li>
             <li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.total}<span class="b3-list-item__meta">${response.data.hSize}</span></li>
-            <li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.sizeLimit}<span class="b3-list-item__meta">${response.data.hTotalSize}</span></li>
+            <li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.sizeLimit}<span class="b3-list-item__meta">${response.data.hTotalSize}</span>${window.siyuan.languages.pointExchangeSize}&nbsp;&nbsp;<span class="b3-list-item__meta">${response.data.hExchangeSize}</span></li>
         </ul>
         </ul>
     </div>
     </div>
     <div class="fn__flex-1">
     <div class="fn__flex-1">

+ 5 - 4
kernel/api/repo.go

@@ -83,7 +83,7 @@ func getCloudSpace(c *gin.Context) {
 	ret := gulu.Ret.NewResult()
 	ret := gulu.Ret.NewResult()
 	defer c.JSON(http.StatusOK, ret)
 	defer c.JSON(http.StatusOK, ret)
 
 
-	sync, backup, size, assetSize, totalSize, hTrafficUploadSize, hTrafficDownloadSize, err := model.GetCloudSpace()
+	sync, backup, hSize, hAssetSize, hTotalSize, exchangeSize, hTrafficUploadSize, hTrafficDownloadSize, err := model.GetCloudSpace()
 	if nil != err {
 	if nil != err {
 		ret.Code = 1
 		ret.Code = 1
 		ret.Msg = err.Error()
 		ret.Msg = err.Error()
@@ -94,9 +94,10 @@ func getCloudSpace(c *gin.Context) {
 	ret.Data = map[string]interface{}{
 	ret.Data = map[string]interface{}{
 		"sync":                 sync,
 		"sync":                 sync,
 		"backup":               backup,
 		"backup":               backup,
-		"hAssetSize":           assetSize,
-		"hSize":                size,
-		"hTotalSize":           totalSize,
+		"hAssetSize":           hAssetSize,
+		"hSize":                hSize,
+		"hTotalSize":           hTotalSize,
+		"hExchangeSize":        exchangeSize,
 		"hTrafficUploadSize":   hTrafficUploadSize,
 		"hTrafficUploadSize":   hTrafficUploadSize,
 		"hTrafficDownloadSize": hTrafficDownloadSize,
 		"hTrafficDownloadSize": hTrafficDownloadSize,
 	}
 	}

+ 21 - 20
kernel/conf/user.go

@@ -17,26 +17,27 @@
 package conf
 package conf
 
 
 type User struct {
 type User struct {
-	UserId                       string       `json:"userId"`
-	UserName                     string       `json:"userName"`
-	UserAvatarURL                string       `json:"userAvatarURL"`
-	UserHomeBImgURL              string       `json:"userHomeBImgURL"`
-	UserTitles                   []*UserTitle `json:"userTitles"`
-	UserIntro                    string       `json:"userIntro"`
-	UserNickname                 string       `json:"userNickname"`
-	UserCreateTime               string       `json:"userCreateTime"`
-	UserPaymentSum               string       `json:"userPaymentSum"`
-	UserSiYuanProExpireTime      float64      `json:"userSiYuanProExpireTime"`
-	UserToken                    string       `json:"userToken"`
-	UserTokenExpireTime          string       `json:"userTokenExpireTime"`
-	UserSiYuanRepoSize           float64      `json:"userSiYuanRepoSize"`
-	UserSiYuanAssetSize          float64      `json:"userSiYuanAssetSize"`
-	UserTrafficUpload            float64      `json:"userTrafficUpload"`
-	UserTrafficDownload          float64      `json:"userTrafficDownload"`
-	UserTrafficTime              float64      `json:"userTrafficTime"`
-	UserSiYuanSubscriptionPlan   float64      `json:"userSiYuanSubscriptionPlan"`   // -1:未订阅,0:标准订阅,1:教育订阅,2:试用
-	UserSiYuanSubscriptionStatus float64      `json:"userSiYuanSubscriptionStatus"` // -1:未订阅,0:订阅可用,1:订阅封禁,2:订阅过期
-	UserSiYuanSubscriptionType   float64      `json:"userSiYuanSubscriptionType"`   // 0 年付;1 终生;2 月付
+	UserId                          string       `json:"userId"`
+	UserName                        string       `json:"userName"`
+	UserAvatarURL                   string       `json:"userAvatarURL"`
+	UserHomeBImgURL                 string       `json:"userHomeBImgURL"`
+	UserTitles                      []*UserTitle `json:"userTitles"`
+	UserIntro                       string       `json:"userIntro"`
+	UserNickname                    string       `json:"userNickname"`
+	UserCreateTime                  string       `json:"userCreateTime"`
+	UserPaymentSum                  string       `json:"userPaymentSum"`
+	UserSiYuanProExpireTime         float64      `json:"userSiYuanProExpireTime"`
+	UserToken                       string       `json:"userToken"`
+	UserTokenExpireTime             string       `json:"userTokenExpireTime"`
+	UserSiYuanRepoSize              float64      `json:"userSiYuanRepoSize"`
+	UserSiYuanPointExchangeRepoSize float64      `json:"userSiYuanPointExchangeRepoSize"`
+	UserSiYuanAssetSize             float64      `json:"userSiYuanAssetSize"`
+	UserTrafficUpload               float64      `json:"userTrafficUpload"`
+	UserTrafficDownload             float64      `json:"userTrafficDownload"`
+	UserTrafficTime                 float64      `json:"userTrafficTime"`
+	UserSiYuanSubscriptionPlan      float64      `json:"userSiYuanSubscriptionPlan"`   // -1:未订阅,0:标准订阅,1:教育订阅,2:试用
+	UserSiYuanSubscriptionStatus    float64      `json:"userSiYuanSubscriptionStatus"` // -1:未订阅,0:订阅可用,1:订阅封禁,2:订阅过期
+	UserSiYuanSubscriptionType      float64      `json:"userSiYuanSubscriptionType"`   // 0 年付;1 终生;2 月付
 }
 }
 
 
 type UserTitle struct {
 type UserTitle struct {

+ 3 - 1
kernel/model/repository.go

@@ -1403,7 +1403,7 @@ type Sync struct {
 	SaveDir   string `json:"saveDir"`   // 本地同步数据存放目录路径
 	SaveDir   string `json:"saveDir"`   // 本地同步数据存放目录路径
 }
 }
 
 
-func GetCloudSpace() (s *Sync, b *Backup, hSize, hAssetSize, hTotalSize, hTrafficUploadSize, hTrafficDownloadSize string, err error) {
+func GetCloudSpace() (s *Sync, b *Backup, hSize, hAssetSize, hTotalSize, hExchangeSize, hTrafficUploadSize, hTrafficDownloadSize string, err error) {
 	stat, err := getCloudSpaceOSS()
 	stat, err := getCloudSpaceOSS()
 	if nil != err {
 	if nil != err {
 		err = errors.New(Conf.Language(30) + " " + err.Error())
 		err = errors.New(Conf.Language(30) + " " + err.Error())
@@ -1431,6 +1431,7 @@ func GetCloudSpace() (s *Sync, b *Backup, hSize, hAssetSize, hTotalSize, hTraffi
 	hAssetSize = "-"
 	hAssetSize = "-"
 	hSize = "-"
 	hSize = "-"
 	hTotalSize = "-"
 	hTotalSize = "-"
+	hExchangeSize = "-"
 	hTrafficUploadSize = "-"
 	hTrafficUploadSize = "-"
 	hTrafficDownloadSize = "-"
 	hTrafficDownloadSize = "-"
 	if conf.ProviderSiYuan == Conf.Sync.Provider {
 	if conf.ProviderSiYuan == Conf.Sync.Provider {
@@ -1439,6 +1440,7 @@ func GetCloudSpace() (s *Sync, b *Backup, hSize, hAssetSize, hTotalSize, hTraffi
 		hAssetSize = humanize.Bytes(uint64(assetSize))
 		hAssetSize = humanize.Bytes(uint64(assetSize))
 		hSize = humanize.Bytes(uint64(totalSize))
 		hSize = humanize.Bytes(uint64(totalSize))
 		hTotalSize = humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize))
 		hTotalSize = humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize))
+		hExchangeSize = humanize.Bytes(uint64(Conf.User.UserSiYuanPointExchangeRepoSize))
 		hTrafficUploadSize = humanize.Bytes(uint64(Conf.User.UserTrafficUpload))
 		hTrafficUploadSize = humanize.Bytes(uint64(Conf.User.UserTrafficUpload))
 		hTrafficDownloadSize = humanize.Bytes(uint64(Conf.User.UserTrafficDownload))
 		hTrafficDownloadSize = humanize.Bytes(uint64(Conf.User.UserTrafficDownload))
 	}
 	}