Add explicit permissions to publish job for security

Co-authored-by: whyour <22700758+whyour@users.noreply.github.com>

.github/workflows/build-docker-image.yml

@@ -7,15 +7,19 @@ on:
     branches:
       - "master"
       - "develop"
+      - "debian"
+      - "debian-dev"
     tags:
       - "v*"
+  schedule:
+    - cron: "00 20 * * *"
   workflow_dispatch:
 
 jobs:
   code_gitlab:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: Yikun/hub-mirror-action@master
@@ -30,7 +34,7 @@ jobs:
   code_gitee:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: Yikun/hub-mirror-action@master
@@ -45,12 +49,12 @@ jobs:
   build-static:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v4
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
         with:
           version: "8.3.1"
 
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
         with:
           cache: "pnpm"
 
@@ -76,12 +80,12 @@ jobs:
           git config --local user.email 'github-actions[bot]@users.noreply.github.com'
           git commit --allow-empty -m "copy static at $(date +'%Y-%m-%d %H:%M:%S')"
           git push --force --quiet "https://${{ secrets.API_TOKEN }}@${GITHUB_REPO}.git" ${GITHUB_BRANCH}:${GITHUB_BRANCH}
-
+  
   static_gitlab:
     needs: build-static
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: Yikun/hub-mirror-action@master
@@ -97,7 +101,7 @@ jobs:
     needs: build-static
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: Yikun/hub-mirror-action@master
@@ -110,7 +114,6 @@ jobs:
           force_update: true
 
   build:
-    if: ${{ !startsWith(github.ref, 'refs/tags/') }}
     needs: build-static
 
     runs-on: ubuntu-22.04
@@ -120,11 +123,11 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v4
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
         with:
           version: "8.3.1"
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
         with:
           cache: "pnpm"
 
@@ -160,13 +163,20 @@ jobs:
           images: |
             ${{ github.repository }}
             ghcr.io/${{ github.repository }}
+          # generate Docker tags based on the following events/attributes
+          #   nightly, master, pr-2, 1.2.3, 1.2, 1
           flavor: |
             latest=false
           tags: |
-            type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'develop') }}
+            type=schedule,pattern=nightly
+            type=edge
+            type=ref,event=pr
+            type=ref,event=branch,enable=${{ github.ref != format('refs/heads/{0}', 'master') }}
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
-            type=raw,value=${{ steps.version.outputs.version }},enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+            type=raw,value=${{ steps.version.outputs.version }}-debian,enable=${{ github.ref == format('refs/heads/{0}', 'debian') || github.ref == format('refs/heads/{0}', 'debian-dev') }}
             type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -183,22 +193,21 @@ jobs:
             QL_BRANCH=${{ github.ref_name }}
             SOURCE_COMMIT=${{ github.sha }}
           network: host
-          # linux/s390x npm 暂不可用
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/386
+          platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
           context: .
           file: ./docker/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=whyour/qinglong:cache
-          cache-to: type=registry,ref=whyour/qinglong:cache,mode=max
+          cache-from: type=registry,ref=whyour/qinglong:cache-debian
+          cache-to: type=registry,ref=whyour/qinglong:cache-debian,mode=max
 
       - name: Image digest
         run: |
           echo ${{ steps.docker_build.outputs.digest }}
 
   build310:
-    if: ${{ github.ref_name == 'master' }}
+    if: ${{ github.ref_name == 'debian' }}
     needs: build-static
 
     runs-on: ubuntu-22.04
@@ -208,11 +217,11 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v4
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
         with:
           version: "8.3.1"
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
         with:
           cache: "pnpm"
 
@@ -256,17 +265,46 @@ jobs:
             QL_BRANCH=${{ github.ref_name }}
             SOURCE_COMMIT=${{ github.sha }}
           network: host
-          # linux/s390x npm 暂不可用
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/386
+          platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
           context: .
           file: ./docker/310.Dockerfile
           push: true
           tags: |
-            whyour/qinglong:python3.10
-            whyour/qinglong:${{ steps.version.outputs.version }}-python3.10
-          cache-from: type=registry,ref=whyour/qinglong:cache-python3.10
-          cache-to: type=registry,ref=whyour/qinglong:cache-python3.10,mode=max
+            whyour/qinglong:debian-python3.10
+            whyour/qinglong:${{ steps.version.outputs.version }}-debian-python3.10
+          cache-from: type=registry,ref=whyour/qinglong:cache-debian-python3.10
+          cache-to: type=registry,ref=whyour/qinglong:cache-debian-python3.10,mode=max
 
       - name: Image digest
         run: |
           echo ${{ steps.docker_build_310.outputs.digest }}
+
+  publish:
+    if: ${{ github.ref_name == 'debian' }}
+    needs: build
+
+    runs-on: ubuntu-latest
+    
+    permissions:
+      contents: read
+    
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+          version: "8.3.1"
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: "pnpm"
+
+      - name: build front and back
+        run: |
+          pnpm install --frozen-lockfile
+          pnpm build:front
+          pnpm build:back
+
+      - name: publich npm package
+        run: |
+          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
+          npm publish

back/api/dependence.ts

@@ -16,7 +16,7 @@ export default (app: Router) => {
           searchValue: Joi.string().optional().allow(''),
           type: Joi.string().optional().allow(''),
           status: Joi.string().optional().allow(''),
-        }).unknown(true),
+        }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');

back/api/script.ts

@@ -29,7 +29,7 @@ export default (app: Router) => {
     celebrate({
       query: Joi.object({
         path: Joi.string().optional().allow(''),
-      }).unknown(true),
+      }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
@@ -79,7 +79,7 @@ export default (app: Router) => {
       query: Joi.object({
         path: Joi.string().optional().allow(''),
         file: Joi.string().required(),
-      }).unknown(true),
+      }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       try {
@@ -103,7 +103,7 @@ export default (app: Router) => {
       }),
       query: Joi.object({
         path: Joi.string().optional().allow(''),
-      }).unknown(true),
+      }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       try {
@@ -129,8 +129,7 @@ export default (app: Router) => {
         content: Joi.string().optional().allow(''),
         originFilename: Joi.string().optional().allow(''),
         directory: Joi.string().optional().allow(''),
-        file: Joi.string().optional().allow(''),
-      }).unknown(true),
+      }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       try {
@@ -176,7 +175,6 @@ export default (app: Router) => {
           path,
           `${originFilename.replace(/\//g, '')}`,
         );
-        await fs.mkdir(path, { recursive: true });
         const filePath = join(path, `${filename.replace(/\//g, '')}`);
         const fileExists = await fileExist(filePath);
         if (fileExists) {

back/api/subscription.ts

@@ -3,7 +3,7 @@ import { Container } from 'typedi';
 import { Logger } from 'winston';
 import SubscriptionService from '../services/subscription';
 import { celebrate, Joi } from 'celebrate';
-import CronExpressionParser from 'cron-parser';
+import { CronExpressionParser } from 'cron-parser';
 const route = Router();
 
 export default (app: Router) => {

back/api/system.ts

@@ -426,24 +426,6 @@ export default (app: Router) => {
     },
   );
 
-  route.put(
-    '/config/global-ssh-key',
-    celebrate({
-      body: Joi.object({
-        globalSshKey: Joi.string().allow('').allow(null),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const result = await systemService.updateGlobalSshKey(req.body);
-        res.send(result);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
   route.put(
     '/config/dependence-clean',
     celebrate({

back/config/index.ts

@@ -64,19 +64,6 @@ if (!process.env.QL_DIR) {
 
 const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
 
-// Get and normalize QlBaseUrl
-let baseUrl = process.env.QlBaseUrl || '';
-if (baseUrl) {
-  // Ensure it starts with /
-  if (!baseUrl.startsWith('/')) {
-    baseUrl = `/${baseUrl}`;
-  }
-  // Remove trailing slash for consistency in route definitions
-  if (baseUrl.endsWith('/')) {
-    baseUrl = baseUrl.slice(0, -1);
-  }
-}
-
 const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
 
@@ -129,7 +116,6 @@ if (envFound.error) {
 export default {
   ...config,
   jwt: config.jwt,
-  baseUrl,
   rootPath,
   tmpPath,
   dataPath,

back/data/notify.ts

@@ -142,7 +142,6 @@ export class WebhookNotification extends NotificationBaseInfo {
 
 export class LarkNotification extends NotificationBaseInfo {
   public larkKey = '';
-  public larkSecret = '';
 }
 
 export class NtfyNotification extends NotificationBaseInfo {

back/data/system.ts

@@ -38,7 +38,6 @@ export interface SystemConfigInfo {
   pythonMirror?: string;
   linuxMirror?: string;
   timezone?: string;
-  globalSshKey?: string;
 }
 
 export interface LoginLogInfo {

back/loaders/express.ts

@@ -13,35 +13,8 @@ import { isValidToken } from '../shared/auth';
 import path from 'path';
 
 export default ({ app }: { app: Application }) => {
-  // Security: Enable strict routing to prevent case-insensitive path bypass
-  app.set('case sensitive routing', true);
-  app.set('strict routing', true);
   app.set('trust proxy', 'loopback');
   app.use(cors());
-  
-  // Security: Path normalization middleware to prevent case variation attacks
-  app.use((req, res, next) => {
-    const originalPath = req.path;
-    const normalizedPath = originalPath.toLowerCase();
-    
-    // Block requests with case variations on protected paths
-    if (originalPath !== normalizedPath && 
-        (normalizedPath.startsWith('/api/') || normalizedPath.startsWith('/open/'))) {
-      return res.status(400).json({
-        code: 400,
-        message: 'Invalid path format'
-      });
-    }
-    
-    next();
-  });
-  
-  // Rewrite URLs to strip baseUrl prefix if configured
-  // This allows the rest of the app to work without baseUrl awareness
-  if (config.baseUrl) {
-    app.use(rewrite(`${config.baseUrl}/*`, '/$1'));
-  }
-  
   app.get(`${config.api.prefix}/env.js`, serveEnv);
   app.use(`${config.api.prefix}/static`, express.static(config.uploadPath));
 
@@ -56,7 +29,7 @@ export default ({ app }: { app: Application }) => {
       secret: config.jwt.secret,
       algorithms: ['HS384'],
     }).unless({
-      path: [...config.apiWhiteList, /^(\/(?!api\/).*)$/i],
+      path: [...config.apiWhiteList, /^\/(?!api\/).*/],
     }),
   );
 
@@ -71,20 +44,19 @@ export default ({ app }: { app: Application }) => {
   });
 
   app.use(async (req: Request, res, next) => {
-    const pathLower = req.path.toLowerCase();
-    if (!['/open/', '/api/'].some((x) => pathLower.startsWith(x))) {
+    if (!['/open/', '/api/'].some((x) => req.path.startsWith(x))) {
       return next();
     }
 
     const headerToken = getToken(req);
-    if (pathLower.startsWith('/open/')) {
+    if (req.path.startsWith('/open/')) {
       const apps = await shareStore.getApps();
       const doc = apps?.filter((x) =>
         x.tokens?.find((y) => y.value === headerToken),
       )?.[0];
       if (doc && doc.tokens && doc.tokens.length > 0) {
         const currentToken = doc.tokens.find((x) => x.value === headerToken);
-        const keyMatch = pathLower.match(/\/open\/([a-z]+)\/*/);
+        const keyMatch = req.path.match(/\/open\/([a-z]+)\/*/);
         const key = keyMatch && keyMatch[1];
         if (
           doc.scopes.includes(key as any) &&
@@ -119,15 +91,7 @@ export default ({ app }: { app: Application }) => {
   });
 
   app.use(async (req, res, next) => {
-    const pathLower = req.path.toLowerCase();
-    if (
-      ![
-        '/api/user/init',
-        '/api/user/notification/init',
-        '/open/user/init',
-        '/open/user/notification/init',
-      ].includes(req.path)
-    ) {
+    if (!['/api/user/init', '/api/user/notification/init'].includes(req.path)) {
       return next();
     }
     const authInfo =

back/loaders/initData.ts

@@ -13,7 +13,7 @@ import { AuthDataType, SystemModel } from '../data/system';
 import SystemService from '../services/system';
 import UserService from '../services/user';
 import { writeFile, readFile } from 'fs/promises';
-import { createRandomString, fileExist, isDemoEnv, safeJSONParse } from '../config/util';
+import { createRandomString, fileExist, safeJSONParse } from '../config/util';
 import OpenService from '../services/open';
 import { shareStore } from '../shared/store';
 import Logger from './logger';
@@ -50,7 +50,7 @@ export default async () => {
   const [authConfig] = await SystemModel.findOrCreate({
     where: { type: AuthDataType.authConfig },
   });
-  if (!authConfig?.info || isDemoEnv()) {
+  if (!authConfig?.info) {
     let authInfo = {
       username: 'admin',
       password: 'admin',

back/loaders/initTask.ts

@@ -2,7 +2,6 @@ import { Container } from 'typedi';
 import SystemService from '../services/system';
 import ScheduleService, { ScheduleTaskType } from '../services/schedule';
 import SubscriptionService from '../services/subscription';
-import SshKeyService from '../services/sshKey';
 import config from '../config';
 import { fileExist } from '../config/util';
 import { join } from 'path';
@@ -11,7 +10,6 @@ export default async () => {
   const systemService = Container.get(SystemService);
   const scheduleService = Container.get(ScheduleService);
   const subscriptionService = Container.get(SubscriptionService);
-  const sshKeyService = Container.get(SshKeyService);
 
   // 生成内置token
   let tokenCommand = `ts-node-transpile-only ${join(
@@ -59,11 +57,6 @@ export default async () => {
     }
 
     systemService.updateTimezone(data.info);
-    
-    // Apply global SSH key if configured
-    if (data.info.globalSshKey) {
-      await sshKeyService.addGlobalSSHKey(data.info.globalSshKey, 'global');
-    }
   }
 
   await subscriptionService.setSshConfig();

back/loaders/sock.ts

@@ -5,10 +5,9 @@ import SockService from '../services/sock';
 import { getPlatform } from '../config/util';
 import { shareStore } from '../shared/store';
 import { isValidToken } from '../shared/auth';
-import config from '../config';
 
 export default async ({ server }: { server: Server }) => {
-  const echo = sockJs.createServer({ prefix: `${config.baseUrl}/api/ws`, log: () => { } });
+  const echo = sockJs.createServer({ prefix: '/api/ws', log: () => {} });
   const sockService = Container.get(SockService);
 
   echo.on('connection', async (conn) => {

back/protos/api.proto

@@ -231,7 +231,6 @@ message NotificationInfo {
   optional string webhookContentType = 57;
 
   optional string larkKey = 58;
-  optional string larkSecret = 69;
 
   optional string ntfyUrl = 59;
   optional string ntfyTopic = 60;

back/protos/api.ts

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
 //   protoc-gen-ts_proto  v2.6.1
-//   protoc               v3.21.12
+//   protoc               v3.17.3
 // source: back/protos/api.proto
 
 /* eslint-disable */
@@ -382,7 +382,6 @@ export interface NotificationInfo {
   webhookMethod?: string | undefined;
   webhookContentType?: string | undefined;
   larkKey?: string | undefined;
-  larkSecret?: string | undefined;
   ntfyUrl?: string | undefined;
   ntfyTopic?: string | undefined;
   ntfyPriority?: string | undefined;
@@ -2948,7 +2947,6 @@ function createBaseNotificationInfo(): NotificationInfo {
     webhookMethod: undefined,
     webhookContentType: undefined,
     larkKey: undefined,
-    larkSecret: undefined,
     ntfyUrl: undefined,
     ntfyTopic: undefined,
     ntfyPriority: undefined,
@@ -3138,9 +3136,6 @@ export const NotificationInfo: MessageFns<NotificationInfo> = {
     if (message.larkKey !== undefined) {
       writer.uint32(466).string(message.larkKey);
     }
-    if (message.larkSecret !== undefined) {
-      writer.uint32(554).string(message.larkSecret);
-    }
     if (message.ntfyUrl !== undefined) {
       writer.uint32(474).string(message.ntfyUrl);
     }
@@ -3645,14 +3640,6 @@ export const NotificationInfo: MessageFns<NotificationInfo> = {
           message.larkKey = reader.string();
           continue;
         }
-        case 69: {
-          if (tag !== 554) {
-            break;
-          }
-
-          message.larkSecret = reader.string();
-          continue;
-        }
         case 59: {
           if (tag !== 474) {
             break;
@@ -3810,7 +3797,6 @@ export const NotificationInfo: MessageFns<NotificationInfo> = {
       webhookMethod: isSet(object.webhookMethod) ? globalThis.String(object.webhookMethod) : undefined,
       webhookContentType: isSet(object.webhookContentType) ? globalThis.String(object.webhookContentType) : undefined,
       larkKey: isSet(object.larkKey) ? globalThis.String(object.larkKey) : undefined,
-      larkSecret: isSet(object.larkSecret) ? globalThis.String(object.larkSecret) : undefined,
       ntfyUrl: isSet(object.ntfyUrl) ? globalThis.String(object.ntfyUrl) : undefined,
       ntfyTopic: isSet(object.ntfyTopic) ? globalThis.String(object.ntfyTopic) : undefined,
       ntfyPriority: isSet(object.ntfyPriority) ? globalThis.String(object.ntfyPriority) : undefined,
@@ -4004,9 +3990,6 @@ export const NotificationInfo: MessageFns<NotificationInfo> = {
     if (message.larkKey !== undefined) {
       obj.larkKey = message.larkKey;
     }
-    if (message.larkSecret !== undefined) {
-      obj.larkSecret = message.larkSecret;
-    }
     if (message.ntfyUrl !== undefined) {
       obj.ntfyUrl = message.ntfyUrl;
     }
@@ -4103,7 +4086,6 @@ export const NotificationInfo: MessageFns<NotificationInfo> = {
     message.webhookMethod = object.webhookMethod ?? undefined;
     message.webhookContentType = object.webhookContentType ?? undefined;
     message.larkKey = object.larkKey ?? undefined;
-    message.larkSecret = object.larkSecret ?? undefined;
     message.ntfyUrl = object.ntfyUrl ?? undefined;
     message.ntfyTopic = object.ntfyTopic ?? undefined;
     message.ntfyPriority = object.ntfyPriority ?? undefined;

back/protos/cron.ts

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
 //   protoc-gen-ts_proto  v2.6.1
-//   protoc               v3.21.12
+//   protoc               v3.17.3
 // source: back/protos/cron.proto
 
 /* eslint-disable */

back/protos/health.ts

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
 //   protoc-gen-ts_proto  v2.6.1
-//   protoc               v3.21.12
+//   protoc               v3.17.3
 // source: back/protos/health.proto
 
 /* eslint-disable */

back/services/cron.ts

@@ -4,7 +4,7 @@ import config from '../config';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import { exec, execSync } from 'child_process';
 import fs from 'fs/promises';
-import CronExpressionParser from 'cron-parser';
+import { CronExpressionParser } from 'cron-parser';
 import {
   getFileContentByName,
   fileExist,
@@ -29,7 +29,7 @@ import { logStreamManager } from '../shared/logStreamManager';
 
 @Service()
 export default class CronService {
-  constructor(@Inject('logger') private logger: winston.Logger) { }
+  constructor(@Inject('logger') private logger: winston.Logger) {}
 
   private isNodeCron(cron: Crontab) {
     const { schedule, extra_schedules } = cron;
@@ -165,7 +165,7 @@ export default class CronService {
       let cron;
       try {
         cron = await this.getDb({ id });
-      } catch (err) { }
+      } catch (err) {}
       if (!cron) {
         continue;
       }
@@ -467,10 +467,7 @@ export default class CronService {
     for (const doc of docs) {
       // Kill all running instances of this task
       try {
-        if (doc.pid) {
-          await killTask(doc.pid);
-        }
-        const command = doc.command.replace(/\s+/g, ' ').trim();
+        const command = this.makeCommand(doc);
         await killAllTasks(command);
         this.logger.info(
           `[panel][停止所有运行中的任务实例] 任务ID: ${doc.id}, 命令: ${command}`,
@@ -510,7 +507,7 @@ export default class CronService {
         let { id, command, log_name } = cron;
 
         const uniqPath =
-          log_name === '/dev/null' || !log_name
+          log_name === '/dev/null'
             ? await getUniqPath(command, `${id}`)
             : log_name;
         const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
@@ -644,11 +641,7 @@ export default class CronService {
     if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
       command = `${TASK_PREFIX}${tab.command}`;
     }
-    let commandVariable = `real_time=${Boolean(realTime)} no_tee=true ID=${tab.id} `;
-    // Only include log_name if it has a truthy value to avoid passing null/undefined to shell
-    if (tab.log_name) {
-      commandVariable += `log_name=${tab.log_name} `;
-    }
+    let commandVariable = `real_time=${Boolean(realTime)} log_name=${tab.log_name} no_tee=true ID=${tab.id} `;
     if (tab.task_before) {
       commandVariable += `task_before='${tab.task_before
         .replace(/'/g, "'\\''")

back/services/dependence.ts

@@ -107,7 +107,7 @@ export default class DependenceService {
     query: any = {},
   ): Promise<Dependence[]> {
     let condition = query;
-    if (type && DependenceTypes[type] !== undefined) {
+    if (DependenceTypes[type]) {
       condition.type = DependenceTypes[type];
     }
     if (status) {

back/services/env.ts

@@ -13,11 +13,10 @@ import {
   stepPosition,
 } from '../data/env';
 import { writeFileWithLock } from '../shared/utils';
-import { sequelize } from '../data';
 
 @Service()
 export default class EnvService {
-  constructor(@Inject('logger') private logger: winston.Logger) { }
+  constructor(@Inject('logger') private logger: winston.Logger) {}
 
   public async create(payloads: Env[]): Promise<Env[]> {
     const envs = await this.envs();
@@ -147,7 +146,7 @@ export default class EnvService {
     }
     try {
       const result = await this.find(condition, [
-        [sequelize.literal('COALESCE(`isPinned`, 0)'), 'DESC'],
+        ['isPinned', 'DESC'],
         ['position', 'DESC'],
         ['createdAt', 'ASC'],
       ]);

back/services/notify.ts

@@ -550,33 +550,19 @@ export default class NotificationService {
   }
 
   private async lark() {
-    let { larkKey, larkSecret } = this.params;
+    let { larkKey } = this.params;
 
     if (!larkKey.startsWith('http')) {
       larkKey = `https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`;
     }
 
-    const body: Record<string, any> = {
-      msg_type: 'text',
-      content: { text: `${this.title}\n\n${this.content}` },
-    };
-
-    // Add signature if secret is provided
-    // Note: Feishu's signature algorithm uses timestamp+"\n"+secret as the HMAC key
-    // and signs an empty message, which differs from typical HMAC usage
-    if (larkSecret) {
-      const timestamp = Math.floor(Date.now() / 1000).toString();
-      const stringToSign = `${timestamp}\n${larkSecret}`;
-      const hmac = crypto.createHmac('sha256', stringToSign);
-      const sign = hmac.digest('base64');
-      body.timestamp = timestamp;
-      body.sign = sign;
-    }
-
     try {
       const res = await httpClient.post(larkKey, {
         ...this.gotOption,
-        json: body,
+        json: {
+          msg_type: 'text',
+          content: { text: `${this.title}\n\n${this.content}` },
+        },
         headers: { 'Content-Type': 'application/json' },
       });
       if (res.StatusCode === 0 || res.code === 0) {

back/services/sshKey.ts

@@ -131,32 +131,4 @@ export default class SshKeyService {
       }
     }
   }
-
-  public async addGlobalSSHKey(key: string, alias: string): Promise<void> {
-    await this.generatePrivateKeyFile(`~global_${alias}`, key);
-    // Create a global SSH config entry that matches all hosts
-    // This allows the key to be used for any Git repository
-    await this.generateGlobalSshConfig(`~global_${alias}`);
-  }
-
-  public async removeGlobalSSHKey(alias: string): Promise<void> {
-    await this.removePrivateKeyFile(`~global_${alias}`);
-    await this.removeSshConfig(`~global_${alias}`);
-  }
-
-  private async generateGlobalSshConfig(alias: string) {
-    // Create a config that matches all hosts, making this key globally available
-    const config = `Host *\n    IdentityFile ${path.join(
-      this.sshPath,
-      alias,
-    )}\n    StrictHostKeyChecking no\n`;
-    await writeFileWithLock(
-      `${path.join(this.sshPath, `${alias}.config`)}`,
-      config,
-      {
-        encoding: 'utf8',
-        mode: '600',
-      },
-    );
-  }
 }

back/services/system.ts

@@ -530,27 +530,6 @@ export default class SystemService {
     }
   }
 
-  public async updateGlobalSshKey(info: SystemModelInfo) {
-    const oDoc = await this.getSystemConfig();
-    const result = await this.updateAuthDb({
-      ...oDoc,
-      info: { ...oDoc.info, ...info },
-    });
-    
-    // Apply the global SSH key
-    const SshKeyService = require('./sshKey').default;
-    const Container = require('typedi').Container;
-    const sshKeyService = Container.get(SshKeyService);
-    
-    if (info.globalSshKey) {
-      await sshKeyService.addGlobalSSHKey(info.globalSshKey, 'global');
-    } else {
-      await sshKeyService.removeGlobalSSHKey('global');
-    }
-    
-    return { code: 200, data: result };
-  }
-
   public async cleanDependence(type: 'node' | 'python3') {
     if (!type || !['node', 'python3'].includes(type)) {
       return { code: 400, message: '参数错误' };

back/shared/runCron.ts

@@ -15,11 +15,11 @@ export function runCron(cmd: string, cron: ICron): Promise<number | void> {
         });
 
         // Default to single instance mode (0) for backward compatibility
-        const allowSingleInstances =
-          existingCron?.allow_multiple_instances === 0;
+        const allowMultipleInstances =
+          existingCron?.allow_multiple_instances === 1;
 
         if (
-          allowSingleInstances &&
+          !allowMultipleInstances &&
           existingCron &&
           existingCron.pid &&
           (existingCron.status === CrontabStatus.running ||

back/validation/schedule.ts

@@ -1,5 +1,5 @@
 import { Joi } from 'celebrate';
-import CronExpressionParser from 'cron-parser';
+import { CronExpressionParser } from 'cron-parser';
 import { ScheduleType } from '../interface/schedule';
 import path from 'path';
 import config from '../config';
@@ -81,5 +81,5 @@ export const commonCronSchema = {
       'string.max': '日志名称不能超过100个字符',
       'string.unsafePath': '绝对路径必须在日志目录内或使用 /dev/null',
     }),
-  allow_multiple_instances: Joi.number().optional().valid(0, 1).allow(null),
+  allow_multiple_instances: Joi.number().optional().valid(0, 1),
 };

docker/310.Dockerfile

@@ -1,13 +1,18 @@
-FROM python:3.10-alpine3.18 AS builder
-COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
-RUN set -x \
-  && apk update \
-  && apk add nodejs npm git \
-  && npm i -g pnpm@8.3.1 pm2 ts-node \
-  && cd /tmp/build \
-  && pnpm install --prod
+FROM node:22-slim AS nodebuilder
 
-FROM python:3.10-alpine
+FROM python:3.10-slim-bookworm AS builder
+COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
+COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
+COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
+RUN set -x && \
+  ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
+  apt-get update && \
+  apt-get install --no-install-recommends -y libatomic1 && \
+  npm i -g pnpm@8.3.1 && \
+  cd /tmp/build && \
+  pnpm install --prod
+
+FROM python:3.10-slim-bookworm
 
 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
@@ -21,65 +26,78 @@ ENV QL_DIR=/ql \
   SHELL=/bin/bash \
   PS1="\u@\h:\w \$ "
 
-VOLUME /ql/data
-  
-EXPOSE 5700
+ARG QL_UID=5432
+ARG QL_GID=5432
+RUN groupadd -g ${QL_GID} qinglong && \
+    useradd -m -u ${QL_UID} -g ${QL_GID} -s /bin/bash qinglong && \
+    mkdir -p /home/qinglong/bin /home/qinglong/.ssh && \
+    chmod 700 /home/qinglong/.ssh && \
+    chown -R ${QL_UID}:${QL_GID} /home/qinglong
 
-COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
-COPY --from=builder /usr/local/bin/. /usr/local/bin/
+ENV QL_USER=qinglong
+ENV QL_HOME=/home/$QL_USER
 
-RUN set -x \
-  && apk update -f \
-  && apk upgrade \
-  && apk --no-cache add -f bash \
-  coreutils \
-  git \
+COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
+COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
+
+RUN set -x && \
+  ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
+  apt-get update && \
+  apt-get upgrade -y && \
+  apt-get install --no-install-recommends -y git \
   curl \
   wget \
   tzdata \
   perl \
   openssl \
-  nodejs \
+  openssh-client \
   jq \
-  openssh \
   procps \
   netcat-openbsd \
   unzip \
-  npm \
-  && rm -rf /var/cache/apk/* \
-  && apk update \
-  && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-  && echo "Asia/Shanghai" > /etc/timezone \
-  && git config --global user.email "qinglong@users.noreply.github.com" \
-  && git config --global user.name "qinglong" \
-  && git config --global http.postBuffer 524288000 \
-  && rm -rf /root/.cache \
-  && ulimit -c 0
+  libatomic1 && \
+  apt-get clean && \
+  ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
+  echo "Asia/Shanghai" >/etc/timezone && \
+  git config --global user.email "qinglong@users.noreply.github.com" && \
+  git config --global user.name "qinglong" && \
+  git config --global http.postBuffer 524288000 && \
+  npm install -g pnpm@8.3.1 pm2 ts-node && \
+  rm -rf /root/.cache && \
+  rm -rf /root/.npm && \
+  rm -rf /etc/apt/apt.conf.d/docker-clean && \
+  ulimit -c 0
+
+RUN mkdir -p ${QL_DIR} && \
+  chown -R ${QL_UID}:${QL_GID} ${QL_DIR}
+
+USER qinglong
 
 ARG SOURCE_COMMIT
-RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
-  && cd ${QL_DIR} \
-  && cp -f .env.example .env \
-  && chmod 777 ${QL_DIR}/shell/*.sh \
-  && chmod 777 ${QL_DIR}/docker/*.sh \
-  && git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
-  && mkdir -p ${QL_DIR}/static \
-  && cp -rf /static/* ${QL_DIR}/static \
-  && rm -rf /static
+RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
+  cd ${QL_DIR} && \
+  cp -f .env.example .env && \
+  chmod 777 ${QL_DIR}/shell/*.sh && \
+  chmod 777 ${QL_DIR}/docker/*.sh && \
+  git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /tmp/static && \
+  mkdir -p ${QL_DIR}/static && \
+  cp -rf /tmp/static/* ${QL_DIR}/static && \
+  rm -rf /tmp/static
 
 ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
   PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
-  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3 \
-  HOME=/root
+  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
 
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
   NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
   PIP_CACHE_DIR=${PYTHON_HOME}/pip \
   PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
 
 RUN pip3 install --prefix ${PYTHON_HOME} requests
 
-COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
+COPY --chown=qinglong:qinglong --from=builder /tmp/build/node_modules/. /ql/node_modules/
+
+USER root
 
 WORKDIR ${QL_DIR}
 
@@ -87,3 +105,7 @@ HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
   CMD curl -sf --noproxy '*' http://127.0.0.1:5700/api/health || exit 1
 
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]
+
+VOLUME /ql/data
+  
+EXPOSE 5700

docker/Dockerfile

@@ -1,13 +1,18 @@
-FROM python:3.11-alpine3.18 AS builder
-COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
-RUN set -x \
-  && apk update \
-  && apk add nodejs npm git \
-  && npm i -g pnpm@8.3.1 pm2 ts-node \
-  && cd /tmp/build \
-  && pnpm install --prod
+FROM node:22-slim AS nodebuilder
 
-FROM python:3.11-alpine
+FROM python:3.11-slim-bookworm AS builder
+COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
+COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
+COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
+RUN set -x && \
+  ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
+  apt-get update && \
+  apt-get install --no-install-recommends -y libatomic1 && \
+  npm i -g pnpm@8.3.1 && \
+  cd /tmp/build && \
+  pnpm install --prod
+
+FROM python:3.11-slim-bookworm
 
 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
@@ -21,65 +26,78 @@ ENV QL_DIR=/ql \
   SHELL=/bin/bash \
   PS1="\u@\h:\w \$ "
 
-VOLUME /ql/data
-  
-EXPOSE 5700
+ARG QL_UID=5432
+ARG QL_GID=5432
+RUN groupadd -g ${QL_GID} qinglong && \
+    useradd -m -u ${QL_UID} -g ${QL_GID} -s /bin/bash qinglong && \
+    mkdir -p /home/qinglong/bin /home/qinglong/.ssh && \
+    chmod 700 /home/qinglong/.ssh && \
+    chown -R ${QL_UID}:${QL_GID} /home/qinglong
 
-COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
-COPY --from=builder /usr/local/bin/. /usr/local/bin/
+ENV QL_USER=qinglong
+ENV QL_HOME=/home/$QL_USER
 
-RUN set -x \
-  && apk update -f \
-  && apk upgrade \
-  && apk --no-cache add -f bash \
-  coreutils \
-  git \
+COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
+COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
+
+RUN set -x && \
+  ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
+  ln -s /usr/local/lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx && \
+  apt-get update && \
+  apt-get upgrade -y && \
+  apt-get install --no-install-recommends -y git \
   curl \
   wget \
   tzdata \
   perl \
   openssl \
-  nodejs \
+  openssh-client \
   jq \
-  openssh \
   procps \
   netcat-openbsd \
   unzip \
-  npm \
-  && rm -rf /var/cache/apk/* \
-  && apk update \
-  && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-  && echo "Asia/Shanghai" > /etc/timezone \
-  && git config --global user.email "qinglong@users.noreply.github.com" \
-  && git config --global user.name "qinglong" \
-  && git config --global http.postBuffer 524288000 \
-  && rm -rf /root/.cache \
-  && ulimit -c 0
+  libatomic1 && \
+  apt-get clean && \
+  ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
+  echo "Asia/Shanghai" >/etc/timezone && \
+  git config --global user.email "qinglong@users.noreply.github.com" && \
+  git config --global user.name "qinglong" && \
+  git config --global http.postBuffer 524288000 && \
+  npm install -g pnpm@8.3.1 pm2 ts-node && \
+  rm -rf /root/.cache && \
+  rm -rf /root/.npm && \
+  rm -rf /etc/apt/apt.conf.d/docker-clean && \
+  ulimit -c 0
 
+RUN mkdir -p ${QL_DIR} && \
+  chown -R ${QL_UID}:${QL_GID} ${QL_DIR}
+
+USER qinglong
 ARG SOURCE_COMMIT
-RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
-  && cd ${QL_DIR} \
-  && cp -f .env.example .env \
-  && chmod 777 ${QL_DIR}/shell/*.sh \
-  && chmod 777 ${QL_DIR}/docker/*.sh \
-  && git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
-  && mkdir -p ${QL_DIR}/static \
-  && cp -rf /static/* ${QL_DIR}/static \
-  && rm -rf /static
+RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
+  cd ${QL_DIR} && \
+  cp -f .env.example .env && \
+  chmod 777 ${QL_DIR}/shell/*.sh && \
+  chmod 777 ${QL_DIR}/docker/*.sh && \
+  git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /tmp/static && \
+  mkdir -p ${QL_DIR}/static && \
+  cp -rf /tmp/static/* ${QL_DIR}/static && \
+  rm -rf /tmp/static
 
 ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
   PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
-  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3 \
-  HOME=/root
+  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
 
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
   NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
   PIP_CACHE_DIR=${PYTHON_HOME}/pip \
   PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
 
 RUN pip3 install --prefix ${PYTHON_HOME} requests
 
-COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
+COPY --chown=qinglong:qinglong --from=builder /tmp/build/node_modules/. /ql/node_modules/
+
+USER root
 
 WORKDIR ${QL_DIR}
 
@@ -87,3 +105,7 @@ HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
   CMD curl -sf --noproxy '*' http://127.0.0.1:5700/api/health || exit 1
 
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]
+
+VOLUME /ql/data
+  
+EXPOSE 5700

docker/docker-entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export PATH="$HOME/bin:$PATH"
+
 dir_shell=/ql/shell
 . $dir_shell/share.sh
 
@@ -21,11 +23,11 @@ log_with_style() {
 if [ -f /etc/alpine-release ]; then
   if ! grep -q "^options ndots:0" /etc/resolv.conf 2>/dev/null; then
     echo "options ndots:0" >> /etc/resolv.conf
-    log_with_style "INFO" "🔧  0. 已配置 DNS 解析优化 (ndots:0)"
+    log_with_style "INFO" "🔧 已配置 DNS 解析优化 (ndots:0)"
   fi
 fi
 
-log_with_style "INFO" "🚀  1. 检测配置文件..."
+log_with_style "INFO" "🚀 1. 检测配置文件..."
 load_ql_envs
 export_ql_envs
 . $dir_shell/env.sh
@@ -39,16 +41,16 @@ log_with_style "INFO" "⚙️  2. 启动 pm2 服务..."
 reload_pm2
 
 if [[ $AutoStartBot == true ]]; then
-  log_with_style "INFO" "🤖  3. 启动 bot..."
+  log_with_style "INFO" "🤖 3. 启动 bot..."
   nohup ql bot >$dir_log/bot.log 2>&1 &
 fi
 
 if [[ $EnableExtraShell == true ]]; then
-  log_with_style "INFO" "🛠️  4. 执行自定义脚本..."
+  log_with_style "INFO" "🛠️ 4. 执行自定义脚本..."
   nohup ql extra >$dir_log/extra.log 2>&1 &
 fi
 
-log_with_style "SUCCESS" "🎉  容器启动成功!"
+log_with_style "SUCCESS" "🎉 容器启动成功!"
 
 crond -f >/dev/null
 

package.json

@@ -77,7 +77,7 @@
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
-    "multer": "2.1.1",
+    "multer": "1.4.5-lts.1",
     "node-schedule": "^2.1.0",
     "nodemailer": "^6.9.16",
     "p-queue-cjs": "7.3.4",
@@ -118,7 +118,7 @@
     "@types/js-yaml": "^4.0.5",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/lodash": "^4.14.185",
-    "@types/multer": "^2.0.0",
+    "@types/multer": "^1.4.7",
     "@types/node": "^17.0.21",
     "@types/node-schedule": "^1.3.2",
     "@types/nodemailer": "^6.4.4",

pnpm-lock.yaml

@@ -1,5 +1,9 @@
 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
 overrides:
   sqlite3: git+https://github.com/whyour/node-sqlite3.git#v1.0.3
 
@@ -86,8 +90,8 @@ dependencies:
     specifier: ^4.17.21
     version: 4.17.21
   multer:
-    specifier: 2.1.1
-    version: 2.1.1
+    specifier: 1.4.5-lts.1
+    version: 1.4.5-lts.1
   node-schedule:
     specifier: ^2.1.0
     version: 2.1.1
@@ -190,8 +194,8 @@ devDependencies:
     specifier: ^4.14.185
     version: 4.17.13
   '@types/multer':
-    specifier: ^2.0.0
-    version: 2.0.0
+    specifier: ^1.4.7
+    version: 1.4.12
   '@types/node':
     specifier: ^17.0.21
     version: 17.0.45
@@ -3956,8 +3960,8 @@ packages:
     resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==}
     dev: false
 
-  /@types/multer@2.0.0:
-    resolution: {integrity: sha512-C3Z9v9Evij2yST3RSBktxP9STm6OdMc5uR1xF1SGr98uv8dUlAL2hqwrZ3GVB3uyMyiegnscEK6PGtYvNrjTjw==}
+  /@types/multer@1.4.12:
+    resolution: {integrity: sha512-pQ2hoqvXiJt2FP9WQVLPRO+AmiIm/ZYkavPlIQnx282u4ZrVdztx0pkh3jjpQt0Kz+YI0YhSG264y08UJKoUQg==}
     dependencies:
       '@types/express': 4.17.21
     dev: true
@@ -6329,13 +6333,13 @@ packages:
   /concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
-  /concat-stream@2.0.0:
-    resolution: {integrity: sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==}
-    engines: {'0': node >= 6.0}
+  /concat-stream@1.6.2:
+    resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==}
+    engines: {'0': node >= 0.8}
     dependencies:
       buffer-from: 1.1.2
       inherits: 2.0.4
-      readable-stream: 3.6.2
+      readable-stream: 2.3.8
       typedarray: 0.0.6
     dev: false
 
@@ -6432,7 +6436,6 @@ packages:
 
   /core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
-    dev: true
 
   /cors@2.8.5:
     resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
@@ -8285,7 +8288,6 @@ packages:
 
   /glob@10.4.5:
     resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
     hasBin: true
     dependencies:
       foreground-child: 3.3.0
@@ -8298,7 +8300,7 @@ packages:
 
   /glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+    deprecated: Glob versions prior to v9 are no longer supported
     dependencies:
       fs.realpath: 1.0.0
       inflight: 1.0.6
@@ -9169,7 +9171,6 @@ packages:
 
   /isarray@1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
-    dev: true
 
   /isarray@2.0.5:
     resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
@@ -10036,7 +10037,6 @@ packages:
 
   /minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
-    dev: true
 
   /minipass-collect@1.0.2:
     resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==}
@@ -10117,7 +10117,6 @@ packages:
     hasBin: true
     dependencies:
       minimist: 1.2.8
-    dev: true
 
   /mkdirp@1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
@@ -10152,14 +10151,17 @@ packages:
   /ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
-  /multer@2.1.1:
-    resolution: {integrity: sha512-mo+QTzKlx8R7E5ylSXxWzGoXoZbOsRMpyitcht8By2KHvMbf3tjwosZ/Mu/XYU6UuJ3VZnODIrak5ZrPiPyB6A==}
-    engines: {node: '>= 10.16.0'}
+  /multer@1.4.5-lts.1:
+    resolution: {integrity: sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==}
+    engines: {node: '>= 6.0.0'}
     dependencies:
       append-field: 1.0.0
       busboy: 1.6.0
-      concat-stream: 2.0.0
+      concat-stream: 1.6.2
+      mkdirp: 0.5.6
+      object-assign: 4.1.1
       type-is: 1.6.18
+      xtend: 4.0.2
     dev: false
 
   /mz@2.7.0:
@@ -11528,7 +11530,6 @@ packages:
 
   /process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
-    dev: true
 
   /process-okam@0.11.10:
     resolution: {integrity: sha512-p8e5nl6/OCeMalVb9dSojND5B9m/nq64WsyUfRmrTdLMKcNYcDN++/2I8WV1mTQDqrh2PQ6tIIb2A7/A38eSvw==}
@@ -12950,7 +12951,6 @@ packages:
       safe-buffer: 5.1.2
       string_decoder: 1.1.1
       util-deprecate: 1.0.2
-    dev: true
 
   /readable-stream@3.6.2:
     resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
@@ -13221,7 +13221,6 @@ packages:
 
   /safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
-    dev: true
 
   /safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
@@ -13869,7 +13868,6 @@ packages:
     resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
     dependencies:
       safe-buffer: 5.1.2
-    dev: true
 
   /string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
@@ -14154,7 +14152,6 @@ packages:
   /tar@6.2.1:
     resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
     engines: {node: '>=10'}
-    deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
     dependencies:
       chownr: 2.0.0
       fs-minipass: 2.1.0
@@ -15143,7 +15140,6 @@ packages:
   /xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
     engines: {node: '>=0.4'}
-    dev: true
 
   /y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
@@ -15229,7 +15225,3 @@ packages:
       - encoding
       - supports-color
     dev: false
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false

sample/notify.js

@@ -52,7 +52,6 @@ const push_config = {
   DD_BOT_TOKEN: '', // 钉钉机器人的 DD_BOT_TOKEN
 
   FSKEY: '', // 飞书机器人的 FSKEY
-  FSSECRET: '', // 飞书机器人的 FSSECRET，对应安全设置里的签名校验密钥
 
   // 推送到个人QQ：http://127.0.0.1/send_private_msg
   // 群：http://127.0.0.1/send_group_msg
@@ -482,13 +481,9 @@ function tgBotNotify(text, desp) {
         timeout,
       };
       if (TG_PROXY_HOST && TG_PROXY_PORT) {
-        let proxyHost = TG_PROXY_HOST;
-        if (TG_PROXY_AUTH && !TG_PROXY_HOST.includes('@')) {
-          proxyHost = `${TG_PROXY_AUTH}@${TG_PROXY_HOST}`;
-        }
         let agent;
         agent = new ProxyAgent({
-          uri: `http://${proxyHost}:${TG_PROXY_PORT}`,
+          uri: `http://${TG_PROXY_AUTH}${TG_PROXY_HOST}:${TG_PROXY_PORT}`,
         });
         options.dispatcher = agent;
       }
@@ -994,29 +989,11 @@ function aibotkNotify(text, desp) {
 
 function fsBotNotify(text, desp) {
   return new Promise((resolve) => {
-    const { FSKEY, FSSECRET } = push_config;
+    const { FSKEY } = push_config;
     if (FSKEY) {
-      const body = {
-        msg_type: 'text',
-        content: { text: `${text}\n\n${desp}` },
-      };
-
-      // Add signature if secret is provided
-      // Note: Feishu's signature algorithm uses timestamp+"\n"+secret as the HMAC key
-      // and signs an empty message, which differs from typical HMAC usage
-      if (FSSECRET) {
-        const crypto = require('crypto');
-        const timestamp = Math.floor(Date.now() / 1000).toString();
-        const stringToSign = `${timestamp}\n${FSSECRET}`;
-        const hmac = crypto.createHmac('sha256', stringToSign);
-        const sign = hmac.digest('base64');
-        body.timestamp = timestamp;
-        body.sign = sign;
-      }
-
       const options = {
         url: `https://open.feishu.cn/open-apis/bot/v2/hook/${FSKEY}`,
-        json: body,
+        json: { msg_type: 'text', content: { text: `${text}\n\n${desp}` } },
         headers: {
           'Content-Type': 'application/json',
         },
@@ -1285,15 +1262,7 @@ function ntfyNotify(text, desp) {
   }
 
   return new Promise((resolve) => {
-    const {
-      NTFY_URL,
-      NTFY_TOPIC,
-      NTFY_PRIORITY,
-      NTFY_TOKEN,
-      NTFY_USERNAME,
-      NTFY_PASSWORD,
-      NTFY_ACTIONS,
-    } = push_config;
+    const { NTFY_URL, NTFY_TOPIC, NTFY_PRIORITY, NTFY_TOKEN, NTFY_USERNAME, NTFY_PASSWORD, NTFY_ACTIONS } = push_config;
     if (NTFY_TOPIC) {
       const options = {
         url: `${NTFY_URL || 'https://ntfy.sh'}/${NTFY_TOPIC}`,
@@ -1308,8 +1277,7 @@ function ntfyNotify(text, desp) {
       if (NTFY_TOKEN) {
         options.headers['Authorization'] = `Bearer ${NTFY_TOKEN}`;
       } else if (NTFY_USERNAME && NTFY_PASSWORD) {
-        options.headers['Authorization'] =
-          `Basic ${Buffer.from(`${NTFY_USERNAME}:${NTFY_PASSWORD}`).toString('base64')}`;
+        options.headers['Authorization'] = `Basic ${Buffer.from(`${NTFY_USERNAME}:${NTFY_PASSWORD}`).toString('base64')}`;
       }
       if (NTFY_ACTIONS) {
         options.headers['Actions'] = encodeRFC2047(NTFY_ACTIONS);

sample/notify.py

@@ -49,7 +49,6 @@ push_config = {
     'DD_BOT_TOKEN': '',                 # 钉钉机器人的 DD_BOT_TOKEN
 
     'FSKEY': '',                        # 飞书机器人的 FSKEY
-    'FSSECRET': '',                     # 飞书机器人的 FSSECRET，对应安全设置里的签名校验密钥
 
     'GOBOT_URL': '',                    # go-cqhttp
                                         # 推送到个人QQ：http://127.0.0.1/send_private_msg
@@ -234,20 +233,6 @@ def feishu_bot(title: str, content: str) -> None:
 
     url = f'https://open.feishu.cn/open-apis/bot/v2/hook/{push_config.get("FSKEY")}'
     data = {"msg_type": "text", "content": {"text": f"{title}\n\n{content}"}}
-
-    # Add signature if secret is provided
-    # Note: Feishu's signature algorithm uses timestamp+"\n"+secret as the HMAC key
-    # and signs an empty message, which differs from typical HMAC usage
-    if push_config.get("FSSECRET"):
-        timestamp = str(int(time.time()))
-        string_to_sign = f'{timestamp}\n{push_config.get("FSSECRET")}'
-        hmac_code = hmac.new(
-            string_to_sign.encode("utf-8"), digestmod=hashlib.sha256
-        ).digest()
-        sign = base64.b64encode(hmac_code).decode("utf-8")
-        data["timestamp"] = timestamp
-        data["sign"] = sign
-
     response = requests.post(url, data=json.dumps(data)).json()
 
     if response.get("StatusCode") == 0 or response.get("code") == 0:

shell/otask.sh

@@ -92,7 +92,7 @@ run_normal() {
 
   cd $dir_scripts
   local relative_path="${file_param%/*}"
-  if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
+  if [[ ${file_param} != /* ]] && [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then
     cd ${relative_path}
     file_param=${file_param/$relative_path\//}
   fi

shell/preload/sitecustomize.py

@@ -42,7 +42,7 @@ def run():
         os.environ["PYTHONPATH"] = prev_pythonpath
 
         split_str = "__sitecustomize__"
-        file_name = os.path.abspath(sys.argv[0]).replace(f"{os.getenv('dir_scripts')}/", "")
+        file_name = sys.argv[0].replace(f"{os.getenv('dir_scripts')}/", "")
         
         # 创建临时文件路径
         temp_file = f"/tmp/env_{os.getpid()}.json"

src/locales/en-US.json

@@ -104,7 +104,7 @@
   "序号": "Number",
   "备注": "Remarks",
   "更新时间": "Update Time",
-  "创建时间": "Created Time",
+  "创建时间": "Creation Time",
   "确认删除依赖": "Confirm to delete the dependency",
   "确认重新安装": "Confirm to reinstall",
   "确认取消安装": "Confirm to cancel install",
@@ -252,7 +252,7 @@
   "登录日志": "Login Logs",
   "其他设置": "Other Settings",
   "关于": "About",
-  "成功": "Successfully",
+  "成功": "Success",
   "失败": "Failure",
   "登录时间": "Login Time",
   "登录地址": "Login Address",
@@ -389,7 +389,6 @@
   "消息接收人": "message recipient",
   "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版": "Version, you can specify 'pro' for the Professional version and 'personal' for the Personal version. If left blank, it will default to the Professional version.",
   "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "Feishu group bot: https://www.feishu.cn/hc/zh-CN/articles/360024984973",
-  "飞书群组机器人加签密钥，安全设置中开启签名校验后获得": "Feishu group bot signature secret, obtained after enabling signature verification in security settings",
   "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "Email service name, e.g., 126, 163, Gmail, QQ, etc. Supported list: https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
   "邮箱地址": "Email Address",
   "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "The SMTP login password may also be a special passphrase, depending on the specific email service provider's instructions",
@@ -539,19 +538,5 @@
   "单实例模式：定时启动新任务前会自动停止旧任务；多实例模式：允许同时运行多个任务实例": "Single instance mode: automatically stop old task before starting new scheduled task; Multi-instance mode: allow multiple task instances to run simultaneously",
   "请选择实例模式": "Please select instance mode",
   "单实例": "Single Instance",
-  "多实例": "Multi-Instance",
-  "SSH密钥": "SSH Keys",
-  "别名": "Alias",
-  "编辑SSH密钥": "Edit SSH Key",
-  "创建SSH密钥": "Create SSH Key",
-  "更新SSH密钥成功": "SSH key updated successfully",
-  "创建SSH密钥成功": "SSH key created successfully",
-  "请输入SSH密钥别名": "Please enter SSH key alias",
-  "请输入SSH私钥": "Please enter SSH private key",
-  "请输入SSH私钥内容（以 -----BEGIN 开头）": "Please enter SSH private key content (starts with -----BEGIN)",
-  "确认删除SSH密钥": "Confirm to delete SSH key",
-  "批量": "Batch",
-  "全局SSH私钥": "Global SSH Private Key",
-  "用于访问所有私有仓库的全局SSH私钥": "Global SSH private key for accessing all private repositories",
-  "请输入完整的SSH私钥内容": "Please enter the complete SSH private key content"
+  "多实例": "Multi-Instance"
 }

src/locales/zh-CN.json

@@ -389,7 +389,6 @@
   "消息接收人": "消息接收人",
   "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版": "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版",
   "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973",
-  "飞书群组机器人加签密钥，安全设置中开启签名校验后获得": "飞书群组机器人加签密钥，安全设置中开启签名校验后获得",
   "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
   "邮箱地址": "邮箱地址",
   "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定",
@@ -539,19 +538,5 @@
   "单实例模式：定时启动新任务前会自动停止旧任务；多实例模式：允许同时运行多个任务实例": "单实例模式：定时启动新任务前会自动停止旧任务；多实例模式：允许同时运行多个任务实例",
   "请选择实例模式": "请选择实例模式",
   "单实例": "单实例",
-  "多实例": "多实例",
-  "SSH密钥": "SSH密钥",
-  "别名": "别名",
-  "编辑SSH密钥": "编辑SSH密钥",
-  "创建SSH密钥": "创建SSH密钥",
-  "更新SSH密钥成功": "更新SSH密钥成功",
-  "创建SSH密钥成功": "创建SSH密钥成功",
-  "请输入SSH密钥别名": "请输入SSH密钥别名",
-  "请输入SSH私钥": "请输入SSH私钥",
-  "请输入SSH私钥内容（以 -----BEGIN 开头）": "请输入SSH私钥内容（以 -----BEGIN 开头）",
-  "确认删除SSH密钥": "确认删除SSH密钥",
-  "批量": "批量",
-  "全局SSH私钥": "全局SSH私钥",
-  "用于访问所有私有仓库的全局SSH私钥": "用于访问所有私有仓库的全局SSH私钥",
-  "请输入完整的SSH私钥内容": "请输入完整的SSH私钥内容"
+  "多实例": "多实例"
 }

src/pages/crontab/modal.tsx

@@ -3,7 +3,7 @@ import config from '@/utils/config';
 import { request } from '@/utils/http';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { Button, Form, Input, Modal, Select, Space, message } from 'antd';
-import CronExpressionParser from 'cron-parser';
+import { CronExpressionParser } from 'cron-parser';
 import { useEffect, useState } from 'react';
 import intl from 'react-intl-universal';
 import { getScheduleType, scheduleTypeMap } from './const';
@@ -91,14 +91,10 @@ const CronModal = ({
             { required: true },
             {
               validator: (_, value) => {
-                try {
-                  if (!value || CronExpressionParser.parse(value).hasNext()) {
-                    return Promise.resolve();
-                  }
-                  return Promise.reject(intl.get('Cron表达式格式有误'));
-                } catch (e) {
-                  return Promise.reject(intl.get('Cron表达式格式有误'));
+                if (!value || CronExpressionParser.parse(value).hasNext()) {
+                  return Promise.resolve();
                 }
+                return Promise.reject(intl.get('Cron表达式格式有误'));
               },
             },
           ]}

src/pages/script/saveModal.tsx

@@ -16,7 +16,7 @@ const SaveModal = ({
 
   const handleOk = async (values: any) => {
     setLoading(true);
-    const payload = { ...values, originFilename: file.title, content: file.content };
+    const payload = { ...file, ...values, originFilename: file.title };
     request
       .post(`${config.apiPrefix}scripts`, payload)
       .then(({ code, data }) => {

src/pages/setting/other.tsx

@@ -30,7 +30,6 @@ const dataMap = {
   'log-remove-frequency': 'logRemoveFrequency',
   'cron-concurrency': 'cronConcurrency',
   timezone: 'timezone',
-  'global-ssh-key': 'globalSshKey',
 };
 
 const exportModules = [
@@ -55,7 +54,6 @@ const Other = ({
     logRemoveFrequency?: number | null;
     cronConcurrency?: number | null;
     timezone?: string | null;
-    globalSshKey?: string | null;
   }>();
   const [form] = Form.useForm();
   const [exportLoading, setExportLoading] = useState(false);
@@ -310,32 +308,6 @@ const Other = ({
             </Button>
           </Input.Group>
         </Form.Item>
-        <Form.Item 
-          label={intl.get('全局SSH私钥')} 
-          name="globalSshKey"
-          tooltip={intl.get('用于访问所有私有仓库的全局SSH私钥')}
-        >
-          <Input.Group compact>
-            <Input.TextArea
-              value={systemConfig?.globalSshKey || ''}
-              style={{ width: 264 }}
-              autoSize={{ minRows: 3, maxRows: 8 }}
-              placeholder={intl.get('请输入完整的SSH私钥内容')}
-              onChange={(e) => {
-                setSystemConfig({ ...systemConfig, globalSshKey: e.target.value });
-              }}
-            />
-          </Input.Group>
-          <Button
-            type="primary"
-            onClick={() => {
-              updateSystemConfig('global-ssh-key');
-            }}
-            style={{ width: 264, marginTop: 8 }}
-          >
-            {intl.get('确认')}
-          </Button>
-        </Form.Item>
         <Form.Item label={intl.get('语言')} name="lang">
           <Select
             defaultValue={localStorage.getItem('lang') || ''}

src/pages/subscription/modal.tsx

@@ -12,7 +12,7 @@ import {
 } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
-import CronExpressionParser from 'cron-parser';
+import { CronExpressionParser } from 'cron-parser';
 import isNil from 'lodash/isNil';
 
 const { Option } = Select;
@@ -378,17 +378,13 @@ const SubscriptionModal = ({
             { required: true },
             {
               validator: (rule, value) => {
-                try {
-                  if (
-                    scheduleType === 'interval' ||
-                    !value ||
-                    CronExpressionParser.parse(value).hasNext()
-                  ) {
-                    return Promise.resolve();
-                  } else {
-                    return Promise.reject(intl.get('Subscription表达式格式有误'));
-                  }
-                } catch (e) {
+                if (
+                  scheduleType === 'interval' ||
+                  !value ||
+                  CronExpressionParser.parse(value).hasNext()
+                ) {
+                  return Promise.resolve();
+                } else {
                   return Promise.reject(intl.get('Subscription表达式格式有误'));
                 }
               },

src/utils/config.ts

@@ -395,12 +395,6 @@ export default {
         ),
         required: true,
       },
-      {
-        label: 'larkSecret',
-        tip: intl.get(
-          '飞书群组机器人加签密钥，安全设置中开启签名校验后获得',
-        ),
-      },
     ],
     email: [
       {

src/utils/http.tsx

@@ -84,12 +84,12 @@ let _request = axios.create({
 });
 
 const apiWhiteList = [
-  `${config.baseUrl}api/user/login`,
-  `${config.baseUrl}open/auth/token`,
-  `${config.baseUrl}api/user/two-factor/login`,
-  `${config.baseUrl}api/system`,
-  `${config.baseUrl}api/user/init`,
-  `${config.baseUrl}api/user/notification/init`,
+  '/api/user/login',
+  '/open/auth/token',
+  '/api/user/two-factor/login',
+  '/api/system',
+  '/api/user/init',
+  '/api/user/notification/init',
 ];
 
 _request.interceptors.request.use((_config) => {

src/utils/index.ts

@@ -1,6 +1,6 @@
 import intl from 'react-intl-universal';
 import { LANG_MAP, LOG_END_SYMBOL } from './const';
-import CronExpressionParser from 'cron-parser';
+import { CronExpressionParser } from 'cron-parser';
 import { ICrontab } from '@/pages/crontab/type';
 
 export default function browserType() {

version.yaml

@@ -1,6 +1,10 @@
-version: 2.20.2
-changeLogLink: https://t.me/jiao_long/434
-publishTime: 2026-03-01 1800
+version: 2.19.2
+changeLogLink: https://t.me/jiao_long/431
+publishTime: 2025-06-27 23:59
 changeLog: |
-  1. 修复 path 安全漏洞（重要）
-  
+  1. 备份数据支持选择模块，支持清除依赖缓存
+  2. QLAPI 和 openapi 的 systemNotify 支持自定义通知类型和参数
+  3. ntfy 增加可选的认证与用户动作，感谢 https://github.com/liheji
+  4. 修复取消安装依赖
+  5. 修复环境变量过大解析报错
+  6. 修改服务启动方式