From c6a25e2b8cc0b887f957c88adb62e09e6b00f97c Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Mon, 11 Oct 2021 20:36:00 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4jwt=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4,=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BD=93=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/i18n/langs/en-US/translation.json | 1 + shared/i18n/langs/zh-CN/translation.json | 1 + web/src/routes/Main/Provider.tsx | 2 +- web/src/utils/jwt-helper.ts | 2 +- web/src/utils/user-helper.ts | 4 ++++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/shared/i18n/langs/en-US/translation.json b/shared/i18n/langs/en-US/translation.json index cae15691..5a69b4fc 100644 --- a/shared/i18n/langs/en-US/translation.json +++ b/shared/i18n/langs/en-US/translation.json @@ -25,6 +25,7 @@ "k35abe359": "Lobby", "k35f486ba": "Nickname", "k35f990b0": "View Detail", + "k3ac17670": "An exception occurred, store creation failed", "k3b4b656d": "About", "k3bbf3bbd": "Register Account", "k3c502edb": "E-mail can not be empty", diff --git a/shared/i18n/langs/zh-CN/translation.json b/shared/i18n/langs/zh-CN/translation.json index 5878dce3..850dcbbe 100644 --- a/shared/i18n/langs/zh-CN/translation.json +++ b/shared/i18n/langs/zh-CN/translation.json @@ -25,6 +25,7 @@ "k35abe359": "大厅", "k35f486ba": "用户昵称", "k35f990b0": "查看详情", + "k3ac17670": "出现异常, Store 创建失败", "k3b4b656d": "关于", "k3bbf3bbd": "注册账号", "k3c502edb": "邮箱不能为空", diff --git a/web/src/routes/Main/Provider.tsx b/web/src/routes/Main/Provider.tsx index c6a9654b..8b4b8789 100644 --- a/web/src/routes/Main/Provider.tsx +++ b/web/src/routes/Main/Provider.tsx @@ -79,7 +79,7 @@ export const MainProvider: React.FC = React.memo((props) => { } if (_isNil(store)) { - return
出现异常, Store 创建失败
; + return
{t('出现异常, Store 创建失败')}
; } return ( diff --git a/web/src/utils/jwt-helper.ts b/web/src/utils/jwt-helper.ts index 8ffca218..f5c3c336 100644 --- a/web/src/utils/jwt-helper.ts +++ b/web/src/utils/jwt-helper.ts @@ -27,7 +27,7 @@ let _userJWT: string | null = null; export async function setUserJWT(jwt: string | null): Promise { _userJWT = jwt; // 更新内存中的缓存 - await getStorage().set('jsonwebtoken', jwt); + await getStorage().save('jsonwebtoken', jwt); refreshTokenGetter(); } diff --git a/web/src/utils/user-helper.ts b/web/src/utils/user-helper.ts index 69a931c5..18a18d30 100644 --- a/web/src/utils/user-helper.ts +++ b/web/src/utils/user-helper.ts @@ -6,6 +6,10 @@ export function setGlobalUserLoginInfo(loginInfo: UserLoginInfo) { _userLoginInfo = loginInfo; } +/** + * 获取全局用户登录信息 + * 信息来源可能为注册页面或者登录页面 + */ export function getGlobalUserLoginInfo() { return _userLoginInfo; }