@whyour/qinglong 2.21.0-1 → 2.21.0-11

package/AGENTS.md

@@ -1,7 +1,7 @@
 <!-- gitnexus:start -->
 # GitNexus — Code Intelligence
 
-This project is indexed by GitNexus as **qinglong** (2740 symbols, 6583 relationships, 230 execution flows). Use the GitNexus MCP tools to understand code, assess impact, and navigate safely.
+This project is indexed by GitNexus as **qinglong** (2778 symbols, 6698 relationships, 233 execution flows). Use the GitNexus MCP tools to understand code, assess impact, and navigate safely.
 
 > Index stale? Run `node .gitnexus/run.cjs analyze` from the project root — it auto-selects an available runner. No `.gitnexus/run.cjs` yet? `npx gitnexus analyze` (npm 11 crash → `npm i -g gitnexus`; #1939).
 
@@ -40,4 +40,4 @@ This project is indexed by GitNexus as **qinglong** (2740 symbols, 6583 relation
 | Tools, resources, schema reference | `.claude/skills/gitnexus/gitnexus-guide/SKILL.md` |
 | Index, status, clean, wiki CLI commands | `.claude/skills/gitnexus/gitnexus-cli/SKILL.md` |
 
-<!-- gitnexus:end -->
+<!-- gitnexus:end -->

package/back/protos/api.proto

@@ -151,6 +151,7 @@ enum NotificationMode {
   chronocat = 18;
   ntfy = 19;
   wxPusherBot = 20;
+  wxPusherSpt = 21;
 }
 
 message NotificationInfo {
@@ -244,6 +245,8 @@ message NotificationInfo {
   optional string wxPusherBotAppToken = 66;
   optional string wxPusherBotTopicIds = 67;
   optional string wxPusherBotUids = 68;
+
+  optional string wxPusherSptList = 70;
 }
 
 message SystemNotifyRequest {

package/deploy/kubernetes/README.md

@@ -0,0 +1,81 @@
+# Kubernetes deployment
+
+This deploys Qinglong as a single-replica `StatefulSet` with persistent data at `/ql/data`.
+
+```bash
+kubectl apply -k deploy/kubernetes/overlays/local
+kubectl -n qinglong rollout status statefulset/qinglong
+```
+
+Open the panel locally:
+
+```bash
+kubectl -n qinglong port-forward svc/qinglong 5700:5700
+```
+
+Then visit <http://127.0.0.1:5700>.
+
+## Image registry overlays
+
+Use `overlays/example` as the committed template for registry customization:
+
+```yaml
+whyour/qinglong:debian -> registry.example.com/whyour/qinglong:debian
+```
+
+Create `overlays/local/kustomization.yaml` for the actual cluster image. The `local` overlay is ignored by git so private registry names, digests, and credentials-related references stay local.
+
+## Storage
+
+The manifest creates a 5 GiB `ReadWriteOnce` PVC from the cluster's default `StorageClass`.
+If your cluster has no default storage class, add `storageClassName` under:
+
+```yaml
+volumeClaimTemplates:
+  - metadata:
+      name: data
+    spec:
+      storageClassName: your-storage-class
+```
+
+Keep `replicas: 1`. Qinglong stores state in the persistent data directory, including SQLite files, so multiple replicas should not share the same data volume.
+
+## Ingress example
+
+If you expose Qinglong through an Ingress path other than `/`, set `QlBaseUrl` to the same path with leading and trailing slashes.
+
+```yaml
+env:
+  - name: QlBaseUrl
+    value: "/qinglong/"
+```
+
+Example Ingress:
+
+```yaml
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: qinglong
+  namespace: qinglong
+spec:
+  rules:
+    - host: qinglong.example.com
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: qinglong
+                port:
+                  number: 5700
+```
+
+## Maintenance commands
+
+```bash
+kubectl -n qinglong logs -f statefulset/qinglong
+kubectl -n qinglong exec -it statefulset/qinglong -- ql check
+kubectl -n qinglong exec -it statefulset/qinglong -- ql update
+```

package/deploy/kubernetes/base/kustomization.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - qinglong.yaml

package/deploy/kubernetes/base/qinglong.yaml

@@ -0,0 +1,95 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: qinglong
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: qinglong
+  namespace: qinglong
+  labels:
+    app.kubernetes.io/name: qinglong
+spec:
+  type: ClusterIP
+  selector:
+    app.kubernetes.io/name: qinglong
+  ports:
+    - name: http
+      port: 5700
+      targetPort: http
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: qinglong
+  namespace: qinglong
+  labels:
+    app.kubernetes.io/name: qinglong
+spec:
+  serviceName: qinglong
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: qinglong
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: qinglong
+    spec:
+      securityContext:
+        fsGroup: 5432
+        fsGroupChangePolicy: OnRootMismatch
+      containers:
+        - name: qinglong
+          image: whyour/qinglong:debian
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: QlBaseUrl
+              value: "/"
+            - name: TZ
+              value: Asia/Shanghai
+          ports:
+            - name: http
+              containerPort: 5700
+          readinessProbe:
+            httpGet:
+              path: /api/health
+              port: http
+            initialDelaySeconds: 20
+            periodSeconds: 10
+            timeoutSeconds: 3
+            failureThreshold: 6
+          livenessProbe:
+            httpGet:
+              path: /api/health
+              port: http
+            initialDelaySeconds: 60
+            periodSeconds: 20
+            timeoutSeconds: 3
+            failureThreshold: 6
+          startupProbe:
+            httpGet:
+              path: /api/health
+              port: http
+            periodSeconds: 5
+            timeoutSeconds: 3
+            failureThreshold: 60
+          resources:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+            limits:
+              memory: 1Gi
+          volumeMounts:
+            - name: data
+              mountPath: /ql/data
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      spec:
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: 5Gi

package/deploy/kubernetes/overlays/example/kustomization.yaml

@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+images:
+  - name: whyour/qinglong
+    newName: registry.example.com/whyour/qinglong
+    newTag: debian

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@whyour/qinglong",
   "packageManager": "pnpm@8.3.1",
-  "version": "2.21.0-1",
+  "version": "2.21.0-11",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",
@@ -21,9 +21,7 @@
     "panel": "npm run build:back && node static/build/app.js",
     "gen:proto": "protoc --experimental_allow_proto3_optional --plugin=./node_modules/.bin/protoc-gen-ts_proto ./back/protos/*.proto --ts_proto_out=./ --ts_proto_opt=outputServices=grpc-js,env=node,esModuleInterop=true,snakeToCamel=false",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
-    "postinstall": "max setup 2>/dev/null || true",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
+    "postinstall": "max setup 2>/dev/null || true"
   },
   "gitHooks": {
     "pre-commit": "lint-staged"

package/sample/config.sample.sh

@@ -241,14 +241,19 @@ export NTFY_PASSWORD=""
 export NTFY_ACTIONS=""
 
 ## 21. wxPusher
-## 官方文档: https://wxpusher.zjiecode.com/docs/
-## 管理后台: https://wxpusher.zjiecode.com/admin/
+### 方式一：标准发送（更强大）
+#### 官方文档: 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=""
+### 方式二：极简发送（最简单，简单好用，一键配置，更推荐） 
+#### wxPusher 的 SPT（极简推送），扫码获取 https://wxpusher.zjiecode.com/docs/#/?id=spt
+#### 多个用英文逗号,分隔，最多10个；与上面的 appToken 方式二选一即可
+export WXPUSHER_SPT_LIST=""
 
 ## 22. 自定义通知
 ## 自定义通知 接收回调的URL

package/sample/notify.js

@@ -147,11 +147,16 @@ const push_config = {
   NTFY_PASSWORD: '', // 推送用户密码,可选
   NTFY_ACTIONS: '', // 推送用户动作,可选
 
+  // 方式一：标准发送（更强大）
   // 官方文档: 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 至少配置一个才行
+  // 方式二：极简发送（最简单，简单好用，一键配置，更推荐） 
+  // wxPusher 的 SPT（极简推送），扫码获取 https://wxpusher.zjiecode.com/docs/#/?id=spt
+  // 多个用英文逗号,分隔，最多10个；与上面的 appToken 方式二选一即可
+  WXPUSHER_SPT_LIST: '', // wxpusher 的 SPT（极简推送），多个用英文逗号,分隔，最多10个
 
   // 官方文档: https://openilink.com/docs/hub/apps
   OPENILINK_APP_TOKEN: '', // OpeniLink 的 app_token，在 OpeniLink Hub 后台安装 App 后获取
@@ -1431,6 +1436,64 @@ function wxPusherNotify(text, desp) {
   });
 }
 
+function wxPusherSptNotify(text, desp) {
+  return new Promise((resolve) => {
+    const { WXPUSHER_SPT_LIST } = push_config;
+    if (WXPUSHER_SPT_LIST) {
+      // 处理 SPT，将逗号分隔的字符串转为数组
+      const spts = WXPUSHER_SPT_LIST.split(',')
+        .map((spt) => spt.trim())
+        .filter((spt) => spt);
+
+      if (!spts.length) {
+        console.log('wxpusher SPT 不能为空!!');
+        return resolve();
+      }
+      if (spts.length > 10) {
+        console.log('wxpusher SPT 最多支持 10 个!!');
+        return resolve();
+      }
+
+      const body = {
+        content: `<h1>${text}</h1><br/><div style='white-space: pre-wrap;'>${desp}</div>`,
+        summary: text,
+        contentType: 2,
+        // 单个 SPT 用 spt，多个用 sptList
+        ...(spts.length === 1 ? { spt: spts[0] } : { sptList: spts }),
+      };
+
+      const options = {
+        url: 'https://wxpusher.zjiecode.com/api/send/message/simple-push',
+        body: JSON.stringify(body),
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        timeout,
+      };
+
+      $.post(options, (err, resp, data) => {
+        try {
+          if (err) {
+            console.log('wxpusher SPT 发送通知消息失败！\n', err);
+          } else {
+            if (data.code === 1000) {
+              console.log('wxpusher SPT 发送通知消息完成！');
+            } else {
+              console.log(`wxpusher SPT 发送通知消息异常：${data.msg}`);
+            }
+          }
+        } catch (e) {
+          $.logErr(e, resp);
+        } finally {
+          resolve(data);
+        }
+      });
+    } else {
+      resolve();
+    }
+  });
+}
+
 function openiLinkNotify(text, desp) {
   return new Promise((resolve) => {
     const { OPENILINK_APP_TOKEN, OPENILINK_HUB_URL, OPENILINK_CONTEXT_TOKEN } =
@@ -1609,6 +1672,7 @@ async function sendNotify(text, desp, params = {}) {
     qmsgNotify(text, desp), // 自定义通知
     ntfyNotify(text, desp), // Ntfy
     wxPusherNotify(text, desp), // wxpusher
+    wxPusherSptNotify(text, desp), // wxpusher SPT
     openiLinkNotify(text, desp), // OpeniLink
   ]);
 }

package/sample/notify.py

@@ -133,9 +133,16 @@ push_config = {
     'NTFY_PASSWORD': '',                # 推送用户密码,可选
     'NTFY_ACTIONS': '',                 # 推送用户动作,可选
 
+    ### 方式一：标准发送（更强大）
+    #### 官方文档: https://wxpusher.zjiecode.com/docs/
+    #### 管理后台: https://wxpusher.zjiecode.com/admin/
     '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 至少配置一个才行
+    ### 方式二：极简发送（最简单，简单好用，一键配置，更推荐） 
+    #### wxPusher 的 SPT（极简推送），扫码获取 https://wxpusher.zjiecode.com/docs/#/?id=spt
+    #### 多个用英文逗号,分隔，最多10个；与上面的 appToken 方式二选一即可
+    'WXPUSHER_SPT_LIST': '',            # wxpusher 的 SPT（极简推送），多个用英文逗号,分隔，最多10个 官方文档: https://wxpusher.zjiecode.com/docs/#/?id=spt
 
     'OPENILINK_APP_TOKEN': '',          # OpeniLink 的 app_token，在 OpeniLink Hub 后台安装 App 后获取 官方文档: https://openilink.com/docs/hub/apps
     'OPENILINK_HUB_URL': '',            # OpeniLink Hub 地址，默认为 https://hub.openilink.com，自建 Hub 时填写自己的地址
@@ -902,6 +909,53 @@ def wxpusher_bot(title: str, content: str) -> None:
         print(f"wxpusher 推送失败！错误信息：{response.get('msg')}")
 
 
+def wxpusher_spt(title: str, content: str) -> None:
+    """
+    通过 wxpusher 极简推送（SPT）推送消息。
+    支持的环境变量:
+    - WXPUSHER_SPT_LIST: SPT, 多个用英文逗号,分隔, 最多10个
+    """
+    if not push_config.get("WXPUSHER_SPT_LIST"):
+        return
+
+    # 处理 SPT，将逗号分隔的字符串转为数组
+    spts = [
+        spt.strip()
+        for spt in push_config.get("WXPUSHER_SPT_LIST").split(",")
+        if spt.strip()
+    ]
+
+    if not spts:
+        print("wxpusher 服务的 WXPUSHER_SPT_LIST 不能为空!!")
+        return
+    if len(spts) > 10:
+        print("wxpusher 服务的 WXPUSHER_SPT_LIST 最多支持 10 个!!")
+        return
+
+    print("wxpusher SPT 服务启动")
+
+    url = "https://wxpusher.zjiecode.com/api/send/message/simple-push"
+
+    data = {
+        "content": f"<h1>{title}</h1><br/><div style='white-space: pre-wrap;'>{content}</div>",
+        "summary": title,
+        "contentType": 2,
+    }
+    # 单个 SPT 用 spt，多个用 sptList
+    if len(spts) == 1:
+        data["spt"] = spts[0]
+    else:
+        data["sptList"] = spts
+
+    headers = {"Content-Type": "application/json"}
+    response = requests.post(url=url, json=data, headers=headers).json()
+
+    if response.get("code") == 1000:
+        print("wxpusher SPT 推送成功！")
+    else:
+        print(f"wxpusher SPT 推送失败！错误信息：{response.get('msg')}")
+
+
 def openilink(title: str, content: str) -> None:
     """
     通过 OpeniLink 推送消息。
@@ -1104,6 +1158,8 @@ def add_notify_function():
         push_config.get("WXPUSHER_TOPIC_IDS") or push_config.get("WXPUSHER_UIDS")
     ):
         notify_function.append(wxpusher_bot)
+    if push_config.get("WXPUSHER_SPT_LIST"):
+        notify_function.append(wxpusher_spt)
     if push_config.get("OPENILINK_APP_TOKEN"):
         notify_function.append(openilink)
     if not notify_function:

package/shell/api.sh

@@ -141,13 +141,19 @@ update_cron() {
   local logPath="$4"
   local lastExecutingTime="${5:-0}"
   local runningTime="${6:-0}"
+  local exitCode="${7:-}"
   local currentTimeStamp=$(date +%s)
+  local dataRaw="{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\",\"last_execution_time\":$lastExecutingTime,\"last_running_time\":$runningTime"
+  if [[ -n $exitCode ]]; then
+    dataRaw="${dataRaw},\"exit_code\":$exitCode"
+  fi
+  dataRaw="${dataRaw}}"
   local api=$(
     curl -s --noproxy "*" "http://localhost:${ql_port}/open/crons/status?t=$currentTimeStamp" \
       -X 'PUT' \
       -H "Authorization: Bearer ${__ql_token__}" \
       -H "Content-Type: application/json;charset=UTF-8" \
-      --data-raw "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\",\"last_execution_time\":$lastExecutingTime,\"last_running_time\":$runningTime}" \
+      --data-raw "$dataRaw" \
       --compressed
   )
   code=$(echo "$api" | jq -r .code)

package/shell/share.sh

@@ -414,7 +414,7 @@ handle_task_end() {
   [[ "$diff_time" == 0 ]] && diff_time=1
 
   if [[ $ID ]]; then
-    local error=$(update_cron "\"$ID\"" "1" "$$" "$log_path" "$begin_timestamp" "$diff_time")
+    local error=$(update_cron "\"$ID\"" "1" "$$" "$log_path" "$begin_timestamp" "$diff_time" "$exit_code")
     if [[ $error ]]; then
       error_message=", 状态更新失败(${error})"
     fi

package/static/build/api/cron.js

@@ -247,8 +247,8 @@ exports.default = (app) => {
         const logger = typedi_1.Container.get('logger');
         try {
             const cronService = typedi_1.Container.get(cron_1.default);
-            const data = await cronService.log(req.params.id);
-            return res.send({ code: 200, data });
+            const result = await cronService.log(req.params.id);
+            return res.send({ code: 200, data: result.content, logStatus: result.status });
         }
         catch (e) {
             return next(e);
@@ -340,6 +340,7 @@ exports.default = (app) => {
             log_path: celebrate_1.Joi.string().optional().allow(null),
             last_running_time: celebrate_1.Joi.number().optional().allow(null),
             last_execution_time: celebrate_1.Joi.number().optional().allow(null),
+            exit_code: celebrate_1.Joi.number().optional().allow(null),
         }),
     }), async (req, res, next) => {
         try {
@@ -360,7 +361,6 @@ exports.default = (app) => {
             const instances = await runningInstance_1.RunningInstanceModel.findAll({
                 where: {
                     cron_id: req.params.id,
-                    status: runningInstance_1.InstanceStatus.running,
                 },
                 order: [['started_at', 'DESC']],
                 raw: true,

package/static/build/api/dashboard.js

@@ -10,6 +10,8 @@ const cronStats_1 = require("../data/cronStats");
 const runningInstance_1 = require("../data/runningInstance");
 const dayjs_1 = __importDefault(require("dayjs"));
 const os_1 = __importDefault(require("os"));
+const lodash_1 = require("lodash");
+const i18n_1 = require("../shared/i18n");
 const route = (0, express_1.Router)();
 exports.default = (app) => {
     app.use('/dashboard', route);
@@ -153,7 +155,7 @@ exports.default = (app) => {
             crons.forEach((c) => { nameMap[c.id] = c.name || c.command; });
             const data = rows.map((r, i) => ({
                 rank: i + 1,
-                name: nameMap[Number(r.ref_id)] || `任务#${r.ref_id}`,
+                name: nameMap[Number(r.ref_id)] || (0, i18n_1.tf)('任务#%s', r.ref_id),
                 avgTime: Math.round(Number(r.total_time) / Number(r.run_count)),
                 maxTime: Number(r.max_time),
             }));
@@ -188,7 +190,7 @@ exports.default = (app) => {
             crons.forEach((c) => { nameMap[c.id] = c.name || c.command; });
             const data = rows.map((r, i) => ({
                 rank: i + 1,
-                name: nameMap[Number(r.ref_id)] || `任务#${r.ref_id}`,
+                name: nameMap[Number(r.ref_id)] || (0, i18n_1.tf)('任务#%s', r.ref_id),
                 runCount: Number(r.run_count),
                 avgTime: Math.round(Number(r.total_time) / Number(r.run_count)),
                 successRate: Number(r.run_count) > 0
@@ -232,7 +234,7 @@ exports.default = (app) => {
                 return {
                     instanceId: inst.id,
                     id: inst.cron_id,
-                    name: (cron === null || cron === void 0 ? void 0 : cron.name) || (cron === null || cron === void 0 ? void 0 : cron.command) || `任务#${inst.cron_id}`,
+                    name: (cron === null || cron === void 0 ? void 0 : cron.name) || (cron === null || cron === void 0 ? void 0 : cron.command) || (0, i18n_1.tf)('任务#%s', inst.cron_id),
                     pid: inst.pid,
                     elapsed: inst.started_at ? now - inst.started_at : 0,
                     logPath: inst.log_path,
@@ -257,7 +259,7 @@ exports.default = (app) => {
                     running,
                     idleTasks: idleTasks.map((c) => ({
                         id: c.id,
-                        name: c.name || c.command || `任务#${c.id}`,
+                        name: c.name || c.command || (0, i18n_1.tf)('任务#%s', c.id),
                         lastRun: c.last_execution_time
                             ? dayjs_1.default.unix(c.last_execution_time).format('MM-DD HH:mm')
                             : '-',
@@ -283,7 +285,12 @@ exports.default = (app) => {
                 let rawLabels = c.labels;
                 if (typeof rawLabels === 'string')
                     rawLabels = JSON.parse(rawLabels);
-                const labels = Array.isArray(rawLabels) && rawLabels.length > 0 ? rawLabels : ['未分类'];
+                const labels = Array.isArray(rawLabels)
+                    ? [...new Set(rawLabels.filter((l) => !(0, lodash_1.isEmpty)(l)))]
+                    : [];
+                if (labels.length === 0) {
+                    labels.push((0, i18n_1.t)('未分类'));
+                }
                 const st = statMap[c.id];
                 labels.forEach((label) => {
                     if (!labelMap[label])
@@ -318,7 +325,7 @@ exports.default = (app) => {
                 code: 200,
                 data: {
                     platform: os_1.default.platform(),
-                    uptime: Math.floor(os_1.default.uptime()),
+                    uptime: Math.floor(process.uptime()),
                     memTotal: os_1.default.totalmem(),
                     memFree: os_1.default.freemem(),
                     memUsagePercent: ((1 - os_1.default.freemem() / os_1.default.totalmem()) * 100).toFixed(1),

package/static/build/api/env.js

@@ -47,7 +47,7 @@ exports.default = (app) => {
                 .required()
                 .pattern(/^[a-zA-Z_][0-9a-zA-Z_]*$/),
             remarks: celebrate_1.Joi.string().optional().allow(''),
-            labels: celebrate_1.Joi.array().items(celebrate_1.Joi.string().trim()).optional(),
+            labels: celebrate_1.Joi.array().items(celebrate_1.Joi.string().trim()).optional().allow(null),
         })),
     }), async (req, res, next) => {
         var _a;
@@ -70,7 +70,7 @@ exports.default = (app) => {
             name: celebrate_1.Joi.string().required(),
             remarks: celebrate_1.Joi.string().optional().allow('').allow(null),
             id: celebrate_1.Joi.number().required(),
-            labels: celebrate_1.Joi.array().items(celebrate_1.Joi.string().trim()).optional(),
+            labels: celebrate_1.Joi.array().items(celebrate_1.Joi.string().trim()).optional().allow(null),
         }),
     }), async (req, res, next) => {
         const logger = typedi_1.Container.get('logger');

package/static/build/api/log.js

@@ -10,6 +10,7 @@ const config_1 = __importDefault(require("../config"));
 const i18n_1 = require("../shared/i18n");
 const util_1 = require("../config/util");
 const log_1 = __importDefault(require("../services/log"));
+const runningInstance_1 = require("../data/runningInstance");
 const route = (0, express_1.Router)();
 const blacklist = ['.tmp'];
 exports.default = (app) => {
@@ -38,8 +39,16 @@ exports.default = (app) => {
                     message: (0, i18n_1.t)('暂无权限'),
                 });
             }
+            const logPath = `${req.query.path}/${req.query.file}`;
+            const runningInstance = await runningInstance_1.RunningInstanceModel.findOne({
+                where: { log_path: logPath, status: runningInstance_1.InstanceStatus.running },
+            });
             const content = await (0, util_1.getFileContentByName)(finalPath);
-            res.send({ code: 200, data: (0, util_1.removeAnsi)(content) });
+            res.send({
+                code: 200,
+                data: (0, util_1.removeAnsi)(content),
+                logStatus: runningInstance ? 'running' : undefined,
+            });
         }
         catch (e) {
             return next(e);

package/static/build/api/system.js

@@ -10,6 +10,7 @@ const system_1 = __importDefault(require("../services/system"));
 const celebrate_1 = require("celebrate");
 const user_1 = __importDefault(require("../services/user"));
 const i18n_1 = require("../shared/i18n");
+const auth_1 = require("../shared/auth");
 const util_1 = require("../config/util");
 const dayjs_1 = __importDefault(require("dayjs"));
 const multer_1 = __importDefault(require("multer"));
@@ -32,12 +33,7 @@ exports.default = (app) => {
             const userService = typedi_1.Container.get(user_1.default);
             const authInfo = await userService.getAuthInfo();
             const { version, changeLog, changeLogLink, publishTime } = await (0, util_1.parseVersion)(config_1.default.versionFile);
-            let isInitialized = true;
-            if (Object.keys(authInfo).length === 2 &&
-                authInfo.username === 'admin' &&
-                authInfo.password === 'admin') {
-                isInitialized = false;
-            }
+            const isInitialized = !(0, auth_1.isDefaultAuthInfo)(authInfo);
             res.send({
                 code: 200,
                 data: {
@@ -316,7 +312,10 @@ exports.default = (app) => {
     }), async (req, res, next) => {
         try {
             const userService = typedi_1.Container.get(user_1.default);
-            await userService.resetAuthInfo(req.body);
+            const result = await userService.resetAuthInfo(req.body);
+            if (result) {
+                return res.send(result);
+            }
             res.send({ code: 200, message: (0, i18n_1.t)('更新成功') });
         }
         catch (e) {