From 6536a7be62c51074421ceecb09728abb1f42bcca Mon Sep 17 00:00:00 2001 From: JustSong Date: Wed, 21 Jun 2023 15:45:30 +0800 Subject: [PATCH 1/3] fix: do not show dollar balance if not enabled --- web/src/helpers/render.js | 9 +++++++++ web/src/pages/Redemption/EditRedemption.js | 6 +++--- web/src/pages/Token/EditToken.js | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/web/src/helpers/render.js b/web/src/helpers/render.js index e7736fd8..a9c81cc1 100644 --- a/web/src/helpers/render.js +++ b/web/src/helpers/render.js @@ -46,4 +46,13 @@ export function renderQuota(quota, digits = 2) { return '$' + (quota / quotaPerUnit).toFixed(digits); } return renderNumber(quota); +} + +export function renderQuotaWithPrompt(quota, digits) { + let displayInCurrency = localStorage.getItem('display_in_currency'); + displayInCurrency = displayInCurrency === 'true'; + if (displayInCurrency) { + return `（等价金额：${renderQuota(quota, digits)}）`; + } + return ''; } \ No newline at end of file diff --git a/web/src/pages/Redemption/EditRedemption.js b/web/src/pages/Redemption/EditRedemption.js index 74de49b9..df614ab5 100644 --- a/web/src/pages/Redemption/EditRedemption.js +++ b/web/src/pages/Redemption/EditRedemption.js @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'; import { Button, Form, Header, Segment } from 'semantic-ui-react'; import { useParams } from 'react-router-dom'; import { API, downloadTextAsFile, showError, showSuccess } from '../../helpers'; -import { renderQuota } from '../../helpers/render'; +import { renderQuota, renderQuotaWithPrompt } from '../../helpers/render'; const EditRedemption = () => { const params = useParams(); @@ -11,7 +11,7 @@ const EditRedemption = () => { const [loading, setLoading] = useState(isEdit); const originInputs = { name: '', - quota: 100, + quota: 100000, count: 1 }; const [inputs, setInputs] = useState(originInputs); @@ -88,7 +88,7 @@ const EditRedemption = () => { { const params = useParams(); @@ -138,7 +138,7 @@ const EditToken = () => { 注意，令牌的额度仅用于限制令牌本身的最大额度使用量，实际的使用受到账户的剩余额度限制。 Date: Wed, 21 Jun 2023 15:54:06 +0800 Subject: [PATCH 2/3] chore: update api message --- model/token.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/token.go b/model/token.go index 8744f582..f4623644 100644 --- a/model/token.go +++ b/model/token.go @@ -34,7 +34,7 @@ func SearchUserTokens(userId int, keyword string) (tokens []*Token, err error) { func ValidateUserToken(key string) (token *Token, err error) { if key == "" { - return nil, errors.New("未提供 token") + return nil, errors.New("未提供令牌") } token, err = CacheGetTokenByKey(key) if err == nil { @@ -66,7 +66,7 @@ func ValidateUserToken(key string) (token *Token, err error) { }() return token, nil } - return nil, errors.New("无效的 token") + return nil, errors.New("无效的令牌") } func GetTokenByIds(id int, userId int) (*Token, error) { From dc7bb78c740a1a86a745508f4ef0ace332f98117 Mon Sep 17 00:00:00 2001 From: JustSong Date: Wed, 21 Jun 2023 15:55:00 +0800 Subject: [PATCH 3/3] chore: update api message --- model/token.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/model/token.go b/model/token.go index f4623644..d739cea6 100644 --- a/model/token.go +++ b/model/token.go @@ -39,29 +39,29 @@ func ValidateUserToken(key string) (token *Token, err error) { token, err = CacheGetTokenByKey(key) if err == nil { if token.Status != common.TokenStatusEnabled { - return nil, errors.New("该 token 状态不可用") + return nil, errors.New("该令牌状态不可用") } if token.ExpiredTime != -1 && token.ExpiredTime < common.GetTimestamp() { token.Status = common.TokenStatusExpired err := token.SelectUpdate() if err != nil { - common.SysError("更新 token 状态失败：" + err.Error()) + common.SysError("更新令牌状态失败：" + err.Error()) } - return nil, errors.New("该 token 已过期") + return nil, errors.New("该令牌已过期") } if !token.UnlimitedQuota && token.RemainQuota <= 0 { token.Status = common.TokenStatusExhausted err := token.SelectUpdate() if err != nil { - common.SysError("更新 token 状态失败：" + err.Error()) + common.SysError("更新令牌状态失败：" + err.Error()) } - return nil, errors.New("该 token 额度已用尽") + return nil, errors.New("该令牌额度已用尽") } go func() { token.AccessedTime = common.GetTimestamp() err := token.SelectUpdate() if err != nil { - common.SysError("更新 token 失败：" + err.Error()) + common.SysError("更新令牌失败：" + err.Error()) } }() return token, nil