fix: 修复思源配置

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",

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