From 75712b84b7e743d3dcb2b741aaab5c441405c834 Mon Sep 17 00:00:00 2001 From: terwer Date: Sat, 12 Aug 2023 10:14:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=80=9D=E6=BA=90?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- src/composables/useSiyuanApi.ts | 16 +++++++++++----- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 95191eed..2526e60f 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "shorthash2": "^1.0.3", "simple-xmlrpc": "^1.4.2", "siyuan": "^0.7.9", - "siyuan-plugin-picgo": "^1.4.2", + "siyuan-plugin-picgo": "^1.4.3", "uuid": "^9.0.0", "vue": "^3.3.4", "vue-i18n": "^9.2.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1ab7cdcc..22cb46a6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,8 +39,8 @@ dependencies: specifier: ^0.7.9 version: 0.7.9 siyuan-plugin-picgo: - specifier: ^1.4.2 - version: 1.4.2(typescript@5.1.6) + specifier: ^1.4.3 + version: 1.4.3(typescript@5.1.6) uuid: specifier: ^9.0.0 version: 9.0.0 @@ -6109,8 +6109,8 @@ packages: sax: 1.2.4 dev: false - /siyuan-plugin-picgo@1.4.2(typescript@5.1.6): - resolution: {integrity: sha512-opWE/ItkC2Hjx8vNiqqwiCbrp/3h4I4d/ivr7VLD5oNZMdErW0mKM+9hfA2m416W2kYQkGBiLZkjUc+O7SkWLg==} + /siyuan-plugin-picgo@1.4.3(typescript@5.1.6): + resolution: {integrity: sha512-R3UgokC4v6ew1bw+T+/G/k6cPzkTD4ODI+YjZz8ZnmLe0tP9e5//kXpQbN6SjRbUT4FZAxQ7tchL1RaHjSX+lw==} dependencies: '@element-plus/icons-vue': 2.1.0(vue@3.3.4) '@fortawesome/fontawesome-svg-core': 6.4.2 diff --git a/src/composables/useSiyuanApi.ts b/src/composables/useSiyuanApi.ts index a53417f6..efaa83ff 100644 --- a/src/composables/useSiyuanApi.ts +++ b/src/composables/useSiyuanApi.ts @@ -25,25 +25,31 @@ import { SiYuanApiAdaptor, SiyuanConfig, SiyuanKernelApi } from "zhi-siyuan-api" import { createAppLogger } from "~/src/utils/appLogger.ts" -import { Utils } from "~/src/utils/utils.ts" import { useSiyuanDevice } from "~/src/composables/useSiyuanDevice.ts" +import { useSiyuanSetting } from "~/src/stores/useSiyuanSetting" +import { Utils } from "~/src/utils/utils.ts" /** * 通用 Siyuan API 封装 */ export const useSiyuanApi = () => { const logger = createAppLogger("use-siyuan-api") + const { getSiyuanSetting } = useSiyuanSetting() - const siyuanApiUrl = Utils.emptyOrDefault(process.env.VITE_SIYUAN_API_URL, "") - const siyuanAuthToken = Utils.emptyOrDefault(process.env.VITE_SIYUAN_AUTH_TOKEN, "") + const envSiyuanApiUrl = Utils.emptyOrDefault(process.env.VITE_SIYUAN_API_URL, "") + const envSiyuanAuthToken = Utils.emptyOrDefault(process.env.VITE_SIYUAN_AUTH_TOKEN, "") + const envSiyuanCookie = Utils.emptyOrDefault(process.env.VITE_SIYUAN_COOKIE, "") + + const siyuanSetting = getSiyuanSetting() + const siyuanApiUrl = siyuanSetting.value.apiUrl ?? envSiyuanApiUrl + const siyuanAuthToken = siyuanSetting.value.password ?? envSiyuanAuthToken const siyuanConfig = new SiyuanConfig(siyuanApiUrl, siyuanAuthToken) - siyuanConfig.cookie = Utils.emptyOrDefault(process.env.VITE_SIYUAN_COOKIE, "") + siyuanConfig.cookie = siyuanSetting.value.cookie ?? envSiyuanCookie siyuanConfig.fixTitle = true const blogApi = new SiYuanApiAdaptor(siyuanConfig) const kernelApi = new SiyuanKernelApi(siyuanConfig) const { isInChromeExtension } = useSiyuanDevice() - const isStorageViaSiyuanApi = () => { // docker - 在 .env.docker 配置 VITE_DEFAULT_TYPE=siyuan // vercel - 在环境变量配置 VITE_DEFAULT_TYPE=siyuan