diff --git a/packages/ui/certd-client/src/views/certd/mine/use.tsx b/packages/ui/certd-client/src/views/certd/mine/use.tsx index 1ab83d6f0..f5e4e536e 100644 --- a/packages/ui/certd-client/src/views/certd/mine/use.tsx +++ b/packages/ui/certd-client/src/views/certd/mine/use.tsx @@ -66,7 +66,7 @@ export function useUserProfile() { width: "auto", }, buildUrl(key: string) { - return `api/basic/file/download?&key=` + key; + return `api/basic/file/download?token=${userStore.getToken}&key=` + key; }, }, }, @@ -82,7 +82,7 @@ export function useUserProfile() { onReady: null, uploader: { type: "form", - action: "/basic/file/upload", + action: "/basic/file/upload?token=" + userStore.getToken, name: "file", headers: { Authorization: "Bearer " + userStore.getToken, @@ -92,7 +92,7 @@ export function useUserProfile() { }, }, buildUrl(key: string) { - return `api/basic/file/download?&key=` + key; + return `api/basic/file/download?token=${userStore.getToken}&key=` + key; }, }, }, diff --git a/packages/ui/certd-client/src/views/certd/mine/user-profile.vue b/packages/ui/certd-client/src/views/certd/mine/user-profile.vue index d080377dc..290fc0a4e 100644 --- a/packages/ui/certd-client/src/views/certd/mine/user-profile.vue +++ b/packages/ui/certd-client/src/views/certd/mine/user-profile.vue @@ -147,6 +147,7 @@ import { isEmpty } from "lodash-es"; import { dict } from "@fast-crud/fast-crud"; import dayjs from "dayjs"; import { useRouter } from "vue-router"; +import { useUserStore } from "/@/store/user"; const { t } = useI18n(); @@ -351,7 +352,7 @@ const checkPasskeySupport = () => { passkeySupported.value = true; } }; - +const userStore = useUserStore(); const userAvatar = computed(() => { if (isEmpty(userInfo.value.avatar)) { return ""; @@ -360,7 +361,7 @@ const userAvatar = computed(() => { return userInfo.value.avatar; } - return "api/basic/file/download?&key=" + userInfo.value.avatar; + return `api/basic/file/download?token=${userStore.getToken}&key=${userInfo.value.avatar}`; }); onMounted(async () => { diff --git a/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue b/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue index 8455eb7db..d26d63567 100644 --- a/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue +++ b/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue @@ -3,7 +3,7 @@
- + {{ userInfo.username }} @@ -228,6 +228,16 @@ const userStore = useUserStore(); const userInfo: ComputedRef = computed(() => { return userStore.getUserInfo; }); +const avatar = computed(() => { + const avt = userStore.getUserInfo?.avatar; + if (!avt) { + return ""; + } + if (avt.startsWith("http")) { + return avt; + } + return `/api/basic/file/download?key=${avt}`; +}); const now = computed(() => { const serverTime = Date.now() - settingStore.app.deltaTime; return dayjs(serverTime).format("YYYY-MM-DD HH:mm:ss"); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9aea6b918..48f9748b0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -49,7 +49,7 @@ importers: packages/core/acme-client: dependencies: '@certd/basic': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../basic '@peculiar/x509': specifier: ^1.11.0 @@ -213,10 +213,10 @@ importers: packages/core/pipeline: dependencies: '@certd/basic': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../basic '@certd/plus-core': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../pro/plus-core dayjs: specifier: ^1.11.7 @@ -412,7 +412,7 @@ importers: packages/libs/lib-k8s: dependencies: '@certd/basic': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/basic '@kubernetes/client-node': specifier: 0.21.0 @@ -452,19 +452,19 @@ importers: packages/libs/lib-server: dependencies: '@certd/acme-client': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/pipeline '@certd/plugin-lib': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../plugins/plugin-lib '@certd/plus-core': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../pro/plus-core '@midwayjs/cache': specifier: 3.14.0 @@ -610,16 +610,16 @@ importers: packages/plugins/plugin-cert: dependencies: '@certd/acme-client': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/pipeline '@certd/plugin-lib': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../plugin-lib psl: specifier: ^1.9.0 @@ -683,16 +683,16 @@ importers: specifier: ^3.964.0 version: 3.964.0(aws-crt@1.26.2) '@certd/acme-client': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/pipeline '@certd/plus-core': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../pro/plus-core '@kubernetes/client-node': specifier: 0.21.0 @@ -783,16 +783,16 @@ importers: packages/pro/commercial-core: dependencies: '@certd/basic': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/basic '@certd/lib-server': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../libs/lib-server '@certd/pipeline': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/pipeline '@certd/plus-core': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../plus-core '@midwayjs/core': specifier: 3.20.11 @@ -868,16 +868,16 @@ importers: packages/pro/plugin-plus: dependencies: '@certd/basic': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/pipeline '@certd/plugin-lib': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../plugins/plugin-lib '@certd/plus-core': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../plus-core crypto-js: specifier: ^4.2.0 @@ -953,7 +953,7 @@ importers: packages/pro/plus-core: dependencies: '@certd/basic': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/basic dayjs: specifier: ^1.11.7 @@ -1249,10 +1249,10 @@ importers: version: 0.1.3(zod@3.24.4) devDependencies: '@certd/lib-iframe': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../libs/lib-iframe '@certd/pipeline': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/pipeline '@rollup/plugin-commonjs': specifier: ^25.0.7 @@ -1447,46 +1447,46 @@ importers: specifier: ^3.990.0 version: 3.990.0(aws-crt@1.26.2) '@certd/acme-client': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/basic '@certd/commercial-core': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../pro/commercial-core '@certd/cv4pve-api-javascript': specifier: ^8.4.2 version: 8.4.2 '@certd/jdcloud': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../libs/lib-jdcloud '@certd/lib-huawei': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../libs/lib-huawei '@certd/lib-k8s': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../libs/lib-k8s '@certd/lib-server': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../libs/lib-server '@certd/midway-flyway-js': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../libs/midway-flyway-js '@certd/pipeline': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../core/pipeline '@certd/plugin-cert': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../plugins/plugin-cert '@certd/plugin-lib': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../plugins/plugin-lib '@certd/plugin-plus': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../pro/plugin-plus '@certd/plus-core': - specifier: ^1.39.6 + specifier: ^1.39.7 version: link:../../pro/plus-core '@google-cloud/publicca': specifier: ^1.3.0 @@ -20854,13 +20854,13 @@ snapshots: resolve: 1.22.10 semver: 6.3.1 - eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8): + eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8): dependencies: eslint: 7.32.0 prettier: 2.8.8 prettier-linter-helpers: 1.0.0 optionalDependencies: - eslint-config-prettier: 8.10.0(eslint@7.32.0) + eslint-config-prettier: 8.10.0(eslint@8.57.0) eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@8.57.0)(prettier@2.8.8): dependencies: @@ -23286,7 +23286,7 @@ snapshots: eslint: 7.32.0 eslint-config-prettier: 8.10.0(eslint@7.32.0) eslint-plugin-node: 11.1.0(eslint@7.32.0) - eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8) + eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8) execa: 5.1.1 inquirer: 7.3.3 json5: 2.2.3