fix: ##1461 support picgo for halo2

package.json

@@ -66,10 +66,8 @@
     "cross-fetch": "^3.1.8",
     "crypto-js": "^4.2.0",
     "element-plus": "^2.8.7",
-    "gray-matter": "^4.0.3",
     "iframe-resizer": "^5.3.2",
     "js-base64": "^3.7.7",
-    "js-yaml": "^4.1.0",
     "katex": "^0.16.11",
     "lodash-es": "^4.17.21",
     "pinia": "^2.2.6",
@@ -92,7 +90,7 @@
     "zhi-lib-base": "^0.8.0",
     "zhi-notion-markdown": "^0.1.4",
     "zhi-siyuan-api": "^2.23.0",
-    "zhi-siyuan-picgo": "1.11.5",
+    "zhi-siyuan-picgo": "1.11.6",
     "zhi-xmlrpc-middleware": "^0.6.21"
   },
   "packageManager": "[email protected]"

src/adaptors/api/halo/haloUtils.ts

@@ -23,9 +23,6 @@
  * questions.
  */
 
-import * as yaml from "js-yaml"
-import * as matter from "gray-matter"
-
 /**
  * Halo 平台工具类
  *
@@ -34,27 +31,6 @@ import * as matter from "gray-matter"
  * @since 1.15.0
  */
 class HaloUtils {
-  private static options = {
-    engines: {
-      yaml: {
-        parse: (input: string) => yaml.load(input) as object,
-        stringify: (data: object) => {
-          return yaml.dump(data, {
-            styles: { "!!null": "empty" },
-          })
-        },
-      },
-    },
-  }
-
-  public static readMatter(content: string) {
-    return matter(content, this.options)
-  }
-
-  public static mergeMatter(content: string, data: object) {
-    return matter.stringify(content, data, this.options)
-  }
-
   /**
    * 将正文 h1-h6的标签加上 id，例如 <h1 xxx>标题1</h1> 转换成 <h1 id="标题1">标题1</h1>
    *

src/adaptors/web/haloweb/useHalowebWeb.ts

@@ -70,10 +70,12 @@ const useHalowebWeb = async (key?: string, newCfg?: HalowebConfig) => {
       const middlewareUrl = Utils.emptyOrDefault(process.env.VITE_MIDDLEWARE_URL, LEGENCY_SHARED_PROXT_MIDDLEWARE)
       const url = new URL(dynCfg.authUrl)
       cfg = new HalowebConfig(url.origin, middlewareUrl)
+      cfg.picbedService = PicbedServiceTypeEnum.Bundled
       logger.debug("Configuration is empty, using default environment variables.")
     } else {
       logger.info("Using configuration from settings...")
     }
+    // 下面是强制设置的配置
     const middlewareUrl = Utils.emptyOrDefault(process.env.VITE_MIDDLEWARE_URL, LEGENCY_SHARED_PROXT_MIDDLEWARE)
     if (StrUtil.isEmptyString(cfg.middlewareUrl)) {
       cfg.middlewareUrl = middlewareUrl
@@ -95,7 +97,6 @@ const useHalowebWeb = async (key?: string, newCfg?: HalowebConfig) => {
   // picbed service
   cfg.picgoPicbedSupported = true
   cfg.bundledPicbedSupported = true
-  cfg.picbedService = PicbedServiceTypeEnum.Bundled
   const webApi = new HalowebWebAdaptor(appInstance, cfg)
 
   return {