修复文件校验

测试 cli
更新版本 v2.17.7
2026-08-12 03:10:48 +08:00 · 2024-07-07 21:26:11 +08:00 · 2024-07-07 20:17:36 +08:00 · 2024-07-02 00:44:56 +08:00 · 2024-07-02 00:44:48 +08:00 · 2024-06-30 15:09:17 +08:00
37 changed files with 1655 additions and 363 deletions
@@ -7,6 +7,7 @@ on:
    branches:
      - "master"
      - "develop"
+      - "test-cli"
    tags:
      - "v*"
  schedule:
@@ -48,12 +48,83 @@ docker pull whyour/qinglong:debian

 ### npm

-The npm version supports `debian/ubuntu/centos/alpine` systems and requires `node/python3` to be installed.
+The npm version supports `debian/ubuntu/alpine` systems and requires `node/npm/python3/pip3/pnpm` to be installed.

 ```bash
 npm i @whyour/qinglong
 ```

+## Deployment
+
+### Docker (Recommended)
+
+```bash
+# curl -sSL get.docker.com | sh
+docker run -dit \
+  -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
+  -p 5700:5700 \
+  # Deployment paths are not required, e.g. /test.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  whyour/qinglong:latest
+```
+
+### Docker-compose (Recommended)
+
+```bash
+# curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# start
+docker-compose up -d
+# stop
+docker-compose down
+```
+
+### Podman (Recommended)
+
+```bash
+# https://podman.io/getting-started/installation
+podman run -dit \
+  --network bridge \
+  -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
+  -p 5700:5700 \
+  # Deployment paths are not required, e.g. /test.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  docker.io/whyour/qinglong:latest
+```
+
+### Npm
+
+It is recommended to use a pure system installation to avoid losing the original system data, you need to install node/npm/python3/pip3/pnpm yourself
+
+```bash
+# Debian/Ubuntu
+curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
+```
+
+```bash
+npm install -g node-pre-gyp pnpm@8.3.1
+npm install -g @whyour/qinglong
+qinglong
+# Add the environment variables QL_DIR and QL_DATA_DIR when prompted
+export QL_DIR=""
+export QL_DATA_DIR=""
+# Run again
+qinglong
+```
+
 ## Built-in commands

 - task
@@ -110,89 +181,16 @@ ql resettfa
 | days | File path for task execution |
 | file_path | The name of the environment variable that needs to be concurrent or specified at the time of task execution |

-## Deployment
-
-### Docker (Recommended)
-
-```bash
-# curl -sSL get.docker.com | sh
-docker run -dit \
-  -v $PWD/ql/data:/ql/data \
-  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
-  -p 5700:5700 \
-  # Deployment paths are not required, e.g. /test.
-  -e QlBaseUrl="/" \
-  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
-  -e QlPort="5700" \
-  --name qinglong \
-  --hostname qinglong \
-  --restart unless-stopped \
-  whyour/qinglong:latest
-```
-
-### Docker-compose (Recommended)
-
-```bash
-# curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
-mkdir qinglong
-wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
-
-# start
-docker-compose up -d
-# stop
-docker-compose down
-```
-
-### Podman (Recommended)
-
-```bash
-# https://podman.io/getting-started/installation
-podman run -dit \
-  --network bridge \
-  -v $PWD/ql/data:/ql/data \
-  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
-  -p 5700:5700 \
-  # Deployment paths are not required, e.g. /test.
-  -e QlBaseUrl="/" \
-  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
-  -e QlPort="5700" \
-  --name qinglong \
-  --hostname qinglong \
-  docker.io/whyour/qinglong:latest
-```
-
-### Local
-
-It is recommended to use a pure system installation to avoid losing the original system data, you need to install node/npm/python3/pip3 yourself
-
-```bash
-# Debian/Ubuntu
-curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
-# Centos
-curl --silent --location https://rpm.nodesource.com/setup_20.x | sudo bash
-```
-
-```bash
-npm install -g node-pre-gyp pnpm@8.3.1
-npm install -g @whyour/qinglong
-qinglong
-# Add the environment variables QL_DIR and QL_DATA_DIR when prompted
-export QL_DIR=""
-export QL_DATA_DIR=""
-# Run again
-qinglong
-```
-
 ## Development

 ```bash
-$ git clone https://github.com/whyour/qinglong.git
-$ cd qinglong
-$ cp .env.example .env
+git clone https://github.com/whyour/qinglong.git
+cd qinglong
+cp .env.example .env
 # Recommended use pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm@8.3.1
-$ pnpm install
-$ pnpm start
+npm install -g pnpm@8.3.1
+pnpm install
+pnpm start
 ```

 Open your browser and visit <http://127.0.0.1:5700>
@@ -50,12 +50,83 @@ docker pull whyour/qinglong:debian

 ### npm

-npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node/python3`
+npm 版本支持 `debian/ubuntu/alpine` 系统，需要自行安装 `node/npm/python3/pip3/pnpm`

 ```bash
 npm i @whyour/qinglong
 ```

+## 部署
+
+### docker (推荐)
+
+```bash
+# curl -sSL get.docker.com | sh
+docker run -dit \
+  -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
+  -p 5700:5700 \
+  # 部署路径非必须，比如 /test
+  -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  whyour/qinglong:latest
+```
+
+### docker-compose (推荐)
+
+```bash
+#  curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# 启动
+docker-compose up -d
+# 停止
+docker-compose down
+```
+
+### podman (推荐)
+
+```bash
+# https://podman.io/getting-started/installation
+podman run -dit \
+  --network bridge \
+  -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
+  -p 5700:5700 \
+  # 部署路径非必须，比如 /test
+  -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  docker.io/whyour/qinglong:latest
+```
+
+### npm
+
+建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3/pnpm
+
+```bash
+# Debian/Ubuntu
+curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
+```
+
+```bash
+npm install -g node-pre-gyp pnpm@8.3.1
+npm install -g @whyour/qinglong
+qinglong
+# 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR
+export QL_DIR=""
+export QL_DATA_DIR=""
+# 再次执行
+qinglong
+```
+
 ## 内置命令

 - task
@@ -110,89 +181,16 @@ ql resettfa
 | days       | 需要保留的日志的天数                                                                        |
 | file_path  | 任务执行时的文件路径                                                                        |

-## 部署
-
-### docker (推荐)
-
-```bash
-# curl -sSL get.docker.com | sh
-docker run -dit \
-  -v $PWD/ql/data:/ql/data \
-  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
-  -p 5700:5700 \
-  # 部署路径非必须，比如 /test
-  -e QlBaseUrl="/" \
-  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
-  -e QlPort="5700" \
-  --name qinglong \
-  --hostname qinglong \
-  --restart unless-stopped \
-  whyour/qinglong:latest
-```
-
-### docker-compose (推荐)
-
-```bash
-#  curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
-mkdir qinglong
-wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
-
-# 启动
-docker-compose up -d
-# 停止
-docker-compose down
-```
-
-### podman (推荐)
-
-```bash
-# https://podman.io/getting-started/installation
-podman run -dit \
-  --network bridge \
-  -v $PWD/ql/data:/ql/data \
-  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
-  -p 5700:5700 \
-  # 部署路径非必须，比如 /test
-  -e QlBaseUrl="/" \
-  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
-  -e QlPort="5700" \
-  --name qinglong \
-  --hostname qinglong \
-  docker.io/whyour/qinglong:latest
-```
-
-### 本机
-
-建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3
-
-```bash
-# Debian/Ubuntu
-curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
-# Centos
-curl --silent --location https://rpm.nodesource.com/setup_20.x | sudo bash
-```
-
-```bash
-npm install -g node-pre-gyp pnpm@8.3.1
-npm install -g @whyour/qinglong
-qinglong
-# 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR
-export QL_DIR=""
-export QL_DATA_DIR=""
-# 再次执行
-qinglong
-```
-
 ## 开发

 ```bash
-$ git clone https://github.com/whyour/qinglong.git
-$ cd qinglong
-$ cp .env.example .env
+git clone https://github.com/whyour/qinglong.git
+cd qinglong
+cp .env.example .env
 # 推荐使用 pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm@8.3.1
-$ pnpm install
-$ pnpm start
+npm install -g pnpm@8.3.1
+pnpm install
+pnpm start
 ```

 打开你的浏览器，访问 <http://127.0.0.1:5700>
@@ -51,6 +51,9 @@ export default (app: Router) => {
      const logger: Logger = Container.get('logger');
      try {
        const envService = Container.get(EnvService);
+        if (!req.body?.length) {
+          return res.send({ code: 400, message: '参数不正确' });
+        }
        const data = await envService.create(req.body);
        return res.send({ code: 200, data });
      } catch (e) {
@@ -217,7 +220,7 @@ export default (app: Router) => {
        } else {
          return res.send({
            code: 400,
-            message: '文件缺少name或者value字段，参考导出文件格式',
+            message: '每条数据 name 或者 value 字段不能为空，参考导出文件格式',
          });
        }
      } catch (e) {
@@ -19,7 +19,12 @@ const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
 const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });

-const dataPath = path.join(rootPath, 'data/');
+let dataPath = path.join(rootPath, 'data/');
+
+if (process.env.QL_DATA_DIR) {
+  dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
+}
+
 const shellPath = path.join(rootPath, 'shell/');
 const tmpPath = path.join(rootPath, '.tmp/');
 const samplePath = path.join(rootPath, 'sample/');
@@ -33,6 +38,8 @@ const sshdPath = path.join(dataPath, 'ssh.d/');
 const systemLogPath = path.join(dataPath, 'syslog/');

 const envFile = path.join(configPath, 'env.sh');
+const jsEnvFile = path.join(configPath, 'env.js');
+const pyEnvFile = path.join(configPath, 'env.py');
 const confFile = path.join(configPath, 'config.sh');
 const crontabFile = path.join(configPath, 'crontab.list');
 const authConfigFile = path.join(configPath, 'auth.json');
@@ -82,6 +89,8 @@ export default {
  sampleFile,
  confFile,
  envFile,
+  jsEnvFile,
+  pyEnvFile,
  dbPath,
  uploadPath,
  configPath,
@@ -94,6 +103,8 @@ export default {
    'crontab.list',
    'dependence-proxy.sh',
    'env.sh',
+    'env.js',
+    'env.py',
    'token.json',
  ],
  writePathList: [configPath, scriptPath],
@@ -32,7 +32,9 @@ export function formatCommand(doc: Subscription, url?: string) {
    autoDelCron,
  } = doc;
  if (type === 'file') {
-    command += `raw "${_url}"`;
+    command += `raw "${_url}" "${proxy || ''}" "${
+      isNil(autoAddCron) ? true : Boolean(autoAddCron)
+    }" "${isNil(autoDelCron) ? true : Boolean(autoDelCron)}"`;
  } else {
    command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
      dependences || ''
@@ -2,13 +2,13 @@ import { sequelize } from '.';
 import { DataTypes, Model, ModelDefined } from 'sequelize';
 import { NotificationInfo } from './notify';

-export class AuthInfo {
+export class SystemInfo {
  ip?: string;
  type: AuthDataType;
  info?: SystemModelInfo;
  id?: number;

-  constructor(options: AuthInfo) {
+  constructor(options: SystemInfo) {
    this.ip = options.ip;
    this.info = options.info;
    this.type = options.type;
@@ -50,7 +50,7 @@ export type SystemModelInfo = SystemConfigInfo &
  Partial<NotificationInfo> &
  LoginLogInfo;

-export interface SystemInstance extends Model<AuthInfo, AuthInfo>, AuthInfo { }
+export interface SystemInstance extends Model<SystemInfo, SystemInfo>, SystemInfo { }
 export const SystemModel = sequelize.define<SystemInstance>('Auth', {
  ip: DataTypes.STRING,
  type: DataTypes.STRING,
@@ -7,28 +7,23 @@ import linkDeps from './deps';
 import initTask from './initTask';

 export default async ({ expressApp }: { expressApp: Application }) => {
-  try {
  depInjectorLoader();
-    Logger.info('✌️ Dependency Injector loaded');
-    console.log('✌️ Dependency Injector loaded');
+  Logger.info('✌️ Dependency loaded');
+  console.log('✌️ Dependency loaded');
+
+  await initData();
+  Logger.info('✌️ Init data loaded');
+  console.log('✌️ Init data loaded');
+
+  await linkDeps();
+  Logger.info('✌️ Link deps loaded');
+  console.log('✌️ Link deps loaded');
+
+  initTask();
+  Logger.info('✌️ Init task loaded');
+  console.log('✌️ Init task loaded');

  expressLoader({ app: expressApp });
  Logger.info('✌️ Express loaded');
  console.log('✌️ Express loaded');
-  
-    await initData();
-    Logger.info('✌️ init data loaded');
-    console.log('✌️ init data loaded');
-  
-    await linkDeps();
-    Logger.info('✌️ link deps loaded');
-    console.log('✌️ link deps loaded');
-  
-    initTask();
-    Logger.info('✌️ init task loaded');
-    console.log('✌️ init task loaded');
-  } catch (error) {
-    Logger.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed, ${error}`);
-    console.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed ${error}`);
-  }
 };
@@ -19,26 +19,35 @@ async function linkToNodeModule(src: string, dst?: string) {
 async function linkCommand() {
  const commandPath = await promiseExec('which node');
  const commandDir = path.dirname(commandPath);
-  const linkShell = [
+  const oldLinkShell = [
    {
      src: 'update.sh',
      dest: 'ql',
      tmp: 'ql_tmp',
    },
-    {
-      src: 'task.sh',
-      dest: 'task',
-      tmp: 'task_tmp',
-    },
  ];
+  // const newLinkShell = [
+  //   {
+  //     src: 'task.mjs',
+  //     dest: 'task',
+  //     tmp: 'task_tmp',
+  //   },
+  // ];

-  for (const link of linkShell) {
+  for (const link of oldLinkShell) {
    const source = path.join(config.rootPath, 'shell', link.src);
    const target = path.join(commandDir, link.dest);
    const tmpTarget = path.join(commandDir, link.tmp);
    await fs.symlink(source, tmpTarget);
    await fs.rename(tmpTarget, target);
  }
+  // for (const link of newLinkShell) {
+  //   const source = path.join(config.rootPath, 'cli', link.src);
+  //   const target = path.join(commandDir, link.dest);
+  //   const tmpTarget = path.join(commandDir, link.tmp);
+  //   await fs.symlink(source, tmpTarget);
+  //   await fs.rename(tmpTarget, target);
+  // }
 }

 export default async (src: string = 'deps') => {
@@ -18,6 +18,10 @@ export default async () => {
  const dependenceService = Container.get(DependenceService);
  const systemService = Container.get(SystemService);

+  // 初始化增加系统配置
+  await SystemModel.upsert({ type: AuthDataType.systemConfig });
+  await SystemModel.upsert({ type: AuthDataType.notification });
+
  const installDependencies = () => {
    // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
    DependenceModel.findAll({
@@ -121,7 +125,7 @@ export default async () => {
        if (doc.command.includes(`${config.rootPath}/log/`)) {
          await CrontabModel.update(
            {
-              command: `${config.rootPath}/data/log/${doc.command.replace(
+              command: `${config.dataPath}/log/${doc.command.replace(
                `${config.rootPath}/log/`,
                '',
              )}`,
@@ -132,7 +136,7 @@ export default async () => {
        if (doc.command.includes(`${config.rootPath}/config/`)) {
          await CrontabModel.update(
            {
-              command: `${config.rootPath}/data/config/${doc.command.replace(
+              command: `${config.dataPath}/config/${doc.command.replace(
                `${config.rootPath}/config/`,
                '',
              )}`,
@@ -143,7 +147,7 @@ export default async () => {
        if (doc.command.includes(`${config.rootPath}/db/`)) {
          await CrontabModel.update(
            {
-              command: `${config.rootPath}/data/db/${doc.command.replace(
+              command: `${config.dataPath}/db/${doc.command.replace(
                `${config.rootPath}/db/`,
                '',
              )}`,
@@ -158,7 +162,4 @@ export default async () => {
  // 初始化保存一次ck和定时任务数据
  await cronService.autosave_crontab();
  await envService.set_envs();
-
-  // 初始化增加系统配置
-  await SystemModel.upsert({ type: AuthDataType.systemConfig });
 };
@@ -5,7 +5,12 @@ import Logger from './logger';
 import { fileExist } from '../config/util';

 const rootPath = process.env.QL_DIR as string;
-const dataPath = path.join(rootPath, 'data/');
+let dataPath = path.join(rootPath, 'data/');
+
+if (process.env.QL_DATA_DIR) {
+  dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
+}
+
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
 const logPath = path.join(dataPath, 'log/');
@@ -114,7 +114,13 @@ export default class CronService {
    }

    for (const id of ids) {
-      const cron = await this.getDb({ id });
+      let cron;
+      try {
+        cron = await this.getDb({ id });
+      } catch (err) {}
+      if (!cron) {
+        continue;
+      }
      if (status === CrontabStatus.idle && log_path !== cron.log_path) {
        options = omit(options, ['status', 'log_path', 'pid']);
      }
@@ -375,7 +381,10 @@ export default class CronService {

  public async getDb(query: FindOptions<Crontab>['where']): Promise<Crontab> {
    const doc: any = await CrontabModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Crontab);
+    if (!doc) {
+      throw new Error(`Cron ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
  }

  public async run(ids: number[]) {
@@ -437,7 +446,7 @@ export default class CronService {
        const cp = spawn(
          `real_log_path=${logPath} no_delay=true ${this.makeCommand(
            cron,
-            true
+            true,
          )}`,
          { shell: '/bin/bash' },
        );
@@ -63,7 +63,10 @@ export default class CronViewService {
    query: FindOptions<CrontabView>['where'],
  ): Promise<CrontabView> {
    const doc: any = await CrontabViewModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as CrontabView);
+    if (!doc) {
+      throw new Error(`CronView ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
  }

  public async disabled(ids: number[]) {
@@ -183,7 +183,10 @@ export default class DependenceService {
    query: FindOptions<Dependence>['where'],
  ): Promise<Dependence> {
    const doc: any = await DependenceModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Dependence);
+    if (!doc) {
+      throw new Error(`Dependency ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
  }

  private async updateLog(ids: number[], log: string): Promise<void> {
@@ -165,7 +165,10 @@ export default class EnvService {

  public async getDb(query: FindOptions<Env>['where']): Promise<Env> {
    const doc: any = await EnvModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Env);
+    if (!doc) {
+      throw new Error(`Env ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
  }

  public async disabled(ids: string[]) {
@@ -193,6 +196,8 @@ export default class EnvService {
    });
    const groups = groupBy(envs, 'name');
    let env_string = '';
+    let js_env_string = '';
+    let py_env_string = 'import os\n';
    for (const key in groups) {
      if (Object.prototype.hasOwnProperty.call(groups, key)) {
        const group = groups[key];
@@ -205,9 +210,18 @@ export default class EnvService {
            .replace(/'/g, "'\\''")
            .trim();
          env_string += `export ${key}='${value}'\n`;
+          const _env_value = `'${group
+            .map((x) => x.value)
+            .join('&')
+            .replace(/\\/g, '\\\\')
+            .replace(/'/g, "\\'")}'`;
+          js_env_string += `process.env.${key}=${_env_value};\n`;
+          py_env_string += `os.environ['${key}']=${_env_value}\n`;
        }
      }
    }
    await fs.writeFile(config.envFile, env_string);
+    await fs.writeFile(config.jsEnvFile, js_env_string);
+    await fs.writeFile(config.pyEnvFile, py_env_string);
  }
 }
@@ -209,16 +209,23 @@ export default class NotificationService {
    if (!barkPush.startsWith('http')) {
      barkPush = `https://api.day.app/${barkPush}`;
    }
-    const url = `${barkPush}/${encodeURIComponent(
-      this.title,
-    )}/${encodeURIComponent(
-      this.content,
-    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}&isArchive=${barkArchive}`;
+    const url = `${barkPush}`;
+    const body = {
+      title: this.title,
+      body: this.content,
+      icon: barkIcon,
+      sound: barkSound,
+      group: barkGroup,
+      isArchive: barkArchive,
+      level: barkLevel,
+      url: barkUrl,
+    };
    try {
      const res: any = await got
-        .get(url, {
+        .post(url, {
          ...this.gotOption,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          json: body,
+          headers: { 'Content-Type': 'application/json' },
        })
        .json();
      if (res.code === 200) {
@@ -612,9 +619,7 @@ export default class NotificationService {
  private async pushMe() {
    const { pushMeKey, pushMeUrl } = this.params;
    try {
-      const res: any = await got.post(
-        pushMeUrl || 'https://push.i-i.me/',
-        {
+      const res: any = await got.post(pushMeUrl || 'https://push.i-i.me/', {
        ...this.gotOption,
        json: {
          push_key: pushMeKey,
@@ -622,8 +627,7 @@ export default class NotificationService {
          content: this.content,
        },
        headers: { 'Content-Type': 'application/json' },
-        },
-      );
+      });
      if (res.body === 'success') {
        return true;
      } else {
@@ -26,7 +26,7 @@ export default class OpenService {

  public async insert(payload: App): Promise<App> {
    const doc = await AppModel.create(payload, { returning: true });
-    return doc.get({ plain: true }) as App;
+    return doc.get({ plain: true });
  }

  public async update(payload: App): Promise<App> {
@@ -45,7 +45,10 @@ export default class OpenService {

  public async getDb(query: any): Promise<App> {
    const doc: any = await AppModel.findOne({ where: query });
-    return doc && (doc.get({ plain: true }) as App);
+    if (!doc) {
+      throw new Error(`App ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
  }

  public async remove(ids: number[]) {
@@ -281,7 +281,7 @@ export default class SubscriptionService {
  ): Promise<Subscription> {
    const doc = await SubscriptionModel.findOne({ where: { ...query } });
    if (!doc) {
-      throw new Error(`${JSON.stringify(query)} not found`);
+      throw new Error(`Subscription ${JSON.stringify(query)} not found`);
    }
    return doc.get({ plain: true });
  }
@@ -24,7 +24,7 @@ import {
 import { NotificationInfo } from '../data/notify';
 import {
  AuthDataType,
-  AuthInfo,
+  SystemInfo,
  SystemInstance,
  SystemModel,
  SystemModelInfo,
@@ -47,18 +47,21 @@ export default class SystemService {

  public async getSystemConfig() {
    const doc = await this.getDb({ type: AuthDataType.systemConfig });
-    return doc || ({} as SystemInstance);
+    return doc;
  }

-  private async updateAuthDb(payload: AuthInfo): Promise<SystemInstance> {
+  private async updateAuthDb(payload: SystemInfo): Promise<SystemInfo> {
    await SystemModel.upsert({ ...payload });
    const doc = await this.getDb({ type: payload.type });
    return doc;
  }

-  public async getDb(query: any): Promise<SystemInstance> {
-    const doc: any = await SystemModel.findOne({ where: { ...query } });
-    return doc && doc.get({ plain: true });
+  public async getDb(query: any): Promise<SystemInfo> {
+    const doc = await SystemModel.findOne({ where: { ...query } });
+    if (!doc) {
+      throw new Error(`System ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
  }

  public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -1,6 +1,7 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import {
+  createFile,
  createRandomString,
  fileExist,
  getNetIp,
@@ -13,7 +14,7 @@ import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
 import {
  AuthDataType,
-  AuthInfo,
+  SystemInfo,
  SystemModel,
  SystemModelInfo,
  LoginStatus,
@@ -223,7 +224,7 @@ export default class UserService {
    return [];
  }

-  private async insertDb(payload: AuthInfo): Promise<AuthInfo> {
+  private async insertDb(payload: SystemInfo): Promise<SystemInfo> {
    const doc = await SystemModel.create({ ...payload }, { returning: true });
    return doc;
  }
@@ -266,7 +267,7 @@ export default class UserService {
  public async getUserInfo(): Promise<any> {
    const authFileExist = await fileExist(config.authConfigFile);
    if (!authFileExist) {
-      await fs.writeFile(
+      await createFile(
        config.authConfigFile,
        JSON.stringify({
          username: 'admin',
@@ -351,10 +352,10 @@ export default class UserService {

  public async getNotificationMode(): Promise<NotificationInfo> {
    const doc = await this.getDb({ type: AuthDataType.notification });
-    return (doc && doc.info) || {};
+    return (doc.info || {}) as NotificationInfo;
  }

-  private async updateAuthDb(payload: AuthInfo): Promise<any> {
+  private async updateAuthDb(payload: SystemInfo): Promise<any> {
    let doc = await SystemModel.findOne({ type: payload.type });
    if (doc) {
      const updateResult = await SystemModel.update(payload, {
@@ -368,9 +369,12 @@ export default class UserService {
    return doc;
  }

-  public async getDb(query: any): Promise<any> {
-    const doc: any = await SystemModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as any);
+  public async getDb(query: any): Promise<SystemInfo> {
+    const doc = await SystemModel.findOne({ where: { ...query } });
+    if (!doc) {
+      throw new Error(`${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
  }

  public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -0,0 +1,274 @@
+#!/usr/bin/env zx
+import path from 'path';
+
+const dir_root = process.env.QL_DIR;
+const file_auth_token = path.join(dir_root, 'static/auth.json');
+const token_file = path.join(dir_root, 'static/build/token.js');
+
+let token;
+
+const createToken = async () => {
+  let tokenCommand = `tsx ${dir_root}/back/token.ts`;
+  if (await fs.exists(token_file)) {
+    tokenCommand = `node ${token_file}`;
+  }
+  token = (await $([tokenCommand])).stdout.trim();
+};
+
+const getToken = async () => {
+  if (fs.existsSync(file_auth_token)) {
+    const authTokenData = JSON.parse(fs.readFileSync(file_auth_token, 'utf8'));
+    token = authTokenData.value;
+    const expiration = authTokenData.expiration;
+    const currentTimeStamp = Math.floor(Date.now() / 1000);
+    if (currentTimeStamp >= expiration) {
+      await createToken();
+    }
+  } else {
+    await createToken();
+  }
+};
+
+export const addCronApi = async (schedule, command, name, subId = null) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+  const data = {
+    name,
+    command,
+    schedule,
+    sub_id: subId,
+  };
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/crons?t=${currentTimeStamp}`,
+      {
+        method: 'POST',
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        body: JSON.stringify(data),
+      },
+    );
+
+    const responseData = await response.json();
+    const { code, message } = responseData;
+    if (code === 200) {
+      console.log(`${name} -> 添加成功`);
+    } else {
+      console.log(`${name} -> 添加失败(${message})`);
+    }
+  } catch (error) {
+    console.error(`${name} -> 添加失败(${error.message})`);
+  }
+};
+
+export const updateCronApi = async (schedule, command, name, id) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+  const data = {
+    name,
+    command,
+    schedule,
+    id,
+  };
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/crons?t=${currentTimeStamp}`,
+      {
+        method: 'PUT',
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        body: JSON.stringify(data),
+      },
+    );
+
+    const responseData = await response.json();
+    const { code, message } = responseData;
+    if (code === 200) {
+      console.log(`${name} -> 更新成功`);
+    } else {
+      console.log(`${name} -> 更新失败(${message})`);
+    }
+  } catch (error) {
+    console.error(`${name} -> 更新失败(${error.message})`);
+  }
+};
+
+export const updateCronCommandApi = async (command, id) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+  const data = {
+    command,
+    id,
+  };
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/crons?t=${currentTimeStamp}`,
+      {
+        method: 'PUT',
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        body: JSON.stringify(data),
+      },
+    );
+
+    const responseData = await response.json();
+    const { code, message } = responseData;
+    if (code === 200) {
+      console.log(`${command} -> 更新成功`);
+    } else {
+      console.log(`${command} -> 更新失败(${message})`);
+    }
+  } catch (error) {
+    console.error(`${command} -> 更新失败(${error.message})`);
+  }
+};
+
+export const delCronApi = async (ids) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/crons?t=${currentTimeStamp}`,
+      {
+        method: 'DELETE',
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        body: JSON.stringify(ids),
+      },
+    );
+
+    const responseData = await response.json();
+    const { code, message } = responseData;
+    if (code === 200) {
+      console.log('成功');
+    } else {
+      console.log(`失败(${message})`);
+    }
+  } catch (error) {
+    console.error(`删除失败(${error.message})`);
+  }
+};
+
+export const updateCron = async (
+  ids,
+  status,
+  pid,
+  logPath,
+  lastExecutingTime = 0,
+  runningTime = 0,
+) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+  const data = {
+    ids,
+    status,
+    pid,
+    log_path: logPath,
+    last_execution_time: lastExecutingTime,
+    last_running_time: runningTime,
+  };
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/crons/status?t=${currentTimeStamp}`,
+      {
+        method: 'PUT',
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        body: JSON.stringify(data),
+      },
+    );
+
+    const responseData = await response.json();
+    const { code, message } = responseData;
+    if (code !== 200) {
+      console.log(`更新任务状态失败(${message})`);
+    }
+  } catch (error) {
+    console.error(`更新任务状态失败(${error.message})`);
+  }
+};
+
+export const notifyApi = async (title, content) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+  const data = {
+    title,
+    content,
+  };
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/system/notify?t=${currentTimeStamp}`,
+      {
+        method: 'PUT',
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        body: JSON.stringify(data),
+      },
+    );
+
+    const responseData = await response.json();
+    const { code, message } = responseData;
+    if (code === 200) {
+      console.log('通知发送成功🎉');
+    } else {
+      console.log(`通知失败(${message})`);
+    }
+  } catch (error) {
+    console.error(`通知失败(${error.message})`);
+  }
+};
+
+export const findCronApi = async (params) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/crons/detail?${params}&t=${currentTimeStamp}`,
+      {
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+      },
+    );
+
+    const responseData = await response.json();
+    const { data } = responseData;
+    if (data === 'null') {
+      console.log('');
+    } else {
+      const { name } = data;
+      console.log(name);
+    }
+  } catch (error) {
+    console.error(`查找失败(${error.message})`);
+  }
+};
+
+await getToken();
@@ -1,13 +0,0 @@
-import { CommandModule } from 'yargs';
-export const updateCommand: CommandModule = {
-  command: 'update',
-  describe: 'Update and restart qinglong',
-  builder: (yargs) => {
-    return yargs.option('repositority', {
-      type: 'string',
-      alias: 'r',
-      describe: `Specify the release warehouse address of the package`,
-    });
-  },
-  handler: async (argv) => {},
-};
@@ -0,0 +1,22 @@
+#!/usr/bin/env zx
+
+import 'zx/globals';
+let initialVars = [];
+
+export const storeEnvVars = async () => {
+  const stdout = (await $`env`).lines();
+  initialVars = stdout.map((line) => line.split('=')[0]);
+};
+
+export const restoreEnvVars = async () => {
+  const stdout = (await $`env`).lines();
+  const currentVars = stdout.map((line) => line.split('=')[0]);
+
+  for (const key of currentVars) {
+    if (!initialVars.includes(key)) {
+      await $`unset ${key}`;
+    }
+  }
+};
+
+await storeEnvVars();
@@ -1,13 +0,0 @@
-import * as yargs from 'yargs';
-import { green, red } from 'chalk';
-import { updateCommand } from './commands/update';
-
-yargs
-  .usage('Usage: ql [command] <options>')
-  .command(updateCommand)
-  .fail((err) => {
-    console.error(`${red(err)}`);
-  })
-  .alias('h', 'help')
-  .showHelp()
-  .recommendCommands().argv;
@@ -0,0 +1,302 @@
+#!/usr/bin/env zx
+
+import {
+  dirScripts,
+  dirLog,
+  handleTaskStart,
+  runTaskBefore,
+  runTaskAfter,
+  handleTaskEnd,
+  globalState,
+  formatLogTime,
+} from './share.mjs';
+import { basename, dirname } from 'path';
+
+function defineProgram(fileParam) {
+  if (fileParam.endsWith('.js') || fileParam.endsWith('.mjs')) {
+    return 'node';
+  } else if (fileParam.endsWith('.py') || fileParam.endsWith('.pyc')) {
+    return 'python3';
+  } else if (fileParam.endsWith('.sh')) {
+    return 'bash';
+  } else if (fileParam.endsWith('.ts')) {
+    return $`command -v tsx`
+      .then(() => 'tsx')
+      .catch(() => 'ts-node-transpile-only');
+  } else {
+    return '';
+  }
+}
+
+async function randomDelay(fileParam) {
+  const randomDelayMax = process.env.RandomDelay;
+  if (randomDelayMax && randomDelayMax > 0) {
+    const fileExtensions = process.env.RandomDelayFileExtensions || 'js';
+    const ignoredMinutes = process.env.RandomDelayIgnoredMinutes || '0 30';
+    const currentMin = new Date().getMinutes();
+
+    if (
+      fileExtensions.split(' ').some((ext) => fileParam.endsWith(`.${ext}`))
+    ) {
+      if (
+        ignoredMinutes.split(' ').some((min) => parseInt(min) === currentMin)
+      ) {
+        return;
+      }
+      const delaySecond = Math.floor(Math.random() * randomDelayMax) + 1;
+      console.log(
+        `任务随机延迟 ${delaySecond} 秒，配置文件参数 RandomDelay 置空可取消延迟`,
+      );
+      await sleep(delaySecond * 1000);
+    }
+  }
+}
+
+async function genArrayScripts() {
+  const arrayScripts = [];
+  const arrayScriptsName = [];
+  const files = await fs.readdir(dirScripts);
+
+  for (const file of files) {
+    if (file.endsWith('.js') && file !== 'sendNotify.js') {
+      arrayScripts.push(file);
+      const content = await fs.readFile(`${dirScripts}/${file}`, 'utf8');
+      const match = content.match(/new Env\(['"]([^'"]+)['"]\)/);
+      arrayScriptsName.push(match ? match[1] : '<未识别出活动名称>');
+    }
+  }
+
+  return { arrayScripts, arrayScriptsName };
+}
+
+async function usage() {
+  const { arrayScripts, arrayScriptsName } = await genArrayScripts();
+  console.log(
+    `task命令运行本程序自动添加进crontab的脚本，需要输入脚本的绝对路径或去掉 “${dirScripts}/” 目录后的相对路径（定时任务中请写作相对路径），用法为：`,
+  );
+  console.log(
+    `1.$cmdTask <fileName>                                             # 依次执行，如果设置了随机延迟，将随机延迟一定秒数`,
+  );
+  console.log(
+    `2.$cmdTask <fileName> now                                         # 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日志，同时记录在日志文件中`,
+  );
+  console.log(
+    `3.$cmdTask <fileName> conc <环境变量名称> <账号编号，空格分隔>(可选的)  # 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日志，直接记录在日志文件中，且可指定账号执行`,
+  );
+  console.log(
+    `4.$cmdTask <fileName> desi <环境变量名称> <账号编号，空格分隔>         # 指定账号执行，无论是否设置了随机延迟，均立即运行`,
+  );
+  if (arrayScripts.length > 0) {
+    console.log(`\n当前有以下脚本可以运行:`);
+    arrayScripts.forEach((script, i) =>
+      console.log(`${i + 1}. ${arrayScriptsName[i]}：${script}`),
+    );
+  } else {
+    console.log(`\n暂无脚本可以执行`);
+  }
+}
+
+export function parseDuration(d) {
+  if (typeof d == 'number') {
+    if (isNaN(d) || d < 0) throw new Error(`Invalid duration: "${d}".`);
+    return d;
+  } else if (/\d+s/.test(d)) {
+    return +d.slice(0, -1) * 1000;
+  } else if (/\d+ms/.test(d)) {
+    return +d.slice(0, -2);
+  } else if (/\d+m/.test(d)) {
+    return +d.slice(0, -1) * 1000 * 60;
+  } else if (/\d+h/.test(d)) {
+    return +d.slice(0, -1) * 1000 * 60 * 60;
+  } else if (/\d+d/.test(d)) {
+    return +d.slice(0, -1) * 1000 * 60 * 60 * 24;
+  }
+  throw new Error(`Unknown duration: "${d}".`);
+}
+
+async function runWithTimeout(command) {
+  if (globalState.commandTimeoutTime) {
+    const timeoutNumber = parseDuration(globalState.commandTimeoutTime);
+    await $([command]).timeout(timeoutNumber).nothrow().pipe(process.stdout);
+  } else {
+    await $([command]).nothrow().pipe(process.stdout);
+  }
+}
+
+async function runNormal(fileParam, scriptParams) {
+  if (
+    !scriptParams.includes('now') &&
+    process.env.realTime !== 'true' &&
+    process.env.noDelay !== 'true'
+  ) {
+    await randomDelay(fileParam);
+  }
+  cd(dirScripts);
+  const relativePath = dirname(fileParam);
+  if (!fileParam.startsWith('/') && relativePath) {
+    cd(relativePath);
+    fileParam = fileParam.replace(`${relativePath}/`, '');
+  }
+  await runWithTimeout(
+    `${globalState.whichProgram} ${fileParam} ${scriptParams}`,
+  );
+}
+
+async function runConcurrent(fileParam, envParam, numParam, scriptParams) {
+  if (!envParam || !numParam) {
+    console.log(`缺少并发运行的环境变量参数 task xxx.js conc Test 1 3`);
+    return;
+  }
+
+  const array = (process.env[envParam] || '').split('&');
+  const runArr = expandRange(numParam, array.length);
+  const arrayRun = runArr.map((i) => array[i - 1]).filter(Boolean);
+
+  const singleLogTime = formatLogTime(new Date());
+
+  cd(dirScripts);
+  const relativePath = dirname(fileParam);
+  if (relativePath && fileParam.includes('/')) {
+    cd(relativePath);
+    fileParam = fileParam.replace(`${relativePath}/`, '');
+  }
+
+  await Promise.all(
+    arrayRun.map(async (env, i) => {
+      const singleLogPath = `${dirLog}/${globalState.logDir}/${singleLogTime}_${
+        i + 1
+      }.log`;
+      await runWithTimeout(
+        `${envParam}="${env.replace('"', '\\"')}" ${
+          globalState.whichProgram
+        } ${fileParam} ${scriptParams} &>${singleLogPath}`,
+      );
+    }),
+  );
+
+  for (let i = 0; i < arrayRun.length; i++) {
+    const singleLogPath = `${dirLog}/${globalState.logDir}/${singleLogTime}_${
+      i + 1
+    }.log`;
+    const log = await fs.readFile(singleLogPath, 'utf8');
+    console.log(log);
+    await fs.unlink(singleLogPath);
+  }
+}
+
+async function runDesignated(fileParam, envParam, numParam, scriptParams) {
+  if (!envParam || !numParam) {
+    console.log(`缺少单独运行的参数 task xxx.js desi Test 1 3`);
+    return;
+  }
+
+  const array = (process.env[envParam] || '').split('&');
+  const runArr = expandRange(numParam, array.length);
+  const arrayRun = runArr.map((i) => array[i - 1]).filter(Boolean);
+  const cookieStr = arrayRun.join('&');
+  cd(dirScripts);
+  const relativePath = dirname(fileParam);
+  if (relativePath && fileParam.includes('/')) {
+    cd(relativePath);
+    fileParam = fileParam.replace(`${relativePath}/`, '');
+  }
+
+  console.log('cookieStr', cookieStr.length, arrayRun.length);
+  // ${envParam}="${cookieStr.replace('"', '\\"')}"
+  await runWithTimeout(
+    `${globalState.whichProgram} ${fileParam} ${scriptParams}`,
+  );
+}
+
+async function runElse(fileParam, scriptParams) {
+  cd(dirScripts);
+  const relativePath = dirname(fileParam);
+  if (relativePath && fileParam.includes('/')) {
+    cd(relativePath);
+    fileParam = fileParam.replace(`${relativePath}/`, './');
+  }
+
+  await runWithTimeout(
+    `${globalState.whichProgram} ${fileParam} ${scriptParams}`,
+  );
+}
+
+function expandRange(rangeStr, max) {
+  const tempRangeStr = rangeStr
+    .replace(/-max/g, `-${max}`)
+    .replace(/max-/g, `${max}-`);
+
+  return tempRangeStr.split(' ').flatMap((part) => {
+    const rangeMatch = part.match(/^(\d+)([-~_])(\d+)$/);
+    if (rangeMatch) {
+      const [, start, , end] = rangeMatch.map(Number);
+      return Array.from({ length: end - start + 1 }, (_, i) => start + i);
+    }
+    return Number(part);
+  });
+}
+
+async function main(taskShellParams, scriptParams) {
+  const [fileParam, action, envParam, ...others] = taskShellParams;
+  if (taskShellParams.length === 0) {
+    return await usage();
+  }
+  if (fileParam && /\.(js|py|pyc|sh|ts)$/.test(fileParam)) {
+    const filePath = fileParam.startsWith('/')
+      ? fileParam
+      : path.join(dirScripts, fileParam);
+    if (!(await fs.exists(filePath))) {
+      console.log(`文件不存在 ${fileParam}`);
+      return;
+    }
+    switch (action) {
+      case undefined:
+        return await runNormal(fileParam, scriptParams);
+      case 'now':
+        return await runNormal(fileParam, scriptParams);
+      case 'conc':
+        return await runConcurrent(
+          fileParam,
+          envParam,
+          others.join(' '),
+          scriptParams,
+        );
+      case 'desi':
+        return await runDesignated(
+          fileParam,
+          envParam,
+          others.join(' '),
+          scriptParams,
+        );
+    }
+  }
+  await runElse(fileParam, taskShellParams.slice(1).concat(scriptParams));
+}
+
+async function run() {
+  const taskArgv = minimist(process.argv.slice(3), {
+    '--': true,
+  });
+  const { _: taskShellParams, m, '--': scriptParams, GlobalState } = taskArgv;
+  const cacheState = JSON.parse(GlobalState || '{}');
+  for (const key in cacheState) {
+    globalState[key] = cacheState[key];
+  }
+  if (m) {
+    globalState.commandTimeoutTime = m;
+  }
+  globalState.whichProgram = await defineProgram(taskShellParams[0]);
+
+  await handleTaskStart();
+  await runTaskBefore();
+  await main(taskShellParams, scriptParams);
+  await runTaskAfter();
+  await handleTaskEnd();
+}
+
+async function singleHandle() {}
+
+const signals = ['SIGINT', 'SIGTERM', 'SIGHUP', 'SIGQUIT', 'SIGTSTP'];
+signals.forEach((sig) => process.on(sig, singleHandle));
+
+await run();
@@ -0,0 +1,500 @@
+#!/usr/bin/env zx
+import 'zx/globals';
+// $.verbose = true;
+
+import { updateCron, notifyApi } from './api.mjs';
+import { restoreEnvVars } from './env.mjs';
+
+export const dirRoot = process.env.QL_DIR;
+export const dirTmp = path.join(dirRoot, '.tmp');
+export const dirData = process.env.QL_DATA_DIR
+  ? process.env.QL_DATA_DIR.endsWith('/')
+    ? process.env.QL_DATA_DIR.slice(-1)
+    : process.env.QL_DATA_DIR
+  : path.join(dirRoot, 'data');
+export const dirShell = path.join(dirRoot, 'shell');
+export const dirCli = path.join(dirRoot, 'cli');
+export const dirSample = path.join(dirRoot, 'sample');
+export const dirStatic = path.join(dirRoot, 'static');
+export const dirConfig = path.join(dirData, 'config');
+export const dirScripts = path.join(dirData, 'scripts');
+export const dirRepo = path.join(dirData, 'repo');
+export const dirRaw = path.join(dirData, 'raw');
+export const dirLog = path.join(dirData, 'log');
+export const dirDb = path.join(dirData, 'db');
+export const dirDep = path.join(dirData, 'deps');
+export const dirListTmp = path.join(dirLog, '.tmp');
+export const dirUpdateLog = path.join(dirLog, 'update');
+export const qlStaticRepo = path.join(dirRepo, 'static');
+
+export const fileConfigSample = path.join(dirSample, 'config.sample.sh');
+export const fileEnv = path.join(dirConfig, 'env.sh');
+export const jsFileEnv = path.join(dirConfig, 'env.js');
+export const fileConfigUser = path.join(dirConfig, 'config.sh');
+export const fileAuthSample = path.join(dirSample, 'auth.sample.json');
+export const fileAuthUser = path.join(dirConfig, 'auth.json');
+export const fileAuthToken = path.join(dirConfig, 'token.json');
+export const fileExtraShell = path.join(dirConfig, 'extra.sh');
+export const fileTaskBefore = path.join(dirConfig, 'task_before.sh');
+export const fileTaskAfter = path.join(dirConfig, 'task_after.sh');
+export const fileTaskSample = path.join(dirSample, 'task.sample.sh');
+export const fileExtraSample = path.join(dirSample, 'extra.sample.sh');
+export const fileNotifyJsSample = path.join(dirSample, 'notify.js');
+export const fileNotifyPySample = path.join(dirSample, 'notify.py');
+export const fileTestJsSample = path.join(dirSample, 'ql_sample.js');
+export const fileTestPySample = path.join(dirSample, 'ql_sample.py');
+export const fileNotifyPy = path.join(dirScripts, 'notify.py');
+export const fileNotifyJs = path.join(dirScripts, 'sendNotify.js');
+export const fileTestJs = path.join(dirScripts, 'ql_sample.js');
+export const fileTestPy = path.join(dirScripts, 'ql_sample.py');
+export const nginxAppConf = path.join(dirRoot, 'docker/front.conf');
+export const nginxConf = path.join(dirRoot, 'docker/nginx.conf');
+export const depNotifyPy = path.join(dirDep, 'notify.py');
+export const depNotifyJs = path.join(dirDep, 'sendNotify.js');
+
+export const listCrontabUser = path.join(dirConfig, 'crontab.list');
+export const listCrontabSample = path.join(dirSample, 'crontab.sample.list');
+export const listOwnScripts = path.join(dirListTmp, 'own_scripts.list');
+export const listOwnUser = path.join(dirListTmp, 'own_user.list');
+export const listOwnAdd = path.join(dirListTmp, 'own_add.list');
+export const listOwnDrop = path.join(dirListTmp, 'own_drop.list');
+
+export const globalState = {};
+
+export const initEnv = () => {
+  $.prefix +=
+    'export NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules;';
+  $.prefix += 'export PYTHONUNBUFFERED=1;';
+  $.prefix += 'export TERM=xterm-color;';
+};
+
+export const importConfig = async () => {
+  if (await fs.exists(fileConfigUser)) {
+    $.prefix += (await fs.readFile(fileConfigUser, 'utf8'));
+  }
+  // if (process.env.LOAD_ENV !== 'false' && (await fs.exists(fileEnv))) {
+  //   $.prefix += (await fs.readFile(fileEnv, 'utf8'));
+  // }
+  require(jsFileEnv)
+
+  globalState.qlBaseUrl = process.env.QlBaseUrl || '/';
+  globalState.qlPort = process.env.QlPort || '5700';
+  globalState.commandTimeoutTime = process.env.CommandTimeoutTime;
+  globalState.fileExtensions = process.env.RepoFileExtensions || 'js py';
+  globalState.proxyUrl = process.env.ProxyUrl || '';
+  globalState.currentBranch = process.env.QL_BRANCH;
+
+  if (process.env.DefaultCronRule) {
+    globalState.defaultCron = process.env.DefaultCronRule;
+  } else {
+    globalState.defaultCron = `${Math.floor(Math.random() * 60)} ${Math.floor(
+      Math.random() * 24,
+    )} * * *`;
+  }
+
+  globalState.cpuWarn = process.env.CpuWarn;
+  globalState.memWarn = process.env.MemoryWarn;
+  globalState.diskWarn = process.env.DiskWarn;
+};
+
+export const setProxy = (proxy) => {
+  if (proxy) {
+    globalState.proxyUrl = proxy;
+  }
+  if (globalState.proxyUrl) {
+    $`export http_proxy=${globalState.proxyUrl}`;
+    $`export https_proxy=${globalState.proxyUrl}`;
+  }
+};
+
+export const unsetProxy = () => {
+  $`unset http_proxy`;
+  $`unset https_proxy`;
+};
+
+export const makeDir = async (dir) => {
+  if (!(await fs.exists(dir))) {
+    await fs.mkdir(dir, { recursive: true });
+  }
+};
+
+export const detectTermux = () => {
+  globalState.isTermux = process.env.PATH?.includes('com.termux') ? 1 : 0;
+};
+
+export const detectMacos = () => {
+  globalState.isMacos = os.type() === 'Darwin' ? 1 : 0;
+};
+
+export const genRandomNum = (number) => {
+  return Math.floor(Math.random() * number);
+};
+
+export const fixConfig = async () => {
+  await makeDir(dirTmp);
+  await makeDir(dirStatic);
+  await makeDir(dirData);
+  await makeDir(dirConfig);
+  await makeDir(dirLog);
+  await makeDir(dirDb);
+  await makeDir(dirScripts);
+  await makeDir(dirListTmp);
+  await makeDir(dirRepo);
+  await makeDir(dirRaw);
+  await makeDir(dirUpdateLog);
+  await makeDir(dirDep);
+
+  if (!(await fs.exists(fileConfigUser))) {
+    console.log(
+      `复制一份 ${fileConfigSample} 为 ${fileConfigUser}，随后请按注释编辑你的配置文件：${fileConfigUser}`,
+    );
+    await fs.copyFile(fileConfigSample, fileConfigUser);
+  }
+
+  if (!(await fs.exists(fileEnv))) {
+    console.log(
+      '检测到config配置目录下不存在env.sh，创建一个空文件用于初始化...',
+    );
+    await fs.writeFile(fileEnv, '');
+  }
+
+  if (!(await fs.exists(fileTaskBefore))) {
+    console.log(`复制一份 ${fileTaskSample} 为 ${fileTaskBefore}`);
+    await fs.copyFile(fileTaskSample, fileTaskBefore);
+  }
+
+  if (!(await fs.exists(fileTaskAfter))) {
+    console.log(`复制一份 ${fileTaskSample} 为 ${fileTaskAfter}`);
+    await fs.copyFile(fileTaskSample, fileTaskAfter);
+  }
+
+  if (!(await fs.exists(fileExtraShell))) {
+    console.log(`复制一份 ${fileExtraSample} 为 ${fileExtraShell}`);
+    await fs.copyFile(fileExtraSample, fileExtraShell);
+  }
+
+  if (!(await fs.exists(fileAuthUser))) {
+    console.log(`复制一份 ${fileAuthSample} 为 ${fileAuthUser}`);
+    await fs.copyFile(fileAuthSample, fileAuthUser);
+  }
+
+  if (!(await fs.exists(fileNotifyPy))) {
+    console.log(`复制一份 ${fileNotifyPySample} 为 ${fileNotifyPy}`);
+    await fs.copyFile(fileNotifyPySample, fileNotifyPy);
+  }
+
+  if (!(await fs.exists(fileNotifyJs))) {
+    console.log(`复制一份 ${fileNotifyJsSample} 为 ${fileNotifyJs}`);
+    await fs.copyFile(fileNotifyJsSample, fileNotifyJs);
+  }
+
+  if (!(await fs.exists(fileTestJs))) {
+    await fs.copyFile(fileTestJsSample, fileTestJs);
+  }
+
+  if (!(await fs.exists(fileTestPy))) {
+    await fs.copyFile(fileTestPySample, fileTestPy);
+  }
+
+  if (await fs.exists('/etc/nginx/conf.d/default.conf')) {
+    console.log('检测到你可能未修改过默认nginx配置，将帮你删除');
+    await fs.unlink('/etc/nginx/conf.d/default.conf');
+  }
+  if (!(await fs.exists(depNotifyJs))) {
+    console.log(`复制一份 ${fileNotifyJsSample} 为 ${depNotifyJs}`);
+    await fs.copyFile(fileNotifyJsSample, depNotifyJs);
+  }
+
+  if (!(await fs.exists(depNotifyPy))) {
+    console.log(`复制一份 ${fileNotifyPySample} 为 ${depNotifyPy}`);
+    await fs.copyFile(fileNotifyPySample, depNotifyPy);
+  }
+};
+
+export const npmInstallSub = async () => {
+  if (globalState.isTermux === 1) {
+    await $`npm install --production --no-bin-links`;
+  } else if (!(await $`command -v pnpm`)) {
+    await $`npm install --production`;
+  } else {
+    await $`pnpm install --loglevel error --production`;
+  }
+};
+
+export const npmInstall = async (dirWork) => {
+  const dirCurrent = process.cwd();
+
+  await $`cd ${dirWork}`;
+  console.log(`安装 ${dirWork} 依赖包...`);
+  await npmInstallSub();
+  await $`cd ${dirCurrent}`;
+};
+
+export const diffAndCopy = async (copySource, copyTo) => {
+  if (
+    !(await fs.exists(copyTo)) ||
+    (await $`diff ${copySource} ${copyTo}`).exitCode !== 0
+  ) {
+    await fs.copyFile(copySource, copyTo);
+  }
+};
+
+export const gitCloneScripts = async (url, dir, branch, proxy) => {
+  const partCmd = branch ? `-b ${branch}` : '';
+  console.log(`开始拉取仓库 ${globalState.uniqPath} 到 ${dir}`);
+
+  setProxy(proxy);
+
+  const res = await $`git clone -q --depth=1 ${partCmd} ${url} ${dir}`;
+  globalState.exitStatus = res.exitCode;
+
+  unsetProxy();
+};
+
+export const randomRange = (begin, end) => {
+  return Math.floor(Math.random() * (end - begin) + begin);
+};
+
+export const deletePm2 = async () => {
+  await $`cd ${dirRoot}`;
+  await $`pm2 delete ecosystem.config.js`;
+};
+
+export const reloadPm2 = async () => {
+  await $`cd ${dirRoot}`;
+  restoreEnvVars();
+  await $`pm2 flush &>/dev/null`;
+  await $`pm2 startOrGracefulReload ecosystem.config.js`;
+};
+
+export const reloadUpdate = async () => {
+  await $`cd ${dirRoot}`;
+  restoreEnvVars();
+  await $`pm2 flush &>/dev/null`;
+  await $`pm2 startOrGracefulReload other.config.js`;
+};
+
+export const diffTime = (beginTime, endTime) => {
+  let diffTime;
+  if (globalState.isMacos === 1) {
+    diffTime = (+new Date(endTime) - +new Date(beginTime)) / 1000;
+  } else {
+    diffTime =
+      (new Date(endTime).getTime() - new Date(beginTime).getTime()) / 1000;
+  }
+  return diffTime;
+};
+
+export const formatTime = (time) => {
+  // 秒
+  return new Date(time).toLocaleString();
+};
+
+function pad(n, min = 10) {
+  return n < min ? '0' + n : n;
+}
+
+export function formatDate(date) {
+  const year = date.getFullYear();
+  const month = pad(date.getMonth() + 1);
+  const day = pad(date.getDate());
+  const hour = pad(date.getHours());
+  const minute = pad(date.getMinutes());
+  const second = pad(date.getSeconds());
+
+  return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+}
+
+export const formatLogTime = (date) => {
+  const year = date.getFullYear();
+  const month = pad(date.getMonth() + 1);
+  const day = pad(date.getDate());
+  const hour = pad(date.getHours());
+  const minute = pad(date.getMinutes());
+  const second = pad(date.getSeconds());
+  const milliSecond = pad(date.getMilliseconds(), 100);
+
+  return `${year}-${month}-${day}-${hour}-${minute}-${second}-${milliSecond}`;
+};
+
+export const formatTimestamp = (date) => {
+  return Math.floor(date.getTime() / 1000);
+};
+
+export const patchVersion = async () => {
+  await $`git config --global pull.rebase false`;
+
+  if (await fs.exists(path.join(dirRoot, 'db/cookie.db'))) {
+    console.log('检测到旧的db文件，拷贝为新db...');
+    await $`mv ${path.join(dirRoot, 'db/cookie.db')} ${path.join(
+      dirRoot,
+      'db/env.db',
+    )}`;
+    await $`rm -rf ${path.join(dirRoot, 'db/cookie.db')}`;
+  }
+
+  if (await fs.exists(path.join(dirRoot, 'db'))) {
+    console.log('检测到旧的db目录，拷贝到data目录...');
+    await $`cp -rf ${path.join(dirRoot, 'config')} ${dirData}`;
+  }
+
+  if (await fs.exists(path.join(dirRoot, 'scripts'))) {
+    console.log('检测到旧的scripts目录，拷贝到data目录...');
+    await $`cp -rf ${path.join(dirRoot, 'scripts')} ${dirData}`;
+  }
+
+  if (await fs.exists(path.join(dirRoot, 'log'))) {
+    console.log('检测到旧的log目录，拷贝到data目录...');
+    await $`cp -rf ${path.join(dirRoot, 'log')} ${dirData}`;
+  }
+
+  if (await fs.exists(path.join(dirRoot, 'config'))) {
+    console.log('检测到旧的config目录，拷贝到data目录...');
+    await $`cp -rf ${path.join(dirRoot, 'config')} ${dirData}`;
+  }
+};
+
+export const initNginx = async () => {
+  await fs.copyFile(nginxConf, '/etc/nginx/nginx.conf');
+  await fs.copyFile(nginxAppConf, '/etc/nginx/conf.d/front.conf');
+  let locationUrl = '/';
+  let aliasStr = '';
+  let rootStr = '';
+  let qlBaseUrl = globalState.qlBaseUrl;
+  let qlPort = globalState.qlPort;
+  if (qlBaseUrl !== '/') {
+    if (!qlBaseUrl.startsWith('/')) {
+      qlBaseUrl = `/${qlBaseUrl}`;
+    }
+    if (!qlBaseUrl.endsWith('/')) {
+      qlBaseUrl = `${qlBaseUrl}/`;
+    }
+    locationUrl = `^~${qlBaseUrl.slice(0, -1)}`;
+    aliasStr = `alias ${path.join(dirStatic, 'dist')};`;
+    const file = await fs.readFile(
+      path.join(dirStatic, 'dist/index.html'),
+      'utf8',
+    );
+    if (!file.includes(`<base href="${qlBaseUrl}">`)) {
+      await fs.writeFile(
+        path.join(dirStatic, 'dist/index.html'),
+        `<base href="${qlBaseUrl}">\n${file}`,
+      );
+    }
+  } else {
+    rootStr = `root ${path.join(dirStatic, 'dist')};`;
+  }
+  await $`sed -i "s,QL_ALIAS_CONFIG,${aliasStr},g" /etc/nginx/conf.d/front.conf`;
+  await $`sed -i "s,QL_ROOT_CONFIG,${rootStr},g" /etc/nginx/conf.d/front.conf`;
+  await $`sed -i "s,QL_BASE_URL_LOCATION,${locationUrl},g" /etc/nginx/conf.d/front.conf`;
+  let ipv6Str = '';
+  const ipv6 = await $`ip a | grep inet6`;
+  if (ipv6.stdout.trim()) {
+    ipv6Str = 'listen [::]:${qlPort} ipv6only=on;';
+  }
+  const ipv4Str = `listen ${qlPort};`;
+  await $`sed -i "s,IPV6_CONFIG,${ipv6Str},g" /etc/nginx/conf.d/front.conf`;
+  await $`sed -i "s,IPV4_CONFIG,${ipv4Str},g" /etc/nginx/conf.d/front.conf`;
+};
+
+async function checkServer() {
+  const cpuWarn = parseInt(process.env.cpuWarn || '0');
+  const memWarn = parseInt(process.env.memWarn || '0');
+  const diskWarn = parseInt(process.env.diskWarn || '0');
+
+  if (cpuWarn && memWarn && diskWarn) {
+    const topResult = await $`top -b -n 1`;
+    const cpuUse = parseInt(
+      topResult.stdout.match(/CPU\s+(\d+)\%/)?.[1] || '0',
+    );
+    const memFree = parseInt(
+      (await $`free -m`).stdout.match(/Mem:\s+(\d+)/)?.[1] || '0',
+    );
+    const memTotal = parseInt(
+      (await $`free -m`).stdout.match(/Mem:\s+\d+\s+(\d+)/)?.[1] || '0',
+    );
+    const diskUse = parseInt(
+      (await $`df -P`).stdout.match(/\/dev.*\s+(\d+)\%/)?.[1] || '0',
+    );
+    if (memFree && memTotal && diskUse && cpuUse) {
+      const memUse = Math.floor((memFree * 100) / memTotal);
+
+      if (cpuUse > cpuWarn || memFree < memWarn || diskUse > diskWarn) {
+        const resource = topResult.stdout
+          .split('\n')
+          .slice(7, 17)
+          .map((line) => line.replace(/\s+/g, ' '))
+          .join('\\n');
+        await notifyApi(
+          '服务器资源异常警告',
+          `当前CPU占用 ${cpuUse}% 内存占用 ${memUse}% 磁盘占用 ${diskUse}% \n资源占用详情 \n\n ${resource}`,
+        );
+      }
+    }
+  }
+}
+
+export const handleTaskStart = async () => {
+  if (globalState.ID) {
+    await updateCron(
+      [globalState.ID],
+      '0',
+      String(process.pid),
+      globalState.logPath,
+      globalState.beginTimestamp,
+    );
+  }
+  console.log(`## 开始执行... ${globalState.beginTime}\n`);
+};
+
+export const runTaskBefore = async () => {
+  if (globalState.isMacos === 0) {
+    await checkServer();
+  }
+  await $`. ${fileTaskBefore} "$@"`;
+
+  if (globalState.taskBefore) {
+    console.log('执行前置命令');
+    await $`eval ${globalState.taskBefore}`;
+    console.log('执行前置命令结束');
+  }
+};
+
+export const runTaskAfter = async () => {
+  await $`. ${fileTaskAfter} "$@"`;
+
+  if (globalState.taskAfter) {
+    console.log('执行后置命令');
+    await $`eval "${globalState.taskAfter}"`;
+    console.log('执行后置命令结束');
+  }
+};
+
+export const handleTaskEnd = async () => {
+  const etime = new Date();
+  const endTime = formatDate(etime);
+  const endTimestamp = formatTimestamp(etime);
+  let diffTime = endTimestamp - globalState.beginTimestamp;
+
+  if (diffTime === 0) {
+    diffTime = 1;
+  }
+
+  if (globalState.ID) {
+    await updateCron(
+      [globalState.ID],
+      '1',
+      `${process.pid}`,
+      globalState.logPath,
+      globalState.beginTimestamp,
+      diffTime,
+    );
+  }
+
+  console.log(`\n## 执行结束... ${endTime}  耗时 ${diffTime} 秒`);
+};
+
+initEnv();
+detectTermux();
+detectMacos();
+await importConfig();
@@ -0,0 +1,94 @@
+#!/usr/bin/env zx
+import 'zx/globals';
+
+import { PassThrough } from 'node:stream';
+import {
+  listCrontabUser,
+  formatLogTime,
+  formatTimestamp,
+  formatDate,
+  dirLog,
+  dirCli,
+  globalState,
+  handleTaskEnd,
+} from './share.mjs';
+import './api.mjs';
+
+// $.verbose = true;
+
+async function singleHandle() {}
+
+const signals = ['SIGINT', 'SIGTERM', 'SIGHUP', 'SIGQUIT', 'SIGTSTP'];
+signals.forEach((sig) => process.on(sig, singleHandle));
+
+export async function handleLogPath(fileParam) {
+  let ID = $.env.ID;
+  if (!ID) {
+    const grepResult =
+      await $`grep -E "task.* ${fileParam}" ${listCrontabUser}`.nothrow();
+    ID = grepResult.stdout.match(/ID=(\d+)/)?.[1];
+  }
+  globalState.ID = ID;
+
+  const suffix = ID && parseInt(ID, 10) > 0 ? `_${ID}` : '';
+  globalState.time = new Date();
+  const logTime = formatLogTime(globalState.time);
+  let logDirTmp = path.basename(fileParam);
+  let logDirTmpPath = '';
+
+  if (fileParam.includes('/')) {
+    logDirTmpPath = path.isAbsolute(fileParam)
+      ? fileParam.substring(1)
+      : fileParam;
+    logDirTmpPath = path.basename(path.dirname(logDirTmpPath));
+  }
+
+  if (logDirTmpPath) {
+    logDirTmp = `${logDirTmpPath}_${logDirTmp}`;
+  }
+
+  const logDir = `${logDirTmp.replace(/\.[^/.]+$/, '')}${suffix}`;
+  globalState.logDir = logDir;
+  globalState.logPath = `${logDir}/${logTime}.log`;
+  if ($.env.real_log_path) {
+    globalState.logPath = realLogPath;
+  }
+
+  await $`mkdir -p ${dirLog}/${logDir}`;
+}
+
+export function initBeginTime() {
+  globalState.beginTime = formatDate(globalState.time);
+  globalState.beginTimestamp = formatTimestamp(globalState.time);
+}
+
+async function main() {
+  const taskArgv = minimist(process.argv.slice(3), {
+    '--': true,
+  });
+  const {
+    _: [scriptFile],
+  } = taskArgv;
+
+  await handleLogPath(scriptFile);
+  initBeginTime();
+
+  cd(`${dirCli}`);
+  const logStream = fs.createWriteStream(`${dirLog}/${globalState.logPath}`);
+  const passThrough = new PassThrough();
+  passThrough.pipe(logStream);
+  const p = $`./otask.mjs ${process.argv.slice(
+    3,
+  )} --GlobalState=${JSON.stringify(globalState)} 2>&1`.nothrow();
+  p.stdout.pipe(passThrough).pipe(process.stdout);
+  await p;
+}
+
+main()
+  .then(() => {
+    process.exit(0);
+  })
+  .catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });
@@ -19,6 +19,9 @@
    "test": "umi-test",
    "test:coverage": "umi-test --coverage"
  },
+  "bin": {
+    "task": "./cli/task.mjs"
+  },
  "gitHooks": {
    "pre-commit": "lint-staged"
  },
@@ -97,7 +100,7 @@
    "uuid": "^8.3.2",
    "winston": "^3.6.0",
    "winston-daily-rotate-file": "^4.7.1",
-    "yargs": "^17.3.1",
+    "zx": "^8.1.4",
    "tough-cookie": "^4.0.0",
    "request-ip": "3.3.0",
    "ip2region": "2.3.0"
@@ -134,9 +134,9 @@ dependencies:
  winston-daily-rotate-file:
    specifier: ^4.7.1
    version: 4.7.1(winston@3.9.0)
-  yargs:
-    specifier: ^17.3.1
-    version: 17.7.2
+  zx:
+    specifier: ^8.1.4
+    version: 8.1.4

 devDependencies:
  '@ant-design/icons':
@@ -5114,6 +5114,15 @@ packages:
    resolution: {integrity: sha512-xbqnZmGrCEqi/KUzOkeUSe77p7APvLuyellGaAoeww3CHJ1AbjQWjPSCFtKIzZn8L7LpEax4NXnC+gfa6nM7IA==}
    dev: true

+  /@types/fs-extra@11.0.4:
+    resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==}
+    requiresBuild: true
+    dependencies:
+      '@types/jsonfile': 6.1.4
+      '@types/node': 17.0.45
+    dev: false
+    optional: true
+
  /@types/graceful-fs@4.1.6:
    resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
    dependencies:
@@ -5177,6 +5186,14 @@ packages:
    resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==}
    dev: true

+  /@types/jsonfile@6.1.4:
+    resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==}
+    requiresBuild: true
+    dependencies:
+      '@types/node': 17.0.45
+    dev: false
+    optional: true
+
  /@types/jsonwebtoken@8.5.9:
    resolution: {integrity: sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==}
    dependencies:
@@ -5231,6 +5248,14 @@ packages:
  /@types/node@17.0.45:
    resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}

+  /@types/node@20.14.9:
+    resolution: {integrity: sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==}
+    requiresBuild: true
+    dependencies:
+      undici-types: 5.26.5
+    dev: false
+    optional: true
+
  /@types/nodemailer@6.4.8:
    resolution: {integrity: sha512-oVsJSCkqViCn8/pEu2hfjwVO+Gb3e+eTWjg3PcjeFKRItfKpKwHphQqbYmPQrlMk+op7pNNWPbsJIEthpFN/OQ==}
    dependencies:
@@ -15988,6 +16013,12 @@ packages:
    resolution: {integrity: sha512-ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ==}
    dev: false

+  /undici-types@5.26.5:
+    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+    requiresBuild: true
+    dev: false
+    optional: true
+
  /unescape@1.0.1:
    resolution: {integrity: sha512-O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ==}
    engines: {node: '>=0.10.0'}
@@ -16650,6 +16681,15 @@ packages:
      strip-indent: 2.0.0
    dev: true

+  /zx@8.1.4:
+    resolution: {integrity: sha512-QFDYYpnzdpRiJ3dL2102Cw26FpXpWshW4QLTGxiYfIcwdAqg084jRCkK/kuP/NOSkxOjydRwNFG81qzA5r1a6w==}
+    engines: {node: '>= 12.17.0'}
+    hasBin: true
+    optionalDependencies:
+      '@types/fs-extra': 11.0.4
+      '@types/node': 20.14.9
+    dev: false
+
  github.com/whyour/node-sqlite3/3a00af0b5d7603b7f1b290032507320b18a6b741:
    resolution: {tarball: https://codeload.github.com/whyour/node-sqlite3/tar.gz/3a00af0b5d7603b7f1b290032507320b18a6b741}
    name: '@whyour/sqlite3'
@@ -97,7 +97,6 @@ const push_config = {
  WEBHOOK_CONTENT_TYPE: '', // 自定义通知 content-type
 };

-// 首先读取 面板变量 或者 github action 运行变量
 for (const key in push_config) {
  const v = process.env[key];
  if (v) {
@@ -358,17 +357,24 @@ function barkNotify(text, desp, params = {}) {
        BARK_PUSH = `https://api.day.app/${BARK_PUSH}`;
      }
      const options = {
-        url: `${BARK_PUSH}/${encodeURIComponent(text)}/${encodeURIComponent(
-          desp,
-        )}?icon=${BARK_ICON}&sound=${BARK_SOUND}&group=${BARK_GROUP}&isArchive=${BARK_ARCHIVE}&level=${BARK_LEVEL}&url=${BARK_URL}&${querystring.stringify(
-          params,
-        )}`,
+        url: `${BARK_PUSH}`,
+        json: {
+          title: text,
+          body: desp,
+          icon: BARK_ICON,
+          sound: BARK_SOUND,
+          group: BARK_GROUP,
+          isArchive: BARK_ARCHIVE,
+          level: BARK_LEVEL,
+          url: BARK_URL,
+          ...params,
+        },
        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
+          'Content-Type': 'application/json',
        },
        timeout,
      };
-      $.get(options, (err, resp, data) => {
+      $.post(options, (err, resp, data) => {
        try {
          if (err) {
            console.log('Bark APP 发送通知调用API失败😞\n', err);
@@ -1283,7 +1289,7 @@ async function sendNotify(text, desp, params = {}) {
    }
  }

-  if (push_config.HITOKOTO) {
+  if (push_config.HITOKOTO !== 'false') {
    desp += '\n\n' + (await one());
  }

@@ -120,7 +120,6 @@ push_config = {
 }
 # fmt: on

-# 首先读取 面板变量 或者 github action 运行变量
 for k in push_config:
    if os.getenv(k):
        v = os.getenv(k)
@@ -137,9 +136,9 @@ def bark(title: str, content: str) -> None:
    print("bark 服务启动")

    if push_config.get("BARK_PUSH").startswith("http"):
-        url = f'{push_config.get("BARK_PUSH")}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
+        url = f'{push_config.get("BARK_PUSH")}'
    else:
-        url = f'https://api.day.app/{push_config.get("BARK_PUSH")}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
+        url = f'https://api.day.app/{push_config.get("BARK_PUSH")}'

    bark_params = {
        "BARK_ARCHIVE": "isArchive",
@@ -149,7 +148,10 @@ def bark(title: str, content: str) -> None:
        "BARK_LEVEL": "level",
        "BARK_URL": "url",
    }
-    params = ""
+    data = {
+        "title": title,
+        "body": content,
+    }
    for pair in filter(
        lambda pairs: pairs[0].startswith("BARK_")
        and pairs[0] != "BARK_PUSH"
@@ -157,10 +159,11 @@ def bark(title: str, content: str) -> None:
        and bark_params.get(pairs[0]),
        push_config.items(),
    ):
-        params += f"{bark_params.get(pair[0])}={pair[1]}&"
-    if params:
-        url = url + "?" + params.rstrip("&")
-    response = requests.get(url).json()
+        data[bark_params.get(pair[0])] = pair[1]
+    headers = {"Content-Type": "application/json;charset=utf-8"}
+    response = requests.post(
+        url=url, data=json.dumps(data), headers=headers, timeout=15
+    ).json()

    if response["code"] == 200:
        print("bark 推送成功！")
@@ -385,6 +388,7 @@ def pushplus_bot(title: str, content: str) -> None:
        else:
            print("PUSHPLUS 推送失败！")

+
 def weplus_bot(title: str, content: str) -> None:
    """
    通过 微加机器人 推送消息。
@@ -704,7 +708,11 @@ def pushme(title: str, content: str) -> None:
        return
    print("PushMe 服务启动")

-    url = push_config.get("PUSHME_URL") if push_config.get("PUSHME_URL") else "https://push.i-i.me/"
+    url = (
+        push_config.get("PUSHME_URL")
+        if push_config.get("PUSHME_URL")
+        else "https://push.i-i.me/"
+    )
    data = {
        "push_key": push_config.get("PUSHME_KEY"),
        "title": title,
@@ -953,7 +961,7 @@ def send(title: str, content: str, ignore_default_config: bool = False, **kwargs
            return

    hitokoto = push_config.get("HITOKOTO")
-    content += "\n\n" + one() if hitokoto else ""
+    content += "\n\n" + one() if hitokoto != "false" else ""

    notify_function = add_notify_function()
    ts = [
@@ -4,6 +4,11 @@
 dir_root=$QL_DIR
 dir_tmp=$dir_root/.tmp
 dir_data=$dir_root/data
+
+if [[ $QL_DATA_DIR ]]; then
+  dir_data="${QL_DATA_DIR%/}"
+fi
+
 dir_shell=$dir_root/shell
 dir_sample=$dir_root/sample
 dir_static=$dir_root/static
@@ -54,11 +59,11 @@ list_own_drop=$dir_list_tmp/own_drop.list

 ## 软连接及其原始文件对应关系
 link_name=(
-  task
+  # task
  ql
 )
 original_name=(
-  task.sh
+  # task.sh
  update.sh
 )

@@ -69,7 +74,9 @@ init_env() {

 import_config() {
  [[ -f $file_config_user ]] && . $file_config_user
-  [[ -f $file_env ]] && . $file_env
+  if [[ $LOAD_ENV != 'false' ]] && [[ -f $file_env ]]; then
+    . $file_env
+  fi

  ql_base_url=${QlBaseUrl:-"/"}
  ql_port=${QlPort:-"5700"}
@@ -129,28 +136,6 @@ gen_random_num() {
  echo $((${RANDOM} % $divi))
 }

-define_cmd() {
-  local cmd_prefix cmd_suffix
-  if type task &>/dev/null; then
-    cmd_suffix=""
-    if [[ -f "$dir_shell/task.sh" ]]; then
-      cmd_prefix=""
-    else
-      cmd_prefix="bash "
-    fi
-  else
-    cmd_suffix=".sh"
-    if [[ -f "$dir_shell/task.sh" ]]; then
-      cmd_prefix="$dir_shell/"
-    else
-      cmd_prefix="bash $dir_shell/"
-    fi
-  fi
-  for ((i = 0; i < ${#link_name[*]}; i++)); do
-    export cmd_${link_name[i]}="${cmd_prefix}${link_name[i]}${cmd_suffix}"
-  done
-}
-
 fix_config() {
  make_dir $dir_tmp
  make_dir $dir_static
@@ -371,25 +356,25 @@ patch_version() {

  if [[ -d "$dir_root/db" ]]; then
    echo -e "检测到旧的db目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_root/data
+    cp -rf $dir_root/config $dir_data
    echo
  fi

  if [[ -d "$dir_root/scripts" ]]; then
    echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
-    cp -rf $dir_root/scripts $dir_root/data
+    cp -rf $dir_root/scripts $dir_data
    echo
  fi

  if [[ -d "$dir_root/log" ]]; then
    echo -e "检测到旧的log目录，拷贝到data目录...\n"
-    cp -rf $dir_root/log $dir_root/data
+    cp -rf $dir_root/log $dir_data
    echo
  fi

  if [[ -d "$dir_root/config" ]]; then
    echo -e "检测到旧的config目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_root/data
+    cp -rf $dir_root/config $dir_data
    echo
  fi
 }
@@ -474,6 +459,5 @@ handle_task_end() {
 init_env
 detect_termux
 detect_macos
-define_cmd

 import_config $1
@@ -156,21 +156,15 @@ update_raw() {
    autoDelCron=${AutoDelCron}
  fi

-  local proxyStr=""
-  if [[ $proxy ]]; then
-    if [[ $url == http:* ]]; then
-      proxyStr="-e \"http_proxy=${proxy}\""
-    elif [[ $url == https:* ]]; then
-      proxyStr="-e \"http_proxy=${proxy};https_proxy=${proxy}\""
-    fi
-  fi
-
  local raw_url="$url"
  local suffix="${raw_url##*.}"
  local raw_file_name="${uniq_path}.${suffix}"
  echo -e "开始下载：${raw_url} \n\n保存路径：$dir_raw/${raw_file_name}\n"

-  wget -q --no-check-certificate $proxyStr -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+  set_proxy "$proxy"
+  wget -q --no-check-certificate -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+  exit_status=$?
+  unset_proxy

  if [[ $? -eq 0 ]]; then
    mv "$dir_raw/${raw_file_name}.new" "$dir_raw/${raw_file_name}"
@@ -248,8 +242,8 @@ reload_qinglong() {
  fi

  if [[ "$reload_target" == 'data' ]]; then
-    rm -rf ${dir_root}/data/*
-    mv -f ${dir_tmp}/data/* ${dir_root}/data/
+    rm -rf ${dir_data}/*
+    mv -f ${dir_tmp}/data/* ${dir_data}/
  fi

  reload_pm2
@@ -527,7 +521,7 @@ main() {
  raw)
    get_uniq_path "$p2"
    if [[ -n $p2 ]]; then
-      update_raw "$p2" "$p3" "$p4"
+      update_raw "$p2" "$p3" "$p4" "$p5"
    else
      eval echo -e "命令输入错误...\\\n" $cmd
      eval usage $cmd
@@ -57,6 +57,7 @@ import { useVT } from 'virtualizedtableforantd4';
 import { ICrontab, OperationName, OperationPath, CrontabStatus } from './type';
 import Name from '@/components/name';
 import dayjs from 'dayjs';
+import { noop } from 'lodash';

 const { Text, Paragraph, Link } = Typography;
 const { Search } = Input;
@@ -76,7 +77,7 @@ const Crontab = () => {
            wordBreak: 'break-all',
            marginBottom: 0,
            color: '#1890ff',
-            cursor: 'pointer'
+            cursor: 'pointer',
          }}
          ellipsis={{ tooltip: text, rows: 2 }}
          onClick={() => {
@@ -270,9 +271,14 @@ const Crontab = () => {
        record.sub_id ? (
          <Name
            service={() =>
-              request.get(`${config.apiPrefix}subscriptions/${record.sub_id}`)
+              request.get(`${config.apiPrefix}subscriptions/${record.sub_id}`, {
+                onError: noop,
+              })
            }
-            options={{ ready: record?.sub_id, cacheKey: record.sub_id }}
+            options={{
+              ready: record?.sub_id,
+              cacheKey: record.sub_id,
+            }}
          />
        ) : (
          '-'
@@ -48,8 +48,9 @@ const Dependence = () => {
        pick(systemConfig, dataMap[path]),
      )
      .then((res) => {})
-      .catch((error: any) => {
-        console.log(error);
+      .catch(() => {
+        setLoading(false);
+        setLog((p) => `${p}update mirror error`);
      });
  };

@@ -1,29 +1,44 @@
-import intl from 'react-intl-universal'
+import intl from 'react-intl-universal';
 import { message } from 'antd';
 import config from './config';
 import { history } from '@umijs/max';
-import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from 'axios';
+import axios, {
+  AxiosError,
+  AxiosInstance,
+  AxiosRequestConfig,
+  AxiosResponse,
+  InternalAxiosRequestConfig,
+} from 'axios';

-interface IResponseData {
+export interface IResponseData {
  code?: number;
  data?: any;
  message?: string;
  error?: any;
 }

-type Override<
+export type Override<
  T,
  K extends Partial<{ [P in keyof T]: any }> | string,
 > = K extends string
  ? Omit<T, K> & { [P in keyof T]: T[P] | unknown }
  : Omit<T, keyof K> & K;

+export interface ICustomConfig {
+  onError?: (res: AxiosResponse<unknown, any>) => void;
+}
+
 message.config({
  duration: 2,
 });

 const time = Date.now();
-const errorHandler = function (error: AxiosError) {
+const errorHandler = function (
+  error: Override<
+    AxiosError<IResponseData>,
+    { config: InternalAxiosRequestConfig & ICustomConfig }
+  >,
+) {
  if (error.response) {
    const msg = error.response.data
      ? error.response.data.message || error.message || error.response.data
@@ -38,6 +53,10 @@ const errorHandler = function (error: AxiosError) {
        history.push('/login');
      }
    } else {
+      if (typeof error.config?.onError === 'function') {
+        return error.config?.onError(error.response);
+      }
+
      message.error({
        content: msg,
        style: { maxWidth: 500, margin: '0 auto' },
@@ -105,21 +124,21 @@ export const request = _request as Override<
  {
    get<T = IResponseData, D = any>(
      url: string,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
    ): Promise<T>;
    delete<T = IResponseData, D = any>(
      url: string,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
    ): Promise<T>;
    post<T = IResponseData, D = any>(
      url: string,
      data?: D,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
    ): Promise<T>;
    put<T = IResponseData, D = any>(
      url: string,
      data?: D,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
    ): Promise<T>;
  }
 >;
@@ -1,9 +1,8 @@
-version: 2.17.5
-changeLogLink: https://t.me/jiao_long/406
-publishTime: 2024-05-25 19:00
+version: 2.17.7
+changeLogLink: https://t.me/jiao_long/408
+publishTime: 2024-06-30 16:00
 changeLog: |
-  1. 修复有可能手动运行任务无日志
-  2. 重构 JavaScript 脚本通知文件
-  3. PushMe 通知支持自建服务
-  4. 增加微加机器人消息通道
-  5. 修复任务详情查看脚本错误
+  1. 修复更新任务状态错误
+  2. 修复查询系统 health 状态错误
+  3. 修复更新 linux 镜像源错误
+  4. npm 包支持 alpine 和 debian、ubuntu，修复 linux 依赖安装命令
Author	SHA1	Message	Date
whyour	f4337008eb	修复文件校验	2024-07-07 21:26:11 +08:00
whyour	ca5cb88eca	测试 cli	2024-07-07 20:17:36 +08:00
whyour	5afac3a3ac	更新版本 v2.17.7	2024-07-02 00:44:56 +08:00
whyour	71ba1534f2	增加自定写入 js 和 py 类型环境变量	2024-07-02 00:44:48 +08:00
whyour	791cf657b5	修复更新 linux 镜像源错误	2024-06-30 15:09:17 +08:00
whyour	c1ef021009	更新 readme	2024-06-30 00:55:10 +08:00
whyour	90fe63211d	修复修改任务状态可能报错	2024-06-28 20:41:05 +08:00
whyour	b60cda66bb	更新版本 v2.17.6	2024-06-25 22:25:43 +08:00
whyour	7efe81df9e	修复 data 目录判断逻辑	2024-06-25 22:25:36 +08:00
whyour	0d492e94f4	修复未设置通知时通知报错	2024-06-23 22:22:36 +08:00
whyour	a45efbd69b	修复定时任务查询不存在的订阅报错	2024-06-17 23:04:47 +08:00
whyour	035f0eb9e3	修复通知文件一言设置	2024-06-16 00:28:45 +08:00
whyour	7d0cae7839	修复单文件订阅代理无效	2024-06-13 22:53:49 +08:00
whyour	46e71d8213	修复系统设置数据未初始化	2024-06-12 13:53:45 +08:00
whyour	372afb92c6	更新 readme	2024-06-09 21:33:30 +08:00
whyour	69d9307be9	bark 推送改为 post 请求	2024-06-07 10:54:58 +08:00
whyour	c3908e956f	修复下载单文件订阅	2024-06-06 22:40:51 +08:00