Improve URL pattern matching and remove redundant checks

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

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

@@ -7,8 +7,6 @@ on:
     branches:
       - "master"
       - "develop"
-      - "debian"
-      - "debian-dev"
     tags:
       - "v*"
   workflow_dispatch:
@@ -165,9 +163,9 @@ jobs:
           flavor: |
             latest=false
           tags: |
-            type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'debian-dev') }}
-            type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'debian') }}
-            type=raw,value=${{ steps.version.outputs.version }}-debian,enable=${{ github.ref == format('refs/heads/{0}', 'debian') }}
+            type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'develop') }}
+            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=semver,pattern={{version}}
 
       - name: Set up QEMU
@@ -185,21 +183,22 @@ jobs:
             QL_BRANCH=${{ github.ref_name }}
             SOURCE_COMMIT=${{ github.sha }}
           network: host
-          platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
+          # linux/s390x npm 暂不可用
+          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-debian
-          cache-to: type=registry,ref=whyour/qinglong:cache-debian,mode=max
+          cache-from: type=registry,ref=whyour/qinglong:cache
+          cache-to: type=registry,ref=whyour/qinglong:cache,mode=max
 
       - name: Image digest
         run: |
           echo ${{ steps.docker_build.outputs.digest }}
 
   build310:
-    if: ${{ github.ref_name == 'debian' }}
+    if: ${{ github.ref_name == 'master' }}
     needs: build-static
 
     runs-on: ubuntu-22.04
@@ -257,42 +256,17 @@ jobs:
             QL_BRANCH=${{ github.ref_name }}
             SOURCE_COMMIT=${{ github.sha }}
           network: host
-          platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
+          # linux/s390x npm 暂不可用
+          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: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
+            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
 
       - 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

@@ -1,22 +0,0 @@
-/.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(
-    '/samples',
+    '/sample',
     async (req: Request, res: Response, next: NextFunction) => {
       try {
         res.send({

back/config/const.ts

@@ -49,38 +49,3 @@ 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/util.ts

@@ -10,12 +10,9 @@ 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) {
@@ -538,12 +535,43 @@ export async function setSystemTimezone(timezone: string): Promise<boolean> {
   }
 }
 
+// Helper function to check if a name is a GitHub URL
+function isGitHubUrl(name: string): boolean {
+  // Support git+https://, git+http://, https://, and http:// URLs
+  // This covers GitHub URLs and other git-compatible repositories
+  return !!name.match(/^(git\+https?:\/\/|https?:\/\/)/i);
+}
+
+// Helper function to check if a name is a requirements file
+function isRequirementsFile(name: string): boolean {
+  return !!name.match(/requirements.*\.(txt|in)$/i);
+}
+
+// Helper function to check if a name is a pyproject.toml file
+function isPyprojectToml(name: string): boolean {
+  return name.endsWith('pyproject.toml');
+}
+
 export function getGetCommand(type: DependenceTypes, name: string): string {
+  const trimmedName = name.trim();
+  
+  // For Python dependencies installed from GitHub or requirements files,
+  // we can't reliably check if they're installed, so skip the check
+  if (type === DependenceTypes.python3) {
+    if (isGitHubUrl(trimmedName) || 
+        isRequirementsFile(trimmedName) || 
+        isPyprojectToml(trimmedName)) {
+      // Return a command that will always indicate not installed
+      // This ensures GitHub URLs and requirements files are always installed
+      return 'echo ""';
+    }
+  }
+  
   const baseCommands = {
-    [DependenceTypes.nodejs]: `pnpm ls -g  | grep "${name}" | head -1`,
+    [DependenceTypes.nodejs]: `pnpm ls -g  | grep "${trimmedName}" | head -1`,
     [DependenceTypes.python3]: `
     python3 -c "exec('''
-name='${name}'
+name='${trimmedName}'
 try:
     from importlib.metadata import version
     print(version(name))
@@ -553,7 +581,7 @@ except:
     spec=u.find_spec(name)
     print(name if spec else '')
 ''')"`,
-    [DependenceTypes.linux]: `apt-get info ${name}`,
+    [DependenceTypes.linux]: `apk info -es ${trimmedName}`,
   };
 
   return baseCommands[type];
@@ -564,7 +592,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]: 'apt install -y',
+    [DependenceTypes.linux]: 'apk add --no-check-certificate',
   };
 
   let command = baseCommands[type];
@@ -573,7 +601,33 @@ export function getInstallCommand(type: DependenceTypes, name: string): string {
     command = `${command} --prefix=${PYTHON_INSTALL_DIR}`;
   }
 
-  return `${command} ${name.trim()}`;
+  const trimmedName = name.trim();
+  
+  // Handle different installation methods for Python
+  if (type === DependenceTypes.python3) {
+    // Check if it's a GitHub URL (support both git+ and direct URLs)
+    if (isGitHubUrl(trimmedName)) {
+      return `${command} ${trimmedName}`;
+    }
+    // Check if it's a requirements file path
+    if (isRequirementsFile(trimmedName)) {
+      return `${command} -r ${trimmedName}`;
+    }
+    // Check if it's a pyproject.toml file
+    if (isPyprojectToml(trimmedName)) {
+      // For pyproject.toml, install from the directory containing it
+      const pathMatch = trimmedName.match(/^(.+)\/pyproject\.toml$/);
+      if (pathMatch) {
+        // Has a path prefix, use the directory
+        return `${command} ${pathMatch[1]}`;
+      } else {
+        // Just "pyproject.toml", install current directory
+        return `${command} .`;
+      }
+    }
+  }
+
+  return `${command} ${trimmedName}`;
 }
 
 export function getUninstallCommand(
@@ -584,7 +638,7 @@ export function getUninstallCommand(
     [DependenceTypes.nodejs]: 'pnpm remove -g',
     [DependenceTypes.python3]:
       'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
-    [DependenceTypes.linux]: 'apt remove -y',
+    [DependenceTypes.linux]: 'apk del',
   };
 
   return `${baseCommands[type]} ${name.trim()}`;
@@ -593,145 +647,3 @@ 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/loaders/express.ts

@@ -13,29 +13,9 @@ 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) {
@@ -56,7 +36,7 @@ export default ({ app }: { app: Application }) => {
       secret: config.jwt.secret,
       algorithms: ['HS384'],
     }).unless({
-      path: [...config.apiWhiteList, /^(\/(?!api\/).*)$/i],
+      path: [...config.apiWhiteList, /^\/(?!api\/).*/],
     }),
   );
 
@@ -71,20 +51,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 +98,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/services/cron.ts

@@ -80,7 +80,7 @@ export default class CronService {
       return doc;
     }
 
-    if (!this.isSpecialSchedule(doc.schedule)) {
+    if (this.isNodeCron(doc) && !this.isSpecialSchedule(doc.schedule)) {
       await cronClient.addCron([
         {
           name: doc.name || '',
@@ -111,9 +111,11 @@ export default class CronService {
       return newDoc;
     }
 
-    await cronClient.delCron([String(newDoc.id)]);
+    if (this.isNodeCron(doc)) {
+      await cronClient.delCron([String(doc.id)]);
+    }
 
-    if (!this.isSpecialSchedule(newDoc.schedule)) {
+    if (this.isNodeCron(newDoc) && !this.isSpecialSchedule(newDoc.schedule)) {
       await cronClient.addCron([
         {
           name: doc.name || '',
@@ -575,19 +577,20 @@ 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 crons = docs.map((doc) => ({
-      name: doc.name || '',
-      id: String(doc.id),
-      schedule: doc.schedule!,
-      command: this.makeCommand(doc),
-      extra_schedules: doc.extra_schedules || [],
-    }));
+    const sixCron = docs
+      .filter((x) => this.isNodeCron(x) && !this.isSpecialSchedule(x.schedule))
+      .map((doc) => ({
+        name: doc.name || '',
+        id: String(doc.id),
+        schedule: doc.schedule!,
+        command: this.makeCommand(doc),
+        extra_schedules: doc.extra_schedules || [],
+      }));
 
     if (isDemoEnv()) {
       return;
     }
-    
-    await cronClient.addCron(crons);
+    await cronClient.addCron(sixCron);
     await this.setCrontab();
   }
 
@@ -687,6 +690,13 @@ 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: {} });
   }
 
@@ -732,7 +742,12 @@ export default class CronService {
   public async autosave_crontab() {
     const tabs = await this.crontabs();
     const regularCrons = tabs.data
-      .filter((x) => x.isDisabled !== 1 && !this.isSpecialSchedule(x.schedule))
+      .filter(
+        (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,8 +22,6 @@ 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 {
@@ -161,19 +159,8 @@ export default class DependenceService {
     const docs = await DependenceModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
       taskLimit.removeQueuedDependency(doc);
-      let depInstallCommand = getInstallCommand(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 depInstallCommand = getInstallCommand(doc.type, doc.name);
+      const depUnInstallCommand = getUninstallCommand(doc.type, doc.name);
       const pids = await Promise.all([
         getPid(depInstallCommand),
         getPid(depUnInstallCommand),
@@ -230,54 +217,23 @@ export default class DependenceService {
         if (taskLimit.firstDependencyId !== dependency.id) {
           return resolve(null);
         }
-        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];
-        }
 
+        taskLimit.removeQueuedDependency(dependency);
+
+        const depIds = [dependency.id!];
         const status = isInstall
           ? DependenceStatus.installing
           : DependenceStatus.removing;
         await DependenceModel.update({ status }, { where: { id: depIds } });
 
-        let command = isInstall
+        const socketMessageType = isInstall
+          ? 'installDependence'
+          : 'uninstallDependence';
+        let depName = dependency.name.trim();
+        const command = isInstall
           ? getInstallCommand(dependency.type, depName)
           : getUninstallCommand(dependency.type, depName);
-        if (isLinuxDependence) {
-          command = isInstall
-            ? `${linuxCommand.install} ${depName.trim()}`
-            : `${linuxCommand.uninstall} ${depName.trim()}`;
-        }
+        const actionText = isInstall ? '安装' : '删除';
         const startTime = dayjs();
 
         const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format(
@@ -292,12 +248,8 @@ export default class DependenceService {
 
         // 判断是否已经安装过依赖
         if (isInstall && !force) {
-          let getCommand = getGetCommand(dependency.type, depName);
+          const 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(
@@ -309,6 +261,10 @@ 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+$/, '');
@@ -317,7 +273,7 @@ export default class DependenceService {
             depInfo &&
             ((isNodeDependence && depInfo.split(' ')?.[0] === depName) ||
               (isLinuxDependence &&
-                linuxCommand.check(depInfo.toLocaleLowerCase())) ||
+                depInfo.toLocaleLowerCase().includes('installed')) ||
               isPythonDependence) &&
             (!depVersion || depInfo.includes(depVersion))
           ) {

back/services/system.ts

@@ -37,7 +37,6 @@ 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 {
@@ -215,11 +214,33 @@ 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 command = await updateLinuxMirrorFile(info.linuxMirror || '');
-    let hasError = false;
+    const content = await fs.promises.readFile('/etc/apk/repositories', {
+      encoding: 'utf-8',
+    });
+    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,
       {
@@ -233,15 +254,8 @@ 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) => {

docker/310.Dockerfile

@@ -1,18 +1,13 @@
-FROM node:22-slim AS nodebuilder
-
-FROM python:3.10-slim-bookworm AS builder
+FROM python:3.10-alpine3.18 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
+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-slim-bookworm
+FROM python:3.10-alpine
 
 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
@@ -26,79 +21,64 @@ ENV QL_DIR=/ql \
   SHELL=/bin/bash \
   PS1="\u@\h:\w \$ "
 
-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
+VOLUME /ql/data
+  
+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=builder /usr/local/bin/. /usr/local/bin/
 
-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 \
+RUN set -x \
+  && apk update -f \
+  && apk upgrade \
+  && apk --no-cache add -f bash \
+  coreutils \
+  git \
   curl \
   wget \
   tzdata \
   perl \
   openssl \
-  openssh-client \
+  nodejs \
   jq \
+  openssh \
   procps \
   netcat-openbsd \
   unzip \
-  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
+  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
 
 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 /tmp/static && \
-  mkdir -p ${QL_DIR}/static && \
-  cp -rf /tmp/static/* ${QL_DIR}/static && \
-  rm -rf /tmp/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 /static \
+  && mkdir -p ${QL_DIR}/static \
+  && cp -rf /static/* ${QL_DIR}/static \
+  && rm -rf /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 --chown=qinglong:qinglong --from=builder /tmp/build/node_modules/. /ql/node_modules/
-
-USER root
+COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
 
 WORKDIR ${QL_DIR}
 
@@ -106,7 +86,3 @@ 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,18 +1,13 @@
-FROM node:22-slim AS nodebuilder
-
-FROM python:3.11-slim-bookworm AS builder
+FROM python:3.11-alpine3.18 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
+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-slim-bookworm
+FROM python:3.11-alpine
 
 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
@@ -26,79 +21,64 @@ ENV QL_DIR=/ql \
   SHELL=/bin/bash \
   PS1="\u@\h:\w \$ "
 
-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
+VOLUME /ql/data
+  
+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=builder /usr/local/bin/. /usr/local/bin/
 
-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 \
+RUN set -x \
+  && apk update -f \
+  && apk upgrade \
+  && apk --no-cache add -f bash \
+  coreutils \
+  git \
   curl \
   wget \
   tzdata \
   perl \
   openssl \
-  openssh-client \
+  nodejs \
   jq \
+  openssh \
   procps \
   netcat-openbsd \
   unzip \
-  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
+  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
 
-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 /tmp/static && \
-  mkdir -p ${QL_DIR}/static && \
-  cp -rf /tmp/static/* ${QL_DIR}/static && \
-  rm -rf /tmp/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 /static \
+  && mkdir -p ${QL_DIR}/static \
+  && cp -rf /static/* ${QL_DIR}/static \
+  && rm -rf /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 --chown=qinglong:qinglong --from=builder /tmp/build/node_modules/. /ql/node_modules/
-
-USER root
+COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
 
 WORKDIR ${QL_DIR}
 
@@ -106,7 +86,3 @@ 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
 
@@ -50,6 +52,6 @@ fi
 
 log_with_style "SUCCESS" "🎉  容器启动成功!"
 
-tail -f /dev/null
+crond -f >/dev/null
 
 exec "$@"

package.json

@@ -1,17 +1,6 @@
 {
-  "name": "@whyour/qinglong",
+  "private": true,
   "packageManager": "pnpm@8.3.1",
-  "version": "2.20.2-3",
-  "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",
@@ -36,11 +25,6 @@
       "prettier --parser=typescript --write"
     ]
   },
-  "bin": {
-    "ql": "shell/update.sh",
-    "task": "shell/task.sh",
-    "qinglong": "shell/start.sh"
-  },
   "pnpm": {
     "peerDependencyRules": {
       "ignoreMissing": [

shell/bot.sh

@@ -9,15 +9,7 @@ else
 fi
 
 echo -e "\n1、安装bot依赖...\n"
-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
+apk --no-cache add -f zlib-dev gcc jpeg-dev python3-dev musl-dev freetype-dev
 echo -e "\nbot依赖安装成功...\n"
 
 echo -e "2、下载bot所需文件...\n"

shell/pub.sh

@@ -1,26 +1,26 @@
 #!/usr/bin/env bash
 echo -e "开始发布"
 
-echo -e "切换 debian 分支"
-git branch -D debian
-git checkout -b debian
-git push --set-upstream origin debian -f
+echo -e "切换master分支"
+git branch -D master
+git checkout -b master
+git push --set-upstream origin master -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-debian"
+echo -e "当前版本$version"
 
 echo -e "删除已经存在的本地tag"
-git tag -d "$version-debian" &>/dev/null
+git tag -d "$version" &>/dev/null
 
 echo -e "删除已经存在的远程tag"
-git push origin :refs/tags/$version-debian &>/dev/null
+git push origin :refs/tags/$version &>/dev/null
 
 echo -e "创建新tag"
-git tag -a "$version-debian" -m "release $version-debian"
+git tag -a "$version" -m "release $version"
 
 echo -e "提交tag"
 git push --tags

shell/start.sh

@@ -1,125 +0,0 @@
-#!/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" "🎉 启动成功!"

shell/update.sh

@@ -111,6 +111,76 @@ add_cron() {
   notify_api "$path 新增任务" "$detail"
 }
 
+## 自动安装订阅仓库中的Python依赖
+auto_install_python_deps() {
+  local repo_path="$1"
+  local uniq_path="$2"
+  
+  echo -e "\n检测订阅仓库中的Python依赖文件...\n"
+  
+  get_token
+  
+  # 检查 requirements.txt
+  if [[ -f "${repo_path}/requirements.txt" ]]; then
+    echo -e "发现 requirements.txt，开始自动安装依赖...\n"
+    local req_file="${dir_scripts}/${uniq_path}/requirements.txt"
+    
+    # 确保目标目录存在
+    make_dir "${dir_scripts}/${uniq_path}"
+    
+    # 复制文件并检查结果
+    if cp -f "${repo_path}/requirements.txt" "${req_file}" 2>/dev/null; then
+      # 调用API添加依赖安装任务
+      local dep_name="${uniq_path}/requirements.txt"
+      local currentTimeStamp=$(date +%s)
+      local result=$(curl -s --noproxy "*" "http://127.0.0.1:${ql_port}/open/dependencies?t=$currentTimeStamp" \
+        -X POST \
+        -H "Content-Type: application/json;charset=UTF-8" \
+        -H "Authorization: Bearer ${__ql_token__}" \
+        --data-raw "[{\"name\":\"${dep_name}\",\"type\":1,\"remark\":\"自动检测：${uniq_path} 订阅依赖\"}]" 2>/dev/null)
+      
+      local code=$(echo "$result" | jq -r '.code' 2>/dev/null)
+      if [[ "$code" == "200" ]]; then
+        echo -e "已添加 requirements.txt 依赖安装任务\n"
+      else
+        echo -e "添加 requirements.txt 依赖失败，请手动添加\n"
+      fi
+    else
+      echo -e "复制 requirements.txt 失败，跳过自动安装\n"
+    fi
+  fi
+  
+  # 检查 pyproject.toml
+  if [[ -f "${repo_path}/pyproject.toml" ]]; then
+    echo -e "发现 pyproject.toml，开始自动安装依赖...\n"
+    local pyproject_file="${dir_scripts}/${uniq_path}/pyproject.toml"
+    
+    # 确保目标目录存在
+    make_dir "${dir_scripts}/${uniq_path}"
+    
+    # 复制文件并检查结果
+    if cp -f "${repo_path}/pyproject.toml" "${pyproject_file}" 2>/dev/null; then
+      # 调用API添加依赖安装任务
+      local dep_name="${uniq_path}/pyproject.toml"
+      local currentTimeStamp=$(date +%s)
+      local result=$(curl -s --noproxy "*" "http://127.0.0.1:${ql_port}/open/dependencies?t=$currentTimeStamp" \
+        -X POST \
+        -H "Content-Type: application/json;charset=UTF-8" \
+        -H "Authorization: Bearer ${__ql_token__}" \
+        --data-raw "[{\"name\":\"${dep_name}\",\"type\":1,\"remark\":\"自动检测：${uniq_path} 订阅依赖\"}]" 2>/dev/null)
+      
+      local code=$(echo "$result" | jq -r '.code' 2>/dev/null)
+      if [[ "$code" == "200" ]]; then
+        echo -e "已添加 pyproject.toml 依赖安装任务\n"
+      else
+        echo -e "添加 pyproject.toml 依赖失败，请手动添加\n"
+      fi
+    else
+      echo -e "复制 pyproject.toml 失败，跳过自动安装\n"
+    fi
+  fi
+}
+
 ## 更新仓库
 update_repo() {
   local url="$1"
@@ -137,6 +207,10 @@ update_repo() {
 
   if [[ $exit_status -eq 0 ]]; then
     echo -e "拉取 ${uniq_path} 成功...\n"
+    
+    # 自动检测并安装Python依赖
+    auto_install_python_deps "${repo_path}" "${uniq_path}"
+    
     diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
   else
     echo -e "拉取 ${uniq_path} 失败，请检查日志...\n"

src/pages/dependence/modal.tsx

@@ -22,6 +22,9 @@ const DependenceModal = ({
 }) => {
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
+  const [selectedType, setSelectedType] = useState(
+    DependenceTypes[defaultType as any],
+  );
 
   const handleOk = async (values: any) => {
     setLoading(true);
@@ -90,7 +93,7 @@ const DependenceModal = ({
           label={intl.get('依赖类型')}
           initialValue={DependenceTypes[defaultType as any]}
         >
-          <Select>
+          <Select onChange={(value) => setSelectedType(value)}>
             {config.dependenceTypes.map((x, i) => (
               <Option key={i} value={i}>
                 {x}
@@ -121,11 +124,24 @@ const DependenceModal = ({
               whitespace: true,
             },
           ]}
+          tooltip={
+            selectedType === DependenceTypes.python3
+              ? intl.get(
+                  'Python支持多种安装方式：\n1. 包名（如：requests）\n2. GitHub链接（如：git+https://github.com/user/repo.git）\n3. requirements文件路径（如：path/to/requirements.txt）\n4. pyproject.toml文件路径',
+                )
+              : undefined
+          }
         >
           <Input.TextArea
             rows={4}
             autoSize={{ minRows: 1, maxRows: 5 }}
-            placeholder={intl.get('请输入依赖名称')}
+            placeholder={
+              selectedType === DependenceTypes.python3
+                ? intl.get(
+                    '支持包名、GitHub链接、requirements.txt或pyproject.toml路径',
+                  )
+                : intl.get('请输入依赖名称')
+            }
           />
         </Form.Item>
         <Form.Item name="remark" label={intl.get('备注')}>

src/pages/diff/index.tsx

@@ -64,7 +64,7 @@ const Diff = () => {
   const getFiles = () => {
     setLoading(true);
     request
-      .get(`${config.apiPrefix}configs/samples`)
+      .get(`${config.apiPrefix}configs/sample`)
       .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('debian linux 镜像源')}
+          tooltip={intl.get('alpine linux 镜像源')}
         >
           <Input.Group compact>
             <Input
               style={{ width: 250 }}
-              placeholder={'http://mirrors.aliyun.com'}
+              placeholder={'https://mirrors.aliyun.com'}
               value={systemConfig?.linuxMirror}
               onChange={(e) => {
                 setSystemConfig({

version.yaml

@@ -1,6 +1,11 @@
-version: 2.20.2
-changeLogLink: https://t.me/jiao_long/434
-publishTime: 2026-03-01 1800
+version: 2.20.1
+changeLogLink: https://t.me/jiao_long/433
+publishTime: 2025-12-26 22:00
 changeLog: |
-  1. 修复 path 安全漏洞（重要）
-  
+  1. 修复获取依赖管理列表
+  2. notify.js 修复 TG_PROXY_AUTH 参数拼接
+  3. QLAPI.notify larkSecret 参数
+  4. 修复 cron parser 定时规则校验
+  5. 修复设置 baseUrl 后无法访问
+  6. 修复环境变量排序
+  7. 修复定时任务无法停止