Merge branch 'dev' of github.com:terwer/zhi into dev

terwer · Mar 30, 2024 · 434fd5d · 434fd5d
2 parents 6172bb1 + 2c36a42
commit 434fd5d
Show file tree

Hide file tree

Showing 4 changed files with 190 additions and 3,547 deletions.
diff --git a/libs/zhi-siyuan-api/CHANGELOG.md b/libs/zhi-siyuan-api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # zhi-siyuan-api
 
+## 2.20.0
+
+### Minor Changes
+
+- feat: add picgo timeout field
+
 ## 2.19.1
 
 ### Patch Changes

diff --git a/libs/zhi-siyuan-api/package.json b/libs/zhi-siyuan-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zhi-siyuan-api",
-  "version": "2.19.1",
+  "version": "2.20.0",
   "type": "module",
   "description": "a siyuan-note api including both kernel and client",
   "main": "./dist/index.js",

diff --git a/libs/zhi-siyuan-api/src/lib/config/siyuanConfig.ts b/libs/zhi-siyuan-api/src/lib/config/siyuanConfig.ts
@@ -69,6 +69,11 @@ class SiyuanConfig extends BlogConfig {
    */
   public notebook: string
 
+  /**
+   * PicGo 上传超时时间
+   */
+  public picgoUploadTimeout = 10000
+
   constructor(apiUrl?: string, password?: string) {
     super()
     this.home = "http://127.0.0.1:6806"