更新 npm 版本 v2.20.0

.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: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v3
         with:
           version: "8.3.1"
 
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
         with:
           cache: "pnpm"
 
@@ -81,7 +85,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
@@ -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: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v3
         with:
           version: "8.3.1"
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
         with:
           cache: "pnpm"
 
@@ -163,9 +166,9 @@ jobs:
           flavor: |
             latest=false
           tags: |
-            type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'develop') }}
+            type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'debian-dev') }}
             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') }}
             type=semver,pattern={{version}}
 
       - name: Set up QEMU
@@ -183,22 +186,21 @@ jobs:
             QL_BRANCH=${{ github.ref_name }}
             SOURCE_COMMIT=${{ github.sha }}
           network: host
-          # linux/s390x npm 暂不可用
+          platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/386
           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-from: type=registry,ref=whyour/qinglong:cache-debian
-          cache-to: type=registry,ref=whyour/qinglong:cache,mode=max
+          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 +210,11 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@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 +258,42 @@ jobs:
             QL_BRANCH=${{ github.ref_name }}
             SOURCE_COMMIT=${{ github.sha }}
           network: host
-          # linux/s390x npm 暂不可用
+          platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/386
           context: .
           file: ./docker/310.Dockerfile
           push: true
           tags: |
-            whyour/qinglong:python3.10
+            whyour/qinglong:debian-python3.10
-            whyour/qinglong:${{ steps.version.outputs.version }}-python3.10
+            whyour/qinglong:${{ steps.version.outputs.version }}-debian-python3.10
-          cache-from: type=registry,ref=whyour/qinglong:cache-python3.10
+          cache-from: type=registry,ref=whyour/qinglong:cache-debian-python3.10
-          cache-to: type=registry,ref=whyour/qinglong:cache-python3.10,mode=max
+          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
+    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

.npmignore

@@ -0,0 +1,22 @@
+/.tmp/
+/.github/
+/.vscode/
+/.history/
+/back/**/*.ts
+/back/**/*.json
+/cli/
+/data/
+/src/
+/static/**/*.js.map
+/static/**/*.gz
+/.editorconfig
+/.gitignore
+/.prettierignore
+/.prettierrc
+/.umirc.ts
+/nodemon.json
+/pnpm-lock.yaml
+/tsconfig.back.json
+/tsconfig.json
+/typings.d.ts
+/.env

back/api/config.ts

@@ -14,7 +14,7 @@ export default (app: Router) => {
   app.use('/configs', route);
 
   route.get(
-    '/sample',
+    '/samples',
     async (req: Request, res: Response, next: NextFunction) => {
       try {
         res.send({

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 {
@@ -130,7 +130,7 @@ export default (app: Router) => {
         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 {

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/config/const.ts

@@ -49,3 +49,38 @@ export const NotificationModeStringMap = {
   19: 'ntfy',
   20: 'wxPusherBot',
 } as const;
+
+export const LINUX_DEPENDENCE_COMMAND: Record<
+  'Debian' | 'Ubuntu' | 'Alpine',
+  {
+    install: string;
+    uninstall: string;
+    info: string;
+    check(info: string): boolean;
+  }
+> = {
+  Debian: {
+    install: 'apt-get install -y',
+    uninstall: 'apt-get remove -y',
+    info: 'dpkg-query -s',
+    check(info: string) {
+      return info.includes('install ok installed');
+    },
+  },
+  Ubuntu: {
+    install: 'apt-get install -y',
+    uninstall: 'apt-get remove -y',
+    info: 'dpkg-query -s',
+    check(info: string) {
+      return info.includes('install ok installed');
+    },
+  },
+  Alpine: {
+    install: 'apk add --no-check-certificate',
+    uninstall: 'apk del',
+    info: 'apk info -es',
+    check(info: string) {
+      return info.includes('installed');
+    },
+  },
+};

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/config/util.ts

@@ -10,9 +10,12 @@ import Logger from '../loaders/logger';
 import { writeFileWithLock } from '../shared/utils';
 import { DependenceTypes } from '../data/dependence';
 import { FormData } from 'undici';
+import os from 'os';
 
 export * from './share';
 
+let osType: 'Debian' | 'Ubuntu' | 'Alpine' | undefined;
+
 export async function getFileContentByName(fileName: string) {
   const _exsit = await fileExist(fileName);
   if (_exsit) {
@@ -550,7 +553,7 @@ except:
     spec=u.find_spec(name)
     print(name if spec else '')
 ''')"`,
-    [DependenceTypes.linux]: `apk info -es ${name}`,
+    [DependenceTypes.linux]: `apt-get info ${name}`,
   };
 
   return baseCommands[type];
@@ -561,7 +564,7 @@ export function getInstallCommand(type: DependenceTypes, name: string): string {
     [DependenceTypes.nodejs]: 'pnpm add -g',
     [DependenceTypes.python3]:
       'pip3 install --disable-pip-version-check --root-user-action=ignore',
-    [DependenceTypes.linux]: 'apk add --no-check-certificate',
+    [DependenceTypes.linux]: 'apt install -y',
   };
 
   let command = baseCommands[type];
@@ -581,7 +584,7 @@ export function getUninstallCommand(
     [DependenceTypes.nodejs]: 'pnpm remove -g',
     [DependenceTypes.python3]:
       'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
-    [DependenceTypes.linux]: 'apk del',
+    [DependenceTypes.linux]: 'apt remove -y',
   };
 
   return `${baseCommands[type]} ${name.trim()}`;
@@ -590,3 +593,145 @@ export function getUninstallCommand(
 export function isDemoEnv() {
   return process.env.DeployEnv === 'demo';
 }
+
+async function getOSReleaseInfo(): Promise<string> {
+  const osRelease = await fs.readFile('/etc/os-release', 'utf8');
+  return osRelease;
+}
+
+function isDebian(osReleaseInfo: string): boolean {
+  return osReleaseInfo.includes('Debian');
+}
+
+function isUbuntu(osReleaseInfo: string): boolean {
+  return osReleaseInfo.includes('Ubuntu');
+}
+
+function isCentOS(osReleaseInfo: string): boolean {
+  return osReleaseInfo.includes('CentOS') || osReleaseInfo.includes('Red Hat');
+}
+
+function isAlpine(osReleaseInfo: string): boolean {
+  return osReleaseInfo.includes('Alpine');
+}
+
+export async function detectOS(): Promise<
+  'Debian' | 'Ubuntu' | 'Alpine' | undefined
+> {
+  if (osType) return osType;
+  const platform = os.platform();
+
+  if (platform === 'linux') {
+    const osReleaseInfo = await getOSReleaseInfo();
+    if (isDebian(osReleaseInfo)) {
+      osType = 'Debian';
+    } else if (isUbuntu(osReleaseInfo)) {
+      osType = 'Ubuntu';
+    } else if (isAlpine(osReleaseInfo)) {
+      osType = 'Alpine';
+    } else {
+      Logger.error(`Unknown Linux Distribution: ${osReleaseInfo}`);
+      console.error(`Unknown Linux Distribution: ${osReleaseInfo}`);
+    }
+  } else if (platform === 'darwin') {
+    osType = undefined;
+  } else {
+    Logger.error(`Unsupported platform: ${platform}`);
+    console.error(`Unsupported platform: ${platform}`);
+  }
+
+  return osType;
+}
+
+async function getCurrentMirrorDomain(
+  filePath: string,
+): Promise<string | null> {
+  const fileContent = await fs.readFile(filePath, 'utf8');
+  const lines = fileContent.split('\n');
+  for (const line of lines) {
+    if (line.trim().startsWith('#')) {
+      continue;
+    }
+    const match = line.match(/https?:\/\/[^\/]+/);
+    if (match) {
+      return match[0];
+    }
+  }
+  return null;
+}
+
+async function replaceDomainInFile(
+  filePath: string,
+  oldDomainWithScheme: string,
+  newDomainWithScheme: string,
+): Promise<void> {
+  let fileContent = await fs.readFile(filePath, 'utf8');
+  let updatedContent = fileContent.replace(
+    new RegExp(oldDomainWithScheme, 'g'),
+    newDomainWithScheme,
+  );
+
+  if (!newDomainWithScheme.endsWith('/')) {
+    newDomainWithScheme += '/';
+  }
+
+  await writeFileWithLock(filePath, updatedContent);
+}
+
+async function _updateLinuxMirror(
+  osType: string,
+  mirrorDomainWithScheme: string,
+): Promise<string> {
+  let filePath: string, currentDomainWithScheme: string | null;
+  switch (osType) {
+    case 'Debian':
+      filePath = '/etc/apt/sources.list.d/debian.sources';
+      currentDomainWithScheme = await getCurrentMirrorDomain(filePath);
+      if (currentDomainWithScheme) {
+        await replaceDomainInFile(
+          filePath,
+          currentDomainWithScheme,
+          mirrorDomainWithScheme || 'http://deb.debian.org',
+        );
+        return 'apt-get update';
+      } else {
+        throw Error(`Current mirror domain not found.`);
+      }
+    case 'Ubuntu':
+      filePath = '/etc/apt/sources.list.d/ubuntu.sources';
+      currentDomainWithScheme = await getCurrentMirrorDomain(filePath);
+      if (currentDomainWithScheme) {
+        await replaceDomainInFile(
+          filePath,
+          currentDomainWithScheme,
+          mirrorDomainWithScheme || 'http://archive.ubuntu.com',
+        );
+        return 'apt-get update';
+      } else {
+        throw Error(`Current mirror domain not found.`);
+      }
+    case 'Alpine':
+      filePath = '/etc/apk/repositories';
+      currentDomainWithScheme = await getCurrentMirrorDomain(filePath);
+      if (currentDomainWithScheme) {
+        await replaceDomainInFile(
+          filePath,
+          currentDomainWithScheme,
+          mirrorDomainWithScheme || 'http://dl-cdn.alpinelinux.org',
+        );
+        return 'apk update';
+      } else {
+        throw Error(`Current mirror domain not found.`);
+      }
+    default:
+      throw Error('Unsupported OS type for updating mirrors.');
+  }
+}
+
+export async function updateLinuxMirrorFile(mirror: string): Promise<string> {
+  const detectedOS = await detectOS();
+  if (!detectedOS) {
+    throw Error(`Unknown Linux Distribution`);
+  }
+  return await _updateLinuxMirror(detectedOS, mirror);
+}

back/data/notify.ts

@@ -20,7 +20,6 @@ export enum NotificationMode {
   'chronocat' = 'Chronocat',
   'ntfy' = 'ntfy',
   'wxPusherBot' = 'wxPusherBot',
-  'openiLink' = 'openiLink',
 }
 
 abstract class NotificationBaseInfo {
@@ -162,12 +161,6 @@ export class WxPusherBotNotification extends NotificationBaseInfo {
   public wxPusherBotUids = '';
 }
 
-export class OpeniLinkNotification extends NotificationBaseInfo {
-  public openiLinkAppToken = '';
-  public openiLinkHubUrl = '';
-  public openiLinkContextToken = '';
-}
-
 export interface NotificationInfo
   extends GoCqHttpBotNotification,
     GotifyNotification,
@@ -189,5 +182,4 @@ export interface NotificationInfo
     ChronocatNotification,
     LarkNotification,
     NtfyNotification,
-    WxPusherBotNotification,
+    WxPusherBotNotification {}
-    OpeniLinkNotification {}

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) => req.path.startsWith(x))) {
-    if (!['/open/', '/api/'].some((x) => pathLower.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'].includes(req.path)) {
-    if (
-      ![
-        '/api/user/init',
-        '/api/user/notification/init',
-        '/open/user/init',
-        '/open/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/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;
@@ -80,7 +80,7 @@ export default class CronService {
       return doc;
     }
 
-    if (this.isNodeCron(doc) && !this.isSpecialSchedule(doc.schedule)) {
+    if (!this.isSpecialSchedule(doc.schedule)) {
       await cronClient.addCron([
         {
           name: doc.name || '',
@@ -111,11 +111,9 @@ export default class CronService {
       return newDoc;
     }
 
-    if (this.isNodeCron(doc)) {
+    await cronClient.delCron([String(newDoc.id)]);
-      await cronClient.delCron([String(doc.id)]);
-    }
 
-    if (this.isNodeCron(newDoc) && !this.isSpecialSchedule(newDoc.schedule)) {
+    if (!this.isSpecialSchedule(newDoc.schedule)) {
       await cronClient.addCron([
         {
           name: doc.name || '',
@@ -165,7 +163,7 @@ export default class CronService {
       let cron;
       try {
         cron = await this.getDb({ id });
-      } catch (err) { }
+      } catch (err) {}
       if (!cron) {
         continue;
       }
@@ -467,10 +465,7 @@ export default class CronService {
     for (const doc of docs) {
       // Kill all running instances of this task
       try {
-        if (doc.pid) {
+        const command = this.makeCommand(doc);
-          await killTask(doc.pid);
-        }
-        const command = doc.command.replace(/\s+/g, ' ').trim();
         await killAllTasks(command);
         this.logger.info(
           `[panel][停止所有运行中的任务实例] 任务ID: ${doc.id}, 命令: ${command}`,
@@ -577,20 +572,19 @@ export default class CronService {
   public async enabled(ids: number[]) {
     await CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
     const docs = await CrontabModel.findAll({ where: { id: ids } });
-    const sixCron = docs
+    const crons = docs.map((doc) => ({
-      .filter((x) => this.isNodeCron(x) && !this.isSpecialSchedule(x.schedule))
+      name: doc.name || '',
-      .map((doc) => ({
+      id: String(doc.id),
-        name: doc.name || '',
+      schedule: doc.schedule!,
-        id: String(doc.id),
+      command: this.makeCommand(doc),
-        schedule: doc.schedule!,
+      extra_schedules: doc.extra_schedules || [],
-        command: this.makeCommand(doc),
+    }));
-        extra_schedules: doc.extra_schedules || [],
-      }));
 
     if (isDemoEnv()) {
       return;
     }
-    await cronClient.addCron(sixCron);
+    
+    await cronClient.addCron(crons);
     await this.setCrontab();
   }
 
@@ -690,13 +684,6 @@ export default class CronService {
 
     await writeFileWithLock(config.crontabFile, crontab_string);
 
-    try {
-      execSync(`crontab ${config.crontabFile}`);
-    } catch (error: any) {
-      const errorMsg = error.message || String(error);
-      this.logger.error('[crontab] Failed to update system crontab:', errorMsg);
-    }
-
     await CrontabModel.update({ saved: true }, { where: {} });
   }
 
@@ -742,12 +729,7 @@ export default class CronService {
   public async autosave_crontab() {
     const tabs = await this.crontabs();
     const regularCrons = tabs.data
-      .filter(
+      .filter((x) => x.isDisabled !== 1 && !this.isSpecialSchedule(x.schedule))
-        (x) =>
-          x.isDisabled !== 1 &&
-          this.isNodeCron(x) &&
-          !this.isSpecialSchedule(x.schedule),
-      )
       .map((doc) => ({
         name: doc.name || '',
         id: String(doc.id),

back/services/dependence.ts

@@ -22,6 +22,8 @@ import {
 } from '../config/util';
 import dayjs from 'dayjs';
 import taskLimit from '../shared/pLimit';
+import { detectOS } from '../config/util';
+import { LINUX_DEPENDENCE_COMMAND } from '../config/const';
 
 @Service()
 export default class DependenceService {
@@ -107,7 +109,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) {
@@ -159,8 +161,19 @@ export default class DependenceService {
     const docs = await DependenceModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
       taskLimit.removeQueuedDependency(doc);
-      const depInstallCommand = getInstallCommand(doc.type, doc.name);
+      let depInstallCommand = getInstallCommand(doc.type, doc.name);
-      const depUnInstallCommand = getUninstallCommand(doc.type, doc.name);
+      let depUnInstallCommand = getUninstallCommand(doc.type, doc.name);
+      const isLinuxDependence = doc.type === DependenceTypes.linux;
+
+      if (isLinuxDependence) {
+        const osType = await detectOS();
+        if (!osType) {
+          continue;
+        }
+        const linuxCommand = LINUX_DEPENDENCE_COMMAND[osType];
+        depInstallCommand = `${linuxCommand.install} ${doc.name.trim()}`;
+        depUnInstallCommand = `${linuxCommand.uninstall} ${doc.name.trim()}`;
+      }
       const pids = await Promise.all([
         getPid(depInstallCommand),
         getPid(depUnInstallCommand),
@@ -217,23 +230,54 @@ export default class DependenceService {
         if (taskLimit.firstDependencyId !== dependency.id) {
           return resolve(null);
         }
-
-        taskLimit.removeQueuedDependency(dependency);
-
         const depIds = [dependency.id!];
+        let depName = dependency.name.trim();
+        const actionText = isInstall ? '安装' : '删除';
+        const socketMessageType = isInstall
+          ? 'installDependence'
+          : 'uninstallDependence';
+        const isNodeDependence = dependency.type === DependenceTypes.nodejs;
+        const isLinuxDependence = dependency.type === DependenceTypes.linux;
+        const isPythonDependence = dependency.type === DependenceTypes.python3;
+        const osType = await detectOS();
+        let linuxCommand = {} as typeof LINUX_DEPENDENCE_COMMAND.Alpine;
+        taskLimit.removeQueuedDependency(dependency);
+        if (isLinuxDependence) {
+          if (!osType) {
+            await DependenceModel.update(
+              { status: DependenceStatus.installFailed },
+              { where: { id: depIds } },
+            );
+            const startTime = dayjs();
+            const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format(
+              'YYYY-MM-DD HH:mm:ss',
+            )}\n\n当前系统不支持\n\n依赖${actionText}失败，结束时间 ${startTime.format(
+              'YYYY-MM-DD HH:mm:ss',
+            )}，耗时 ${startTime.diff(startTime, 'second')} 秒`;
+            this.sockService.sendMessage({
+              type: socketMessageType,
+              message,
+              references: depIds,
+            });
+            this.updateLog(depIds, message);
+            return resolve(null);
+          }
+          linuxCommand = LINUX_DEPENDENCE_COMMAND[osType];
+        }
+
         const status = isInstall
           ? DependenceStatus.installing
           : DependenceStatus.removing;
         await DependenceModel.update({ status }, { where: { id: depIds } });
 
-        const socketMessageType = isInstall
+        let command = isInstall
-          ? 'installDependence'
-          : 'uninstallDependence';
-        let depName = dependency.name.trim();
-        const command = isInstall
           ? getInstallCommand(dependency.type, depName)
           : getUninstallCommand(dependency.type, depName);
-        const actionText = isInstall ? '安装' : '删除';
+        if (isLinuxDependence) {
+          command = isInstall
+            ? `${linuxCommand.install} ${depName.trim()}`
+            : `${linuxCommand.uninstall} ${depName.trim()}`;
+        }
         const startTime = dayjs();
 
         const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format(
@@ -248,8 +292,12 @@ export default class DependenceService {
 
         // 判断是否已经安装过依赖
         if (isInstall && !force) {
-          const getCommand = getGetCommand(dependency.type, depName);
+          let getCommand = getGetCommand(dependency.type, depName);
           const depVersionStr = versionDependenceCommandTypes[dependency.type];
+          if (isLinuxDependence) {
+            getCommand = `${linuxCommand.info} ${depName}`;
+          }
+
           let depVersion = '';
           if (depName.includes(depVersionStr)) {
             const symbolRegx = new RegExp(
@@ -261,10 +309,6 @@ export default class DependenceService {
               depVersion = _depVersion;
             }
           }
-          const isNodeDependence = dependency.type === DependenceTypes.nodejs;
-          const isLinuxDependence = dependency.type === DependenceTypes.linux;
-          const isPythonDependence =
-            dependency.type === DependenceTypes.python3;
           const depInfo = (await promiseExecSuccess(getCommand))
             .replace(/\s{2,}/, ' ')
             .replace(/\s+$/, '');
@@ -273,7 +317,7 @@ export default class DependenceService {
             depInfo &&
             ((isNodeDependence && depInfo.split(' ')?.[0] === depName) ||
               (isLinuxDependence &&
-                depInfo.toLocaleLowerCase().includes('installed')) ||
+                linuxCommand.check(depInfo.toLocaleLowerCase())) ||
               isPythonDependence) &&
             (!depVersion || depInfo.includes(depVersion))
           ) {

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

@@ -34,7 +34,6 @@ export default class NotificationService {
     ['chronocat', this.chronocat],
     ['ntfy', this.ntfy],
     ['wxPusherBot', this.wxPusherBot],
-    ['openiLink', this.openiLink],
   ]);
 
   private title = '';
@@ -859,35 +858,4 @@ export default class NotificationService {
     }
     return {};
   }
-
-  private async openiLink() {
-    const { openiLinkAppToken, openiLinkHubUrl, openiLinkContextToken } =
-      this.params;
-    const baseUrl = openiLinkHubUrl?.replace(/\/$/, '') || 'https://hub.openilink.com';
-    const url = `${baseUrl}/bot/v1/message/send`;
-    const body: Record<string, string> = {
-      type: 'text',
-      content: `${this.title}\n\n${this.content}`,
-    };
-    if (openiLinkContextToken) {
-      body.context_token = openiLinkContextToken;
-    }
-    try {
-      const res = await httpClient.post(url, {
-        ...this.gotOption,
-        json: body,
-        headers: {
-          'Content-Type': 'application/json',
-          Authorization: `Bearer ${openiLinkAppToken}`,
-        },
-      });
-      if (res.ok) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
 }

back/services/system.ts

@@ -37,6 +37,7 @@ import ScheduleService, { TaskCallbacks } from './schedule';
 import SockService from './sock';
 import os from 'os';
 import dayjs from 'dayjs';
+import { updateLinuxMirrorFile } from '../config/util';
 
 @Service()
 export default class SystemService {
@@ -214,33 +215,11 @@ export default class SystemService {
     onEnd?: () => void,
   ) {
     const oDoc = await this.getSystemConfig();
-    await this.updateAuthDb({
-      ...oDoc,
-      info: { ...oDoc.info, ...info },
-    });
-    let defaultDomain = 'https://dl-cdn.alpinelinux.org';
-    let targetDomain = 'https://dl-cdn.alpinelinux.org';
     if (os.platform() !== 'linux') {
       return;
     }
-    const content = await fs.promises.readFile('/etc/apk/repositories', {
+    const command = await updateLinuxMirrorFile(info.linuxMirror || '');
-      encoding: 'utf-8',
+    let hasError = false;
-    });
-    const domainMatch = content.match(/(http.*)\/alpine\/.*/);
-    if (domainMatch) {
-      defaultDomain = domainMatch[1];
-    }
-    if (info.linuxMirror) {
-      targetDomain = info.linuxMirror;
-    }
-    const command = `sed -i 's/${defaultDomain.replace(
-      /\//g,
-      '\\/',
-    )}/${targetDomain.replace(
-      /\//g,
-      '\\/',
-    )}/g' /etc/apk/repositories && apk update -f`;
-
     this.scheduleService.runTask(
       command,
       {
@@ -254,8 +233,15 @@ export default class SystemService {
             message: 'update linux mirror end',
           });
           onEnd?.();
+          if (!hasError) {
+            await this.updateAuthDb({
+              ...oDoc,
+              info: { ...oDoc.info, ...info },
+            });
+          }
         },
         onError: async (message: string) => {
+          hasError = true;
           this.sockService.sendMessage({ type: 'updateLinuxMirror', message });
         },
         onLog: async (message: string) => {

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';

docker/310.Dockerfile

@@ -1,13 +1,18 @@
-FROM python:3.10-alpine3.18 AS builder
+FROM node:22-slim AS nodebuilder
-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 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,69 +26,86 @@ ENV QL_DIR=/ql \
   SHELL=/bin/bash \
   PS1="\u@\h:\w \$ "
 
-VOLUME /ql/data
+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
 
-EXPOSE 5700
+ENV QL_USER=qinglong
+ENV QL_HOME=/home/$QL_USER
 
-COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
+COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
-COPY --from=builder /usr/local/bin/. /usr/local/bin/
+COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
 
-RUN set -x \
+RUN set -x && \
-  && apk update -f \
+  ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
-  && apk upgrade \
+  apt-get update && \
-  && apk --no-cache add -f bash \
+  apt-get upgrade -y && \
-  coreutils \
+  apt-get install --no-install-recommends -y git \
-  git \
   curl \
   wget \
   tzdata \
   perl \
   openssl \
-  nodejs \
+  openssh-client \
   jq \
-  openssh \
   procps \
   netcat-openbsd \
   unzip \
-  npm \
+  libatomic1 && \
-  && rm -rf /var/cache/apk/* \
+  apt-get clean && \
-  && apk update \
+  ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
-  && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+  echo "Asia/Shanghai" >/etc/timezone && \
-  && echo "Asia/Shanghai" > /etc/timezone \
+  git config --global user.email "qinglong@users.noreply.github.com" && \
-  && git config --global user.email "qinglong@users.noreply.github.com" \
+  git config --global user.name "qinglong" && \
-  && git config --global user.name "qinglong" \
+  git config --global http.postBuffer 524288000 && \
-  && git config --global http.postBuffer 524288000 \
+  npm install -g pnpm@8.3.1 pm2 ts-node && \
-  && rm -rf /root/.cache \
+  rm -rf /root/.cache && \
-  && ulimit -c 0
+  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} \
+RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
-  && cd ${QL_DIR} \
+  cd ${QL_DIR} && \
-  && cp -f .env.example .env \
+  cp -f .env.example .env && \
-  && chmod 777 ${QL_DIR}/shell/*.sh \
+  chmod 777 ${QL_DIR}/shell/*.sh && \
-  && chmod 777 ${QL_DIR}/docker/*.sh \
+  chmod 777 ${QL_DIR}/docker/*.sh && \
-  && git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
+  git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /tmp/static && \
-  && mkdir -p ${QL_DIR}/static \
+  mkdir -p ${QL_DIR}/static && \
-  && cp -rf /static/* ${QL_DIR}/static \
+  cp -rf /tmp/static/* ${QL_DIR}/static && \
-  && rm -rf /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 \
+  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
-  HOME=/root
 
-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}
 
 HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
-  CMD curl -sf --noproxy '*' http://127.0.0.1:${QlPort:-5700}/api/health || exit 1
+  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
+FROM node:22-slim AS nodebuilder
-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 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,69 +26,86 @@ ENV QL_DIR=/ql \
   SHELL=/bin/bash \
   PS1="\u@\h:\w \$ "
 
-VOLUME /ql/data
+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
 
-EXPOSE 5700
+ENV QL_USER=qinglong
+ENV QL_HOME=/home/$QL_USER
 
-COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
+COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
-COPY --from=builder /usr/local/bin/. /usr/local/bin/
+COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
 
-RUN set -x \
+RUN set -x && \
-  && apk update -f \
+  ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
-  && apk upgrade \
+  ln -s /usr/local/lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx && \
-  && apk --no-cache add -f bash \
+  apt-get update && \
-  coreutils \
+  apt-get upgrade -y && \
-  git \
+  apt-get install --no-install-recommends -y git \
   curl \
   wget \
   tzdata \
   perl \
   openssl \
-  nodejs \
+  openssh-client \
   jq \
-  openssh \
   procps \
   netcat-openbsd \
   unzip \
-  npm \
+  libatomic1 && \
-  && rm -rf /var/cache/apk/* \
+  apt-get clean && \
-  && apk update \
+  ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
-  && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+  echo "Asia/Shanghai" >/etc/timezone && \
-  && echo "Asia/Shanghai" > /etc/timezone \
+  git config --global user.email "qinglong@users.noreply.github.com" && \
-  && git config --global user.email "qinglong@users.noreply.github.com" \
+  git config --global user.name "qinglong" && \
-  && git config --global user.name "qinglong" \
+  git config --global http.postBuffer 524288000 && \
-  && git config --global http.postBuffer 524288000 \
+  npm install -g pnpm@8.3.1 pm2 ts-node && \
-  && rm -rf /root/.cache \
+  rm -rf /root/.cache && \
-  && ulimit -c 0
+  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} \
+RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
-  && cd ${QL_DIR} \
+  cd ${QL_DIR} && \
-  && cp -f .env.example .env \
+  cp -f .env.example .env && \
-  && chmod 777 ${QL_DIR}/shell/*.sh \
+  chmod 777 ${QL_DIR}/shell/*.sh && \
-  && chmod 777 ${QL_DIR}/docker/*.sh \
+  chmod 777 ${QL_DIR}/docker/*.sh && \
-  && git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
+  git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /tmp/static && \
-  && mkdir -p ${QL_DIR}/static \
+  mkdir -p ${QL_DIR}/static && \
-  && cp -rf /static/* ${QL_DIR}/static \
+  cp -rf /tmp/static/* ${QL_DIR}/static && \
-  && rm -rf /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 \
+  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
-  HOME=/root
 
-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}
 
 HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
-  CMD curl -sf --noproxy '*' http://127.0.0.1:${QlPort:-5700}/api/health || exit 1
+  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
 
@@ -50,6 +52,6 @@ fi
 
 log_with_style "SUCCESS" "🎉  容器启动成功!"
 
-crond -f >/dev/null
+tail -f /dev/null
 
 exec "$@"

package.json

@@ -1,6 +1,17 @@
 {
-  "private": true,
+  "name": "@whyour/qinglong",
   "packageManager": "pnpm@8.3.1",
+  "version": "2.20.0-2",
+  "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/whyour/qinglong.git"
+  },
+  "author": "whyour",
+  "license": "Apache License 2.0",
+  "bugs": {
+    "url": "https://github.com/whyour/qinglong/issues"
+  },
   "scripts": {
     "start": "concurrently -n w: npm:start:*",
     "start:back": "nodemon ./back/app.ts",
@@ -25,6 +36,11 @@
       "prettier --parser=typescript --write"
     ]
   },
+  "bin": {
+    "ql": "shell/update.sh",
+    "task": "shell/task.sh",
+    "qinglong": "shell/start.sh"
+  },
   "pnpm": {
     "peerDependencyRules": {
       "ignoreMissing": [
@@ -77,9 +93,9 @@
     "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": "^8.0.1",
+    "nodemailer": "^6.9.16",
     "p-queue-cjs": "7.3.4",
     "@bufbuild/protobuf": "^2.10.0",
     "ps-tree": "^1.2.0",

sample/config.sample.sh

@@ -259,13 +259,4 @@ export WEBHOOK_METHOD=""
 ## 支持 text/plain、application/json、multipart/form-data、application/x-www-form-urlencoded
 export WEBHOOK_CONTENT_TYPE=""
 
-## 23. OpeniLink
-## 官方文档: https://openilink.com/docs/hub/apps
-## 在 OpeniLink Hub 后台安装 App 后获取 app_token
-export OPENILINK_APP_TOKEN=""
-## OpeniLink Hub 地址，默认为 https://hub.openilink.com，自建 Hub 时填写自己的地址
-export OPENILINK_HUB_URL=""
-## OpeniLink 的 context_token，用于标识消息会话上下文，可从消息事件中获取
-export OPENILINK_CONTEXT_TOKEN=""
-
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可

sample/notify.js

@@ -151,11 +151,6 @@ const push_config = {
   WXPUSHER_APP_TOKEN: '', // wxpusher 的 appToken
   WXPUSHER_TOPIC_IDS: '', // wxpusher 的 主题ID，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
   WXPUSHER_UIDS: '', // wxpusher 的 用户ID，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
-
-  // 官方文档: https://openilink.com/docs/hub/apps
-  OPENILINK_APP_TOKEN: '', // OpeniLink 的 app_token，在 OpeniLink Hub 后台安装 App 后获取
-  OPENILINK_HUB_URL: '', // OpeniLink Hub 地址，默认为 https://hub.openilink.com，自建 Hub 时填写自己的地址
-  OPENILINK_CONTEXT_TOKEN: '', // OpeniLink 的 context_token，用于标识消息会话上下文，可从消息事件中获取
 };
 
 for (const key in push_config) {
@@ -487,13 +482,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;
       }
@@ -1001,10 +992,7 @@ function fsBotNotify(text, desp) {
   return new Promise((resolve) => {
     const { FSKEY, FSSECRET } = push_config;
     if (FSKEY) {
-      const body = {
+      const body = { msg_type: 'text', content: { text: `${text}\n\n${desp}` } };
-        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
@@ -1290,15 +1278,7 @@ function ntfyNotify(text, desp) {
   }
 
   return new Promise((resolve) => {
-    const {
+    const { NTFY_URL, NTFY_TOPIC, NTFY_PRIORITY, NTFY_TOKEN, NTFY_USERNAME, NTFY_PASSWORD, NTFY_ACTIONS } = push_config;
-      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}`,
@@ -1313,8 +1293,7 @@ function ntfyNotify(text, desp) {
       if (NTFY_TOKEN) {
         options.headers['Authorization'] = `Bearer ${NTFY_TOKEN}`;
       } else if (NTFY_USERNAME && NTFY_PASSWORD) {
-        options.headers['Authorization'] =
+        options.headers['Authorization'] = `Basic ${Buffer.from(`${NTFY_USERNAME}:${NTFY_PASSWORD}`).toString('base64')}`;
-          `Basic ${Buffer.from(`${NTFY_USERNAME}:${NTFY_PASSWORD}`).toString('base64')}`;
       }
       if (NTFY_ACTIONS) {
         options.headers['Actions'] = encodeRFC2047(NTFY_ACTIONS);
@@ -1413,54 +1392,6 @@ function wxPusherNotify(text, desp) {
   });
 }
 
-function openiLinkNotify(text, desp) {
-  return new Promise((resolve) => {
-    const { OPENILINK_APP_TOKEN, OPENILINK_HUB_URL, OPENILINK_CONTEXT_TOKEN } =
-      push_config;
-    if (OPENILINK_APP_TOKEN) {
-      const baseUrl = OPENILINK_HUB_URL
-        ? OPENILINK_HUB_URL.replace(/\/$/, '')
-        : 'https://hub.openilink.com';
-      const body = {
-        type: 'text',
-        content: `${text}\n\n${desp}`,
-      };
-      if (OPENILINK_CONTEXT_TOKEN) {
-        body.context_token = OPENILINK_CONTEXT_TOKEN;
-      }
-      const options = {
-        url: `${baseUrl}/bot/v1/message/send`,
-        body: JSON.stringify(body),
-        headers: {
-          'Content-Type': 'application/json',
-          Authorization: `Bearer ${OPENILINK_APP_TOKEN}`,
-        },
-        timeout,
-      };
-
-      $.post(options, (err, resp, data) => {
-        try {
-          if (err) {
-            console.log('OpeniLink 发送通知消息失败！\n', err);
-          } else {
-            if (data.ok) {
-              console.log('OpeniLink 发送通知消息成功！');
-            } else {
-              console.log(`OpeniLink 发送通知消息异常：${data.error}`);
-            }
-          }
-        } catch (e) {
-          $.logErr(e, resp);
-        } finally {
-          resolve(data);
-        }
-      });
-    } else {
-      resolve();
-    }
-  });
-}
-
 function parseString(input, valueFormatFn) {
   const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
   const matches = {};
@@ -1591,7 +1522,6 @@ async function sendNotify(text, desp, params = {}) {
     qmsgNotify(text, desp), // 自定义通知
     ntfyNotify(text, desp), // Ntfy
     wxPusherNotify(text, desp), // wxpusher
-    openiLinkNotify(text, desp), // OpeniLink
   ]);
 }
 

sample/notify.py

@@ -135,10 +135,6 @@ push_config = {
     '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 至少配置一个才行
-
-    '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 时填写自己的地址
-    'OPENILINK_CONTEXT_TOKEN': '',      # OpeniLink 的 context_token，用于标识消息会话上下文，可从消息事件中获取
 }
 # fmt: on
 
@@ -902,43 +898,6 @@ def wxpusher_bot(title: str, content: str) -> None:
         print(f"wxpusher 推送失败！错误信息：{response.get('msg')}")
 
 
-def openilink(title: str, content: str) -> None:
-    """
-    通过 OpeniLink 推送消息。
-    支持的环境变量:
-    - OPENILINK_APP_TOKEN: 在 OpeniLink Hub 后台安装 App 后获取的 app_token
-    - OPENILINK_HUB_URL: OpeniLink Hub 地址，默认为 https://hub.openilink.com
-    - OPENILINK_CONTEXT_TOKEN: 消息会话上下文 token，可从消息事件中获取
-    """
-    if not push_config.get("OPENILINK_APP_TOKEN"):
-        return
-
-    print("OpeniLink 服务启动")
-
-    base_url = (
-        push_config.get("OPENILINK_HUB_URL", "").rstrip("/")
-        or "https://hub.openilink.com"
-    )
-    url = f"{base_url}/bot/v1/message/send"
-    headers = {
-        "Content-Type": "application/json",
-        "Authorization": f'Bearer {push_config.get("OPENILINK_APP_TOKEN")}',
-    }
-    data = {
-        "type": "text",
-        "content": f"{title}\n\n{content}",
-    }
-    if push_config.get("OPENILINK_CONTEXT_TOKEN"):
-        data["context_token"] = push_config.get("OPENILINK_CONTEXT_TOKEN")
-
-    response = requests.post(url=url, json=data, headers=headers).json()
-
-    if response.get("ok"):
-        print("OpeniLink 推送成功！")
-    else:
-        print(f'OpeniLink 推送失败！错误信息：{response.get("error")}')
-
-
 def parse_headers(headers):
     if not headers:
         return {}
@@ -1104,8 +1063,6 @@ 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("OPENILINK_APP_TOKEN"):
-        notify_function.append(openilink)
     if not notify_function:
         print(f"无推送渠道，请检查通知变量是否正确")
     return notify_function

shell/bot.sh

@@ -9,7 +9,15 @@ else
 fi
 
 echo -e "\n1、安装bot依赖...\n"
-apk --no-cache add -f zlib-dev gcc jpeg-dev python3-dev musl-dev freetype-dev
+os_name=$(source /etc/os-release && echo "$ID")
+if [[ $os_name == 'alpine' ]]; then
+  apk --no-cache add -f zlib-dev gcc jpeg-dev python3-dev musl-dev freetype-dev
+elif [[ $os_name == 'debian' ]] || [[ $os_name == 'ubuntu' ]]; then
+  apt-get install -y gcc python3-dev musl-dev
+else
+  echo -e "暂不支持此系统 $os_name"
+  exit 1
+fi
 echo -e "\nbot依赖安装成功...\n"
 
 echo -e "2、下载bot所需文件...\n"

shell/pub.sh

@@ -1,26 +1,26 @@
 #!/usr/bin/env bash
 echo -e "开始发布"
 
-echo -e "切换master分支"
+echo -e "切换 debian 分支"
-git branch -D master
+git branch -D debian
-git checkout -b master
+git checkout -b debian
-git push --set-upstream origin master -f
+git push --set-upstream origin debian -f
 
 echo -e "更新cdn文件"
 ts-node-transpile-only sample/tool.ts
 
 string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*")
 version="v$string"
-echo -e "当前版本$version"
+echo -e "当前版本$version-debian"
 
 echo -e "删除已经存在的本地tag"
-git tag -d "$version" &>/dev/null
+git tag -d "$version-debian" &>/dev/null
 
 echo -e "删除已经存在的远程tag"
-git push origin :refs/tags/$version &>/dev/null
+git push origin :refs/tags/$version-debian &>/dev/null
 
 echo -e "创建新tag"
-git tag -a "$version" -m "release $version"
+git tag -a "$version-debian" -m "release $version-debian"
 
 echo -e "提交tag"
 git push --tags

shell/start.sh

@@ -0,0 +1,125 @@
+#!/usr/bin/env bash
+
+# 前置依赖 nodejs、npm、python3
+set -e
+set -x
+
+if [[ ! $QL_DIR ]]; then
+  npm_dir=$(npm root -g)
+  pnpm_dir=$(pnpm root -g)
+  if [[ -d "$npm_dir/@whyour/qinglong" ]]; then
+    QL_DIR="$npm_dir/@whyour/qinglong"
+  elif [[ -d "$pnpm_dir/@whyour/qinglong" ]]; then
+    QL_DIR="$pnpm_dir/@whyour/qinglong"
+  else
+    echo -e "未找到 qinglong 模块，请先执行 npm i -g @whyour/qinglong 安装"
+  fi
+
+  if [[ $QL_DIR ]]; then
+    echo -e "请先手动设置 export QL_DIR=$QL_DIR，环境变量，并手动添加到系统环境变量，然后再次执行命令 qinglong 启动服务"
+  fi
+
+  exit 1
+fi
+
+if [[ ! $QL_DATA_DIR ]]; then
+  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
+
+command="$1"
+
+if [[ $command != "reload" ]]; then
+  # 安装依赖
+  os_name=$(source /etc/os-release && echo "$ID")
+
+  if [[ $os_name == 'alpine' ]]; then
+    apk update
+    apk add -f bash \
+      coreutils \
+      git \
+      curl \
+      wget \
+      tzdata \
+      perl \
+      openssl \
+      jq \
+      nginx \
+      openssh \
+      procps \
+      netcat-openbsd
+  elif [[ $os_name == 'debian' ]] || [[ $os_name == 'ubuntu' ]]; then
+    apt-get update
+    apt-get install -y git curl wget tzdata perl openssl jq nginx procps netcat-openbsd openssh-client
+  else
+    echo -e "暂不支持此系统部署 $os_name"
+    exit 1
+  fi
+
+  npm install -g pnpm@8.3.1 pm2 ts-node
+fi
+
+export PYTHON_SHORT_VERSION=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
+export PNPM_HOME=${QL_DIR}/data/dep_cache/node
+export PYTHON_HOME=${QL_DIR}/data/dep_cache/python3
+export PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
+
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin
+export NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules
+export PIP_CACHE_DIR=${PYTHON_HOME}/pip
+export PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
+
+if [[ $command != "reload" ]]; then
+  pip3 install --prefix ${PYTHON_HOME} requests
+fi
+
+cd ${QL_DIR}
+cp -f .env.example .env
+chmod 777 ${QL_DIR}/shell/*.sh
+
+. ${QL_DIR}/shell/share.sh
+. ${QL_DIR}/shell/env.sh
+
+log_with_style() {
+  local level="$1"
+  local message="$2"
+  local timestamp=$(date '+%Y-%m-%d %H:%M:%S')
+
+  printf "\n[%s] [%7s]  %s\n" "${timestamp}" "${level}" "${message}"
+}
+
+log_with_style "INFO" "🚀  1. 检测配置文件..."
+import_config "$@"
+make_dir /etc/nginx/conf.d
+make_dir /run/nginx
+fix_config
+
+pm2 l &>/dev/null
+
+log_with_style "INFO" "🔄  2. 启动 nginx..."
+nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
+
+log_with_style "INFO" "⚙️  3. 启动 pm2 服务..."
+reload_pm2
+
+if [[ $command != "reload" ]]; then
+  if [[ $AutoStartBot == true ]]; then
+    log_with_style "INFO" "🤖 4. 启动 bot..."
+    nohup ql bot >$dir_log/bot.log 2>&1 &
+  fi
+
+  if [[ $EnableExtraShell == true ]]; then
+    log_with_style "INFO" "🛠️ 5. 执行自定义脚本..."
+    nohup ql extra >$dir_log/extra.log 2>&1 &
+  fi
+
+  pm2 startup
+  pm2 save
+fi
+
+log_with_style "SUCCESS" "🎉 启动成功!"

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()) {
-                  if (!value || CronExpressionParser.parse(value).hasNext()) {
+                  return Promise.resolve();
-                    return Promise.resolve();
-                  }
-                  return Promise.reject(intl.get('Cron表达式格式有误'));
-                } catch (e) {
-                  return Promise.reject(intl.get('Cron表达式格式有误'));
                 }
+                return Promise.reject(intl.get('Cron表达式格式有误'));
               },
             },
           ]}

src/pages/diff/index.tsx

@@ -64,7 +64,7 @@ const Diff = () => {
   const getFiles = () => {
     setLoading(true);
     request
-      .get(`${config.apiPrefix}configs/sample`)
+      .get(`${config.apiPrefix}configs/samples`)
       .then(({ code, data }) => {
         if (code === 200) {
           setFiles(data);

src/pages/setting/dependence.tsx

@@ -215,12 +215,12 @@ const Dependence = () => {
         <Form.Item
           label={intl.get('Linux 软件包镜像源')}
           name="linux"
-          tooltip={intl.get('alpine linux 镜像源')}
+          tooltip={intl.get('debian linux 镜像源')}
         >
           <Input.Group compact>
             <Input
               style={{ width: 250 }}
-              placeholder={'https://mirrors.aliyun.com'}
+              placeholder={'http://mirrors.aliyun.com'}
               value={systemConfig?.linuxMirror}
               onChange={(e) => {
                 setSystemConfig({

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 (
-                  if (
+                  scheduleType === 'interval' ||
-                    scheduleType === 'interval' ||
+                  !value ||
-                    !value ||
+                  CronExpressionParser.parse(value).hasNext()
-                    CronExpressionParser.parse(value).hasNext()
+                ) {
-                  ) {
+                  return Promise.resolve();
-                    return Promise.resolve();
+                } else {
-                  } else {
-                    return Promise.reject(intl.get('Subscription表达式格式有误'));
-                  }
-                } catch (e) {
                   return Promise.reject(intl.get('Subscription表达式格式有误'));
                 }
               },

src/utils/config.ts

@@ -98,7 +98,6 @@ export default {
     { value: 'pushPlus', label: 'PushPlus' },
     { value: 'wePlusBot', label: intl.get('微加机器人') },
     { value: 'wxPusherBot', label: 'wxPusher' },
-    { value: 'openiLink', label: 'OpeniLink' },
     { value: 'chat', label: intl.get('群晖chat') },
     { value: 'email', label: intl.get('邮箱') },
     { value: 'lark', label: intl.get('飞书机器人') },
@@ -388,27 +387,6 @@ export default {
         required: false,
       },
     ],
-    openiLink: [
-      {
-        label: 'openiLinkAppToken',
-        tip: intl.get(
-          'OpeniLink的app_token，在OpeniLink Hub后台安装App后获取，参考 https://openilink.com/docs/hub/apps',
-        ),
-        required: true,
-      },
-      {
-        label: 'openiLinkHubUrl',
-        tip: intl.get(
-          'OpeniLink Hub地址，默认为 https://hub.openilink.com，自建Hub时填写自己的地址',
-        ),
-      },
-      {
-        label: 'openiLinkContextToken',
-        tip: intl.get(
-          'OpeniLink的context_token，用于标识消息会话上下文，可从消息事件中获取',
-        ),
-      },
-    ],
     lark: [
       {
         label: 'larkKey',

src/utils/http.tsx

@@ -84,12 +84,12 @@ let _request = axios.create({
 });
 
 const apiWhiteList = [
-  `${config.baseUrl}api/user/login`,
+  '/api/user/login',
-  `${config.baseUrl}open/auth/token`,
+  '/open/auth/token',
-  `${config.baseUrl}api/user/two-factor/login`,
+  '/api/user/two-factor/login',
-  `${config.baseUrl}api/system`,
+  '/api/system',
-  `${config.baseUrl}api/user/init`,
+  '/api/user/init',
-  `${config.baseUrl}api/user/notification/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,47 @@
-version: 2.20.2
+version: 2.20.0
-changeLogLink: https://t.me/jiao_long/434
+changeLogLink: https://t.me/jiao_long/432
-publishTime: 2026-03-01 1800
+publishTime: 2025-12-10 01:05
 changeLog: |
-  1. 修复 path 安全漏洞（重要）
+  1. 定时任务（cron / task）相关的大量修复 & 增强
 
+  修复 cron 解析错误（修复 parse cron / 升级 cron-parser）
+  修复集群模式下定时任务可能不执行（race condition）
+  定时任务支持订阅筛选
+  定时任务支持排序调整
+  定时任务支持自定义日志文件或无日志
+  修复任务实例默认值
+  任务支持单实例 / 多实例模式
+  修复 task 命令软链可能失败问题
+
+  2. 日志系统相关的大更新
+
+  修复日志目录逻辑
+  修复 pm2 日志目录
+  优化日志写入（stream pooling）
+
+  3. 环境变量（env）系统的改进与修复
+
+  修复环境变量复制到剪贴板时可能失败
+  添加环境变量“置顶”功能
+  修复 QlPort 与 QlGrpcPort 环境变量在 host network 模式下被忽略
+  增加全局 SSH 私钥配置
+
+  4. Docker / 非 root 用户 / Alpine 兼容性增强
+
+  新增非 root Docker 用户支持，自动初始化命令
+  修复 Alpine 容器 DNS 解析失败（设置 ndots:0）
+  修复 PM2 在 ARM 路由器（Node.js 不兼容）上的启动失败
+  移除 nginx（可能是考虑更轻量的镜像运行）
+
+  5. API 安全与校验增强
+
+  Dependencies GET endpoint 增加校验
+  Script API routes 增加输入校验
+  修复 JWT 认证问题
+  Feishu 机器人通知增加签名校验
+  QLAPI 增加 cron task 管理功能
+  修复 URIError（错误 cookie 导致白屏）
+
+  6. 系统设置
+
+  新增多终端/多平台的并发登录会话支持