From 61c8bf64737b69148af2d363759d422bb4f76fb7 Mon Sep 17 00:00:00 2001 From: xlsea Date: Fri, 7 Jun 2024 14:22:40 +0800 Subject: [PATCH] =?UTF-8?q?merge(sj=5F1.0.0=5Fbeta4):=20=E5=90=88=E5=B9=B6?= =?UTF-8?q?=20sa=201.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- packages/axios/package.json | 2 +- packages/color/package.json | 2 +- packages/hooks/package.json | 2 +- packages/materials/package.json | 2 +- packages/ofetch/package.json | 2 +- packages/scripts/package.json | 4 ++-- packages/uno-preset/package.json | 2 +- packages/utils/package.json | 2 +- pnpm-lock.yaml | 33 +++++++++++++++++++++++------- src/router/guard/route.ts | 20 +++++++----------- src/store/modules/auth/index.ts | 35 ++++++++++++++++++++++++++------ 12 files changed, 72 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index f59b2a7..7d45983 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ }, "devDependencies": { "@elegant-router/vue": "0.3.7", - "@iconify/json": "2.2.216", + "@iconify/json": "2.2.217", "@sa/scripts": "workspace:*", "@sa/uno-preset": "workspace:*", "@soybeanjs/eslint-config": "1.3.6", diff --git a/packages/axios/package.json b/packages/axios/package.json index c81267e..b979388 100644 --- a/packages/axios/package.json +++ b/packages/axios/package.json @@ -1,6 +1,6 @@ { "name": "@sa/axios", - "version": "1.2.0", + "version": "1.2.1", "exports": { ".": "./src/index.ts" }, diff --git a/packages/color/package.json b/packages/color/package.json index 43d1f58..1a6d559 100644 --- a/packages/color/package.json +++ b/packages/color/package.json @@ -1,6 +1,6 @@ { "name": "@sa/color", - "version": "1.2.0", + "version": "1.2.1", "exports": { ".": "./src/index.ts" }, diff --git a/packages/hooks/package.json b/packages/hooks/package.json index fffe741..6e83910 100644 --- a/packages/hooks/package.json +++ b/packages/hooks/package.json @@ -1,6 +1,6 @@ { "name": "@sa/hooks", - "version": "1.2.0", + "version": "1.2.1", "exports": { ".": "./src/index.ts" }, diff --git a/packages/materials/package.json b/packages/materials/package.json index d40c5ec..1b2e6e9 100644 --- a/packages/materials/package.json +++ b/packages/materials/package.json @@ -1,6 +1,6 @@ { "name": "@sa/materials", - "version": "1.2.0", + "version": "1.2.1", "exports": { ".": "./src/index.ts" }, diff --git a/packages/ofetch/package.json b/packages/ofetch/package.json index 2a8b7a5..32e3fd9 100644 --- a/packages/ofetch/package.json +++ b/packages/ofetch/package.json @@ -1,6 +1,6 @@ { "name": "@sa/fetch", - "version": "1.2.0", + "version": "1.2.1", "exports": { ".": "./src/index.ts" }, diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 354f315..576ef6f 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -1,6 +1,6 @@ { "name": "@sa/scripts", - "version": "1.2.0", + "version": "1.2.1", "bin": { "sa": "./bin.ts" }, @@ -19,7 +19,7 @@ "cac": "6.7.14", "consola": "3.2.3", "enquirer": "2.4.1", - "execa": "9.1.0", + "execa": "9.2.0", "kolorist": "1.8.0", "npm-check-updates": "16.14.20", "rimraf": "5.0.7" diff --git a/packages/uno-preset/package.json b/packages/uno-preset/package.json index 8b318bc..ef0d812 100644 --- a/packages/uno-preset/package.json +++ b/packages/uno-preset/package.json @@ -1,6 +1,6 @@ { "name": "@sa/uno-preset", - "version": "1.2.0", + "version": "1.2.1", "exports": { ".": "./src/index.ts" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index d61af63..ac432db 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@sa/utils", - "version": "1.2.0", + "version": "1.2.1", "exports": { ".": "./src/index.ts" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aeca071..8a8df43 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -94,8 +94,8 @@ importers: specifier: 0.3.7 version: 0.3.7 '@iconify/json': - specifier: 2.2.216 - version: 2.2.216 + specifier: 2.2.217 + version: 2.2.217 '@sa/scripts': specifier: workspace:* version: link:packages/scripts @@ -264,8 +264,8 @@ importers: specifier: 2.4.1 version: 2.4.1 execa: - specifier: 9.1.0 - version: 9.1.0 + specifier: 9.2.0 + version: 9.2.0 kolorist: specifier: 1.8.0 version: 1.8.0 @@ -725,8 +725,8 @@ packages: resolution: {integrity: sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==} engines: {node: '>=18.18'} - '@iconify/json@2.2.216': - resolution: {integrity: sha512-dS2yVIAel1oIAGnaxR+EJyDRjKV9GGm9tUd8Pd8VEF91HB4HJrsMzkvz23GHDWyIITGdinx4ZUjMz3hOAv+D4Q==} + '@iconify/json@2.2.217': + resolution: {integrity: sha512-+sSR9iKsoThUmgG4wA9xdtyazROIqMOo5h5otOXYRyOQjMNJCpJltq5hEhHInC5aG/DUQmXDiN/YsCoJdCYUbQ==} '@iconify/types@2.0.0': resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} @@ -2218,6 +2218,10 @@ packages: resolution: {integrity: sha512-lSgHc4Elo2m6bUDhc3Hl/VxvUDJdQWI40RZ4KMY9bKRc+hgMOT7II/JjbNDhI8VnMtrCb7U/fhpJIkLORZozWw==} engines: {node: '>=18'} + execa@9.2.0: + resolution: {integrity: sha512-vpOyYg7UAVKLAWWtRS2gAdgkT7oJbCn0me3gmUmxZih4kd3MF/oo8kNTBTIbkO3yuuF5uB4ZCZfn8BOolITYhg==} + engines: {node: ^18.19.0 || >=20.5.0} + expand-brackets@2.1.4: resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==} engines: {node: '>=0.10.0'} @@ -5232,7 +5236,7 @@ snapshots: '@humanwhocodes/retry@0.3.0': {} - '@iconify/json@2.2.216': + '@iconify/json@2.2.217': dependencies: '@iconify/types': 2.0.0 pathe: 1.1.2 @@ -7037,6 +7041,21 @@ snapshots: strip-final-newline: 4.0.0 yoctocolors: 2.0.2 + execa@9.2.0: + dependencies: + '@sindresorhus/merge-streams': 4.0.0 + cross-spawn: 7.0.3 + figures: 6.1.0 + get-stream: 9.0.1 + human-signals: 7.0.0 + is-plain-obj: 4.1.0 + is-stream: 4.0.1 + npm-run-path: 5.3.0 + pretty-ms: 9.0.0 + signal-exit: 4.1.0 + strip-final-newline: 4.0.0 + yoctocolors: 2.0.2 + expand-brackets@2.1.4: dependencies: debug: 2.6.9 diff --git a/src/router/guard/route.ts b/src/router/guard/route.ts index f95c57d..0fd27dd 100644 --- a/src/router/guard/route.ts +++ b/src/router/guard/route.ts @@ -10,7 +10,6 @@ import { useAuthStore } from '@/store/modules/auth'; import { useRouteStore } from '@/store/modules/route'; import { localStg } from '@/utils/storage'; import { $t } from '@/locales'; -import { fetchVersion } from '@/service/api'; /** * create route guard @@ -128,6 +127,11 @@ async function initRoute(to: RouteLocationNormalized): Promise { localStg.set('userNamespace', userNamespace); } - // 2. get user info and update store - const pass = await updateUserInfo(); + // 2. get user info + const pass = await getUserInfo(); if (pass) { token.value = loginToken.token; @@ -120,11 +120,13 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { return false; } - async function updateUserInfo() { + async function getUserInfo() { + // update user info const { data: info, error } = await fetchGetUserInfo(); if (!error) { // update store + info!.userId = info.id; info!.userName = info?.username; info!.roles = [roleTypeRecord[info.role]]; localStg.set('userInfo', info); @@ -133,10 +135,30 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { return true; } - await resetStore(); return false; } + async function initUserInfo() { + const hasToken = getToken(); + + if (hasToken) { + const pass = await getUserInfo(); + + if (!pass) { + resetStore(); + } + } + } + + async function initAppVersion() { + const { data: version, error: versionError } = await fetchVersion(); + if (!versionError && version) { + localStg.set('version', version!); + } else { + localStg.remove('version'); + } + } + function setNamespaceId(namespaceId: string) { const userNamespace = localStg.get('userNamespace') || {}; userNamespace[userInfo.userId] = namespaceId; @@ -152,7 +174,8 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { loginLoading, resetStore, login, - updateUserInfo, + initUserInfo, + initAppVersion, setNamespaceId }; });