@whyour/qinglong 2.17.12-rc.2 → 2.17.13

package/README-en.md

@@ -126,7 +126,7 @@ curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
 npm install -g node-pre-gyp pnpm@8.3.1
 npm install -g @whyour/qinglong
 qinglong
-# Add the environment variables QL_DIR and QL_DATA_DIR when prompted
+# Add the environment variables QL_DIR and QL_DATA_DIR when prompted, QL_DATA_DIR must end with /data.
 export QL_DIR=""
 export QL_DATA_DIR=""
 # Run again

package/README.md

@@ -88,7 +88,7 @@ docker run -dit \
 
 ```bash
 #  curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
-mkdir qinglong
+mkdir qinglong && cd $_
 wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
 
 # 启动
@@ -128,7 +128,7 @@ curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
 npm install -g node-pre-gyp pnpm@8.3.1
 npm install -g @whyour/qinglong
 qinglong
-# 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR
+# 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR，QL_DATA_DIR 必须以 /data 结尾
 export QL_DIR=""
 export QL_DATA_DIR=""
 # 再次执行

package/docker/docker-compose.yml

@@ -1,15 +1,10 @@
-version: '2'
 services:
   web:
-    # alpine 基础镜像版本
-    image: whyour/qinglong:latest
-    # debian-slim 基础镜像版本
-    # image: whyour/qinglong:debian  
+    image: whyour/qinglong:latest # 基于 Debian 的版本：whyour/qinglong:debian  
     volumes:
       - ./data:/ql/data
     ports:
-      - "0.0.0.0:5700:5700"
+      - "5700:5700"
     environment:
-      # 部署路径非必须，以斜杠开头和结尾，比如 /test/
-      QlBaseUrl: '/'
+      QlBaseUrl: '/' # 部署路径非必须，以斜杠开头和结尾，比如 /test/
     restart: unless-stopped

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "2.17.12-rc.2",
+  "version": "2.17.13",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",
@@ -73,61 +73,59 @@
     }
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.8.13",
+    "@grpc/grpc-js": "^1.12.3",
     "@otplib/preset-default": "^12.0.1",
-    "@sentry/node": "^8.26.0",
-    "body-parser": "^1.19.2",
-    "celebrate": "^15.0.1",
-    "chokidar": "^3.5.3",
+    "@sentry/node": "^8.42.0",
+    "body-parser": "^1.20.3",
+    "celebrate": "^15.0.3",
+    "chokidar": "^4.0.1",
     "cors": "^2.8.5",
-    "cron-parser": "^4.2.1",
-    "cross-spawn": "^7.0.3",
-    "dayjs": "^1.11.2",
-    "dotenv": "^16.0.0",
-    "express": "^4.17.3",
-    "express-jwt": "^6.1.1",
-    "express-rate-limit": "^7.0.0",
-    "express-urlrewrite": "^1.4.0",
+    "cron-parser": "^4.9.0",
+    "cross-spawn": "^7.0.6",
+    "dayjs": "^1.11.13",
+    "dotenv": "^16.4.6",
+    "express": "^4.21.1",
+    "express-jwt": "^8.4.1",
+    "express-rate-limit": "^7.4.1",
+    "express-urlrewrite": "^2.0.3",
     "form-data": "^4.0.0",
     "got": "^11.8.2",
     "hpagent": "^1.2.0",
-    "http-proxy-middleware": "^2.0.6",
+    "http-proxy-middleware": "^3.0.3",
     "iconv-lite": "^0.6.3",
     "js-yaml": "^4.1.0",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
     "multer": "1.4.5-lts.1",
     "nedb": "^1.8.0",
     "node-schedule": "^2.1.0",
-    "nodemailer": "^6.7.2",
+    "nodemailer": "^6.9.16",
     "p-queue-cjs": "7.3.4",
-    "protobufjs": "^7.3.0",
+    "protobufjs": "^7.4.0",
     "pstree.remy": "^1.1.8",
-    "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.25.5",
-    "serve-handler": "^6.1.3",
+    "reflect-metadata": "^0.2.2",
+    "sequelize": "^6.37.5",
+    "serve-handler": "^6.1.6",
     "sockjs": "^0.3.24",
     "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
-    "toad-scheduler": "^1.6.0",
+    "toad-scheduler": "^3.0.1",
     "typedi": "^0.10.0",
-    "uuid": "^8.3.2",
-    "winston": "^3.6.0",
-    "winston-daily-rotate-file": "^4.7.1",
-    "yargs": "^17.3.1",
-    "tough-cookie": "^4.0.0",
+    "uuid": "^11.0.3",
+    "winston": "^3.17.0",
+    "winston-daily-rotate-file": "^5.0.0",
     "request-ip": "3.3.0",
     "ip2region": "2.3.0"
   },
   "devDependencies": {
     "moment": "2.30.1",
-    "@ant-design/icons": "^4.7.0",
+    "@ant-design/icons": "^5.0.1",
     "@ant-design/pro-layout": "6.38.22",
     "@codemirror/view": "^6.34.1",
     "@codemirror/state": "^6.4.1",
     "@monaco-editor/react": "4.2.1",
-    "@react-hook/resize-observer": "^1.2.6",
+    "@react-hook/resize-observer": "^2.0.2",
     "react-router-dom": "6.26.1",
-    "@sentry/react": "^8.26.0",
+    "@sentry/react": "^8.42.0",
     "@types/body-parser": "^1.19.2",
     "@types/cors": "^2.8.12",
     "@types/cross-spawn": "^6.0.2",
@@ -153,16 +151,16 @@
     "@types/request-ip": "0.0.41",
     "@uiw/codemirror-extensions-langs": "^4.21.9",
     "@uiw/react-codemirror": "^4.21.9",
-    "@umijs/max": "^4.0.72",
+    "@umijs/max": "^4.3.36",
     "@umijs/ssr-darkreader": "^4.9.45",
     "ahooks": "^3.7.8",
     "ansi-to-react": "^6.1.6",
     "antd": "^4.24.8",
-    "antd-img-crop": "^4.2.3",
+    "antd-img-crop": "^4.23.0",
     "axios": "^1.4.0",
     "compression-webpack-plugin": "9.2.0",
     "concurrently": "^7.0.0",
-    "react-hotkeys-hook": "^4.4.1",
+    "react-hotkeys-hook": "^4.6.1",
     "file-saver": "2.0.2",
     "lint-staged": "^13.0.3",
     "monaco-editor": "0.33.0",
@@ -173,14 +171,14 @@
     "qrcode.react": "^1.0.1",
     "query-string": "^7.1.1",
     "rc-tween-one": "^3.0.6",
-    "rc-virtual-list": "3.5.3",
-    "react": "18.2.0",
+    "rc-virtual-list": "3.15.0",
+    "react": "18.3.1",
     "react-copy-to-clipboard": "^5.1.0",
     "react-diff-viewer": "^3.1.1",
-    "react-dnd": "^14.0.2",
-    "react-dnd-html5-backend": "^14.0.0",
-    "react-dom": "18.2.0",
-    "react-intl-universal": "^2.6.21",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
+    "react-dom": "18.3.1",
+    "react-intl-universal": "^2.12.0",
     "react-split-pane": "^0.1.92",
     "sockjs-client": "^1.6.0",
     "ts-node": "^10.9.2",
@@ -189,7 +187,6 @@
     "typescript": "5.2.2",
     "vh-check": "^2.0.5",
     "virtualizedtableforantd4": "1.3.0",
-    "webpack": "^5.70.0",
     "yorkie": "^2.0.0"
   }
 }

package/sample/config.sample.sh

@@ -117,6 +117,16 @@ export PUSH_PLUS_TOKEN=""
 ## 下方填写您的一对多推送的 "群组编码" ，（一对多推送下面->您的群组(如无则新建)->群组编码）
 ## 1. 需订阅者扫描二维码 2、如果您是创建群组所属人，也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送
 export PUSH_PLUS_USER=""
+## 发送模板，支持html,txt,json,markdown,cloudMonitor,jenkins,route,pay
+export PUSH_PLUS_TEMPLATE="html"
+## 发送渠道，支持wechat,webhook,cp,mail,sms
+export PUSH_PLUS_CHANNEL="wechat"
+## webhook编码，可在pushplus公众号上扩展配置出更多渠道
+export PUSH_PLUS_WEBHOOK=""
+## 发送结果回调地址，会把推送最终结果通知到这个地址上
+export PUSH_PLUS_CALLBACKURL=""
+## 好友令牌，微信公众号渠道填写好友令牌，企业微信渠道填写企业微信用户id
+export PUSH_PLUS_TO=""
 
 ## 9. 微加机器人
 ## 官方网站：http://www.weplusbot.com
@@ -220,8 +230,17 @@ export NTFY_URL=""
 export NTFY_TOPIC=""
 export NTFY_PRIORITY="3"
 
-
-## 21. 自定义通知
+## 21. wxPusher
+## 官方文档: https://wxpusher.zjiecode.com/docs/
+## 管理后台: https://wxpusher.zjiecode.com/admin/
+## wxPusher 的 appToken
+export WXPUSHER_APP_TOKEN=""
+## wxPusher 的 topicIds，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
+export WXPUSHER_TOPIC_IDS=""
+## wxPusher 的 用户ID，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
+export WXPUSHER_UIDS=""
+
+## 22. 自定义通知
 ## 自定义通知 接收回调的URL
 export WEBHOOK_URL=""
 ## WEBHOOK_BODY 和 WEBHOOK_HEADERS 多个参数时，直接换行或者使用 $'\n' 连接多行字符串，比如 export dd="line 1"$'\n'"line 2"

package/sample/notify.js

@@ -40,9 +40,15 @@ const push_config = {
   CHAT_URL: '', // synology chat url
   CHAT_TOKEN: '', // synology chat token
 
-  // 官方文档：http://www.pushplus.plus/
-  PUSH_PLUS_TOKEN: '', // push+ 微信推送的用户令牌
-  PUSH_PLUS_USER: '', // push+ 微信推送的群组编码
+  // 官方文档：https://www.pushplus.plus/
+  PUSH_PLUS_TOKEN: '', // pushplus 推送的用户令牌
+  PUSH_PLUS_USER: '', // pushplus 推送的群组编码
+  PUSH_PLUS_TEMPLATE: 'html',       // pushplus 发送模板，支持html,txt,json,markdown,cloudMonitor,jenkins,route,pay
+  PUSH_PLUS_CHANNEL: 'wechat',      // pushplus 发送渠道，支持wechat,webhook,cp,mail,sms
+  PUSH_PLUS_WEBHOOK: '',            // pushplus webhook编码，可在pushplus公众号上扩展配置出更多渠道
+  PUSH_PLUS_CALLBACKURL: '',        // pushplus 发送结果回调地址，会把推送最终结果通知到这个地址上
+  PUSH_PLUS_TO: '',                // pushplus 好友令牌，微信公众号渠道填写好友令牌，企业微信渠道填写企业微信用户id
+
 
   // 微加机器人，官方网站：https://www.weplusbot.com/
   WE_PLUS_BOT_TOKEN: '', // 微加机器人的用户令牌
@@ -99,6 +105,12 @@ const push_config = {
   NTFY_URL: '', // ntfy地址,如https://ntfy.sh,默认为https://ntfy.sh
   NTFY_TOPIC: '', // ntfy的消息应用topic
   NTFY_PRIORITY: '3', // 推送消息优先级,默认为3
+
+  // 官方文档: https://wxpusher.zjiecode.com/docs/
+  // 管理后台: https://wxpusher.zjiecode.com/admin/
+  WXPUSHER_APP_TOKEN: '', // wxpusher 的 appToken
+  WXPUSHER_TOPIC_IDS: '', // wxpusher 的 主题ID，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
+  WXPUSHER_UIDS: '', // wxpusher 的 用户ID，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
 };
 
 for (const key in push_config) {
@@ -765,7 +777,7 @@ function iGotNotify(text, desp, params = {}) {
 
 function pushPlusNotify(text, desp) {
   return new Promise((resolve) => {
-    const { PUSH_PLUS_TOKEN, PUSH_PLUS_USER } = push_config;
+    const { PUSH_PLUS_TOKEN, PUSH_PLUS_USER, PUSH_PLUS_TEMPLATE, PUSH_PLUS_CHANNEL, PUSH_PLUS_WEBHOOK, PUSH_PLUS_CALLBACKURL, PUSH_PLUS_TO } = push_config;
     if (PUSH_PLUS_TOKEN) {
       desp = desp.replace(/[\n\r]/g, '<br>'); // 默认为html, 不支持plaintext
       const body = {
@@ -773,6 +785,11 @@ function pushPlusNotify(text, desp) {
         title: `${text}`,
         content: `${desp}`,
         topic: `${PUSH_PLUS_USER}`,
+        template: `${PUSH_PLUS_TEMPLATE}`,
+        channel: `${PUSH_PLUS_CHANNEL}`,
+        webhook: `${PUSH_PLUS_WEBHOOK}`,
+        callbackUrl: `${PUSH_PLUS_CALLBACKURL}`,
+        to: `${PUSH_PLUS_TO}`
       };
       const options = {
         url: `https://www.pushplus.plus/send`,
@@ -786,7 +803,7 @@ function pushPlusNotify(text, desp) {
         try {
           if (err) {
             console.log(
-              `Push+ 发送${
+              `pushplus 发送${
                 PUSH_PLUS_USER ? '一对多' : '一对一'
               }通知消息失败😞\n`,
               err,
@@ -794,13 +811,13 @@ function pushPlusNotify(text, desp) {
           } else {
             if (data.code === 200) {
               console.log(
-                `Push+ 发送${
+                `pushplus 发送${
                   PUSH_PLUS_USER ? '一对多' : '一对一'
-                }通知消息完成🎉\n`,
+                }通知请求成功🎉，可根据流水号查询推送结果：${data.data}\n注意：请求成功并不代表推送成功，如未收到消息，请到pushplus官网使用流水号查询推送最终结果`,
               );
             } else {
               console.log(
-                `Push+ 发送${
+                `pushplus 发送${
                   PUSH_PLUS_USER ? '一对多' : '一对一'
                 }通知消息异常 ${data.msg}\n`,
               );
@@ -1235,6 +1252,70 @@ function ntfyNotify(text, desp) {
   });
 }
 
+function wxPusherNotify(text, desp) {
+  return new Promise((resolve) => {
+    const { WXPUSHER_APP_TOKEN, WXPUSHER_TOPIC_IDS, WXPUSHER_UIDS } = push_config;
+    if (WXPUSHER_APP_TOKEN) {
+      // 处理topic_ids，将分号分隔的字符串转为数组
+      const topicIds = WXPUSHER_TOPIC_IDS ? WXPUSHER_TOPIC_IDS.split(';')
+        .map(id => id.trim())
+        .filter(id => id)
+        .map(id => parseInt(id)) : [];
+
+      // 处理uids，将分号分隔的字符串转为数组
+      const uids = WXPUSHER_UIDS ? WXPUSHER_UIDS.split(';')
+        .map(uid => uid.trim())
+        .filter(uid => uid) : [];
+
+      // topic_ids uids 至少有一个
+      if (!topicIds.length && !uids.length) {
+        console.log("wxpusher 服务的 WXPUSHER_TOPIC_IDS 和 WXPUSHER_UIDS 至少设置一个!!\n取消推送");
+        return resolve();
+      }
+
+      const body = {
+        appToken: WXPUSHER_APP_TOKEN,
+        content: `<h1>${text}</h1><br/><div style='white-space: pre-wrap;'>${desp}</div>`,
+        summary: text,
+        contentType: 2,
+        topicIds: topicIds,
+        uids: uids,
+        verifyPayType: 0
+      };
+
+      const options = {
+        url: 'https://wxpusher.zjiecode.com/api/send/message',
+        body: JSON.stringify(body),
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        timeout
+      };
+
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('wxpusher发送通知消息失败！\n', err);
+          } else {
+            if (data.code === 1000) {
+              console.log('wxpusher发送通知消息完成！');
+            } else {
+              console.log(`wxpusher发送通知消息异常：${data.msg}`);
+            }
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
+    } else {
+      console.log('wxpusher 服务的 WXPUSHER_APP_TOKEN 未设置!!\n取消推送');
+      resolve();
+    }
+  });
+}
+
 
 function parseString(input, valueFormatFn) {
   const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
@@ -1365,6 +1446,7 @@ async function sendNotify(text, desp, params = {}) {
     webhookNotify(text, desp), // 自定义通知
     qmsgNotify(text, desp), // 自定义通知
     ntfyNotify(text, desp), // Ntfy
+    wxPusherNotify(text, desp), // wxpusher
   ]);
 }
 

package/sample/notify.py

@@ -72,8 +72,13 @@ push_config = {
     'CHAT_URL': '',                     # synology chat url
     'CHAT_TOKEN': '',                   # synology chat token
 
-    'PUSH_PLUS_TOKEN': '',              # push+ 微信推送的用户令牌
-    'PUSH_PLUS_USER': '',               # push+ 微信推送的群组编码
+    'PUSH_PLUS_TOKEN': '',              # pushplus 推送的用户令牌
+    'PUSH_PLUS_USER': '',               # pushplus 推送的群组编码
+    'PUSH_PLUS_TEMPLATE': 'html',       # pushplus 发送模板，支持html,txt,json,markdown,cloudMonitor,jenkins,route,pay
+    'PUSH_PLUS_CHANNEL': 'wechat',      # pushplus 发送渠道，支持wechat,webhook,cp,mail,sms
+    'PUSH_PLUS_WEBHOOK': '',            # pushplus webhook编码，可在pushplus公众号上扩展配置出更多渠道
+    'PUSH_PLUS_CALLBACKURL': '',        # pushplus 发送结果回调地址，会把推送最终结果通知到这个地址上
+    'PUSH_PLUS_TO': '',                 # pushplus 好友令牌，微信公众号渠道填写好友令牌，企业微信渠道填写企业微信用户id
 
     'WE_PLUS_BOT_TOKEN': '',            # 微加机器人的用户令牌
     'WE_PLUS_BOT_RECEIVER': '',         # 微加机器人的消息接收者
@@ -121,6 +126,10 @@ push_config = {
     'NTFY_URL': '',                     # ntfy地址,如https://ntfy.sh
     'NTFY_TOPIC': '',                   # ntfy的消息应用topic
     'NTFY_PRIORITY':'3',                # 推送消息优先级,默认为3
+
+    'WXPUSHER_APP_TOKEN': '',           # wxpusher 的 appToken 官方文档: https://wxpusher.zjiecode.com/docs/ 管理后台: https://wxpusher.zjiecode.com/admin/
+    'WXPUSHER_TOPIC_IDS': '',           # wxpusher 的 主题ID，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
+    'WXPUSHER_UIDS': '',                # wxpusher 的 用户ID，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
 }
 # fmt: on
 
@@ -364,26 +373,35 @@ def chat(title: str, content: str) -> None:
 
 def pushplus_bot(title: str, content: str) -> None:
     """
-    通过 push+ 推送消息。
+    通过 pushplus 推送消息。
     """
     if not push_config.get("PUSH_PLUS_TOKEN"):
         print("PUSHPLUS 服务的 PUSH_PLUS_TOKEN 未设置!!\n取消推送")
         return
     print("PUSHPLUS 服务启动")
 
-    url = "http://www.pushplus.plus/send"
+    url = "https://www.pushplus.plus/send"
     data = {
         "token": push_config.get("PUSH_PLUS_TOKEN"),
         "title": title,
         "content": content,
         "topic": push_config.get("PUSH_PLUS_USER"),
+        "template": push_config.get("PUSH_PLUS_TEMPLATE"),
+        "channel": push_config.get("PUSH_PLUS_CHANNEL"),
+        "webhook": push_config.get("PUSH_PLUS_WEBHOOK"),
+        "callbackUrl": push_config.get("PUSH_PLUS_CALLBACKURL"),
+        "to": push_config.get("PUSH_PLUS_TO")
     }
     body = json.dumps(data).encode(encoding="utf-8")
     headers = {"Content-Type": "application/json"}
     response = requests.post(url=url, data=body, headers=headers).json()
 
-    if response["code"] == 200:
-        print("PUSHPLUS 推送成功！")
+    code = response["code"]
+    if code == 200:
+        print("PUSHPLUS 推送请求成功，可根据流水号查询推送结果:"+ response["data"])
+        print("注意：请求成功并不代表推送成功，如未收到消息，请到pushplus官网使用流水号查询推送最终结果")
+    elif code == 900 or code == 903 or code == 905 or code == 999 :
+        print(response["msg"])
 
     else:
         url_old = "http://pushplus.hxtrip.com/send"
@@ -821,6 +839,57 @@ def ntfy(title: str, content: str) -> None:
     else:
         print("Ntfy 推送失败！错误信息：", response.text)
 
+
+def wxpusher_bot(title: str, content: str) -> None:
+    """
+    通过 wxpusher 推送消息。
+    支持的环境变量:
+    - WXPUSHER_APP_TOKEN: appToken
+    - WXPUSHER_TOPIC_IDS: 主题ID, 多个用英文分号;分隔
+    - WXPUSHER_UIDS: 用户ID, 多个用英文分号;分隔
+    """
+    if not push_config.get("WXPUSHER_APP_TOKEN"):
+        print("wxpusher 服务的 WXPUSHER_APP_TOKEN 未设置!!\n取消推送")
+        return
+    
+
+    url = "https://wxpusher.zjiecode.com/api/send/message"
+    
+    # 处理topic_ids和uids，将分号分隔的字符串转为数组
+    topic_ids = []
+    if push_config.get("WXPUSHER_TOPIC_IDS"):
+        topic_ids = [int(id.strip()) for id in push_config.get("WXPUSHER_TOPIC_IDS").split(";") if id.strip()]
+    
+    uids = []
+    if push_config.get("WXPUSHER_UIDS"):
+        uids = [uid.strip() for uid in push_config.get("WXPUSHER_UIDS").split(";") if uid.strip()]
+
+    # topic_ids uids 至少有一个
+    if not topic_ids and not uids:
+        print("wxpusher 服务的 WXPUSHER_TOPIC_IDS 和 WXPUSHER_UIDS 至少设置一个!!\n取消推送")
+        return
+
+    print("wxpusher 服务启动")
+
+    data = {
+        "appToken": push_config.get("WXPUSHER_APP_TOKEN"),
+        "content": f"<h1>{title}</h1><br/><div style='white-space: pre-wrap;'>{content}</div>",
+        "summary": title,
+        "contentType": 2,
+        "topicIds": topic_ids,
+        "uids": uids,
+        "verifyPayType": 0
+    }
+    
+    headers = {"Content-Type": "application/json"}
+    response = requests.post(url=url, json=data, headers=headers).json()
+
+    if response.get("code") == 1000:
+        print("wxpusher 推送成功！")
+    else:
+        print(f"wxpusher 推送失败！错误信息：{response.get('msg')}")
+
+
 def parse_headers(headers):
     if not headers:
         return {}
@@ -983,6 +1052,8 @@ def add_notify_function():
         notify_function.append(custom_notify)
     if push_config.get("NTFY_TOPIC"):
         notify_function.append(ntfy)
+    if push_config.get("WXPUSHER_APP_TOKEN") and (push_config.get("WXPUSHER_TOPIC_IDS") or push_config.get("WXPUSHER_UIDS")):
+        notify_function.append(wxpusher_bot)
     if not notify_function:
         print(f"无推送渠道，请检查通知变量是否正确")
     return notify_function

package/shell/start.sh

@@ -23,7 +23,12 @@ if [[ ! $QL_DIR ]]; then
 fi
 
 if [[ ! $QL_DATA_DIR ]]; then
-  echo -e "请先手动设置数据存储目录 export QL_DATA_DIR 环境变量，目录必须以斜杠开头的绝对路径，并手动添加到系统环境变量"
+  echo -e "请先手动设置数据存储目录 export QL_DATA_DIR 环境变量，目录必须以斜杠开头的绝对路径，并且以 /data 结尾，例如 /ql/data 并手动添加到系统环境变量"
+  exit 1
+fi
+
+if [[ $QL_DATA_DIR != */data ]]; then
+  echo -e "QL_DATA_DIR 必须以 /data 结尾，例如 /ql/data，如果有历史数据，请新建 data 目录，把历史数据放到 data 目录中"
   exit 1
 fi
 

package/static/build/config/util.js

@@ -173,11 +173,14 @@ function getPlatform(userAgent) {
     else if (testUa(/ios|iphone|ipad|ipod|iwatch/g)) {
         system = 'ios'; // ios系统
     }
+    else if (testUa(/openharmony/g)) {
+        system = 'openharmony'; // openharmony系统
+    }
     let platform = 'desktop';
     if (system === 'windows' || system === 'macos' || system === 'linux') {
         platform = 'desktop';
     }
-    else if (system === 'android' || system === 'ios' || testUa(/mobile/g)) {
+    else if (system === 'android' || system === 'ios' || system === 'openharmony' || testUa(/mobile/g)) {
         platform = 'mobile';
     }
     return platform;

package/static/build/data/notify.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NtfyNotification = exports.LarkNotification = exports.WebhookNotification = exports.ChronocatNotification = exports.PushMeNotification = exports.EmailNotification = exports.WePlusBotNotification = exports.PushPlusNotification = exports.IGotNotification = exports.AibotkNotification = exports.WeWorkAppNotification = exports.WeWorkBotNotification = exports.DingtalkBotNotification = exports.TelegramBotNotification = exports.BarkNotification = exports.ChatNotification = exports.PushDeerNotification = exports.ServerChanNotification = exports.GoCqHttpBotNotification = exports.GotifyNotification = exports.NotificationMode = void 0;
+exports.WxPusherBotNotification = exports.NtfyNotification = exports.LarkNotification = exports.WebhookNotification = exports.ChronocatNotification = exports.PushMeNotification = exports.EmailNotification = exports.WePlusBotNotification = exports.PushPlusNotification = exports.IGotNotification = exports.AibotkNotification = exports.WeWorkAppNotification = exports.WeWorkBotNotification = exports.DingtalkBotNotification = exports.TelegramBotNotification = exports.BarkNotification = exports.ChatNotification = exports.PushDeerNotification = exports.ServerChanNotification = exports.GoCqHttpBotNotification = exports.GotifyNotification = exports.NotificationMode = void 0;
 var NotificationMode;
 (function (NotificationMode) {
     NotificationMode["gotify"] = "gotify";
@@ -23,6 +23,7 @@ var NotificationMode;
     NotificationMode["webhook"] = "webhook";
     NotificationMode["chronocat"] = "Chronocat";
     NotificationMode["ntfy"] = "ntfy";
+    NotificationMode["wxPusherBot"] = "wxPusherBot";
 })(NotificationMode || (exports.NotificationMode = NotificationMode = {}));
 class NotificationBaseInfo {
 }
@@ -137,6 +138,11 @@ class PushPlusNotification extends NotificationBaseInfo {
         super(...arguments);
         this.pushPlusToken = '';
         this.pushPlusUser = '';
+        this.pushPlusTemplate = '';
+        this.pushplusChannel = '';
+        this.pushplusWebhook = '';
+        this.pushplusCallbackUrl = '';
+        this.pushplusTo = '';
     }
 }
 exports.PushPlusNotification = PushPlusNotification;
@@ -202,4 +208,13 @@ class NtfyNotification extends NotificationBaseInfo {
     }
 }
 exports.NtfyNotification = NtfyNotification;
+class WxPusherBotNotification extends NotificationBaseInfo {
+    constructor() {
+        super(...arguments);
+        this.wxPusherBotAppToken = '';
+        this.wxPusherBotTopicIds = '';
+        this.wxPusherBotUids = '';
+    }
+}
+exports.WxPusherBotNotification = WxPusherBotNotification;
 //# sourceMappingURL=notify.js.map

package/static/build/loaders/express.js

@@ -31,7 +31,7 @@ const body_parser_1 = __importDefault(require("body-parser"));
 const cors_1 = __importDefault(require("cors"));
 const api_1 = __importDefault(require("../api"));
 const config_1 = __importDefault(require("../config"));
-const express_jwt_1 = __importStar(require("express-jwt"));
+const express_jwt_1 = require("express-jwt");
 const promises_1 = __importDefault(require("fs/promises"));
 const util_1 = require("../config/util");
 const typedi_1 = __importDefault(require("typedi"));
@@ -52,11 +52,11 @@ exports.default = ({ app }) => {
         target: `http://0.0.0.0:${config_1.default.publicPort}/api`,
         changeOrigin: true,
         pathRewrite: { '/api/public': '' },
-        logProvider: () => logger_1.default,
+        logger: logger_1.default,
     }));
     app.use(body_parser_1.default.json({ limit: '50mb' }));
     app.use(body_parser_1.default.urlencoded({ limit: '50mb', extended: true }));
-    app.use((0, express_jwt_1.default)({
+    app.use((0, express_jwt_1.expressjwt)({
         secret: config_1.default.secret,
         algorithms: ['HS384'],
     }).unless({

package/static/build/loaders/update.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const body_parser_1 = __importDefault(require("body-parser"));
 const celebrate_1 = require("celebrate");
 const cors_1 = __importDefault(require("cors"));
-const express_jwt_1 = __importDefault(require("express-jwt"));
+const express_jwt_1 = require("express-jwt");
 const typedi_1 = __importDefault(require("typedi"));
 const config_1 = __importDefault(require("../config"));
 const system_1 = __importDefault(require("../services/system"));
@@ -16,7 +16,7 @@ exports.default = ({ app }) => {
     app.use((0, cors_1.default)());
     app.use(body_parser_1.default.json({ limit: '50mb' }));
     app.use(body_parser_1.default.urlencoded({ limit: '50mb', extended: true }));
-    app.use((0, express_jwt_1.default)({
+    app.use((0, express_jwt_1.expressjwt)({
         secret: config_1.default.secret,
         algorithms: ['HS384'],
     }));

package/static/build/schedule/index.js

@@ -19,7 +19,6 @@ server.bindAsync(`0.0.0.0:${config_1.default.cronPort}`, grpc_js_1.ServerCredent
     if (err) {
         throw err;
     }
-    server.start();
     logger_1.default.debug(`✌️ 定时服务启动成功！`);
     console.debug(`✌️ 定时服务启动成功！`);
     (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');