diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index 336f9a9da..6aaa1ce69 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1,4 +1,5 @@
{
+ "pointExchangeSize": "Point Exchange {size}",
"panel": "Panel",
"copyPath": "Copy Path",
"workspaceList": "Workspaces",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index bf96a4665..951ec763c 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -1,4 +1,5 @@
{
+ "pointExchangeSize": "Intercambio de puntos {tamaño}",
"panel": "Panel",
"copyPath": "Copiar ruta",
"workspaceList": "Áreas de trabajo",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index d9ee0241d..2dd8cf1a3 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,5 @@
{
+ "pointExchangeSize": "Échange de points {taille}",
"panel": "Panneau",
"copyPath": "Copier le chemin",
"workspaceList": "Espaces de travail",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index b52b3d415..1fbc5eb07 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,5 @@
{
+ "pointExchangeSize": "積分兌換 {size}",
"panel": "面板",
"copyPath": "複製路徑",
"workspaceList": "工作空間列表",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 162a892f2..e5d76f5b3 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,5 @@
{
+ "pointExchangeSize": "积分兑换 {size}",
"panel": "面板",
"copyPath": "复制路径",
"workspaceList": "工作空间列表",
diff --git a/app/src/config/repos.ts b/app/src/config/repos.ts
index 876d8fe77..7eb72edc5 100644
--- a/app/src/config/repos.ts
+++ b/app/src/config/repos.ts
@@ -165,7 +165,7 @@ const bindProviderEvent = () => {
${window.siyuan.languages.backup}${response.data.backup ? response.data.backup.hSize : "0B"}
${window.siyuan.languages.cdn}${response.data.hAssetSize}
${window.siyuan.languages.total}${response.data.hSize}
- ${window.siyuan.languages.sizeLimit}${response.data.hTotalSize}
+ ${window.siyuan.languages.sizeLimit}${response.data.hTotalSize}${window.siyuan.languages.pointExchangeSize} ${response.data.hExchangeSize}
diff --git a/kernel/api/repo.go b/kernel/api/repo.go
index 29af6106f..6fe7f08d2 100644
--- a/kernel/api/repo.go
+++ b/kernel/api/repo.go
@@ -83,7 +83,7 @@ func getCloudSpace(c *gin.Context) {
ret := gulu.Ret.NewResult()
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 {
ret.Code = 1
ret.Msg = err.Error()
@@ -94,9 +94,10 @@ func getCloudSpace(c *gin.Context) {
ret.Data = map[string]interface{}{
"sync": sync,
"backup": backup,
- "hAssetSize": assetSize,
- "hSize": size,
- "hTotalSize": totalSize,
+ "hAssetSize": hAssetSize,
+ "hSize": hSize,
+ "hTotalSize": hTotalSize,
+ "hExchangeSize": exchangeSize,
"hTrafficUploadSize": hTrafficUploadSize,
"hTrafficDownloadSize": hTrafficDownloadSize,
}
diff --git a/kernel/conf/user.go b/kernel/conf/user.go
index 96ec4332c..c4b708a03 100644
--- a/kernel/conf/user.go
+++ b/kernel/conf/user.go
@@ -17,26 +17,27 @@
package conf
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 {
diff --git a/kernel/model/repository.go b/kernel/model/repository.go
index 1bbfb052f..eb5abe53c 100644
--- a/kernel/model/repository.go
+++ b/kernel/model/repository.go
@@ -1403,7 +1403,7 @@ type Sync struct {
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()
if nil != err {
err = errors.New(Conf.Language(30) + " " + err.Error())
@@ -1431,6 +1431,7 @@ func GetCloudSpace() (s *Sync, b *Backup, hSize, hAssetSize, hTotalSize, hTraffi
hAssetSize = "-"
hSize = "-"
hTotalSize = "-"
+ hExchangeSize = "-"
hTrafficUploadSize = "-"
hTrafficDownloadSize = "-"
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))
hSize = humanize.Bytes(uint64(totalSize))
hTotalSize = humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize))
+ hExchangeSize = humanize.Bytes(uint64(Conf.User.UserSiYuanPointExchangeRepoSize))
hTrafficUploadSize = humanize.Bytes(uint64(Conf.User.UserTrafficUpload))
hTrafficDownloadSize = humanize.Bytes(uint64(Conf.User.UserTrafficDownload))
}