Fix: Disable/enable associated cron tasks when subscription is disabled/enabled

When a subscription is disabled, the associated cron tasks (created by the subscription) were still running and updating scripts. This fix ensures that:
- When disabling a subscription, all cron tasks with matching sub_id are also disabled
- When enabling a subscription, all cron tasks with matching sub_id are also enabled

This addresses the actual root cause: subscription tasks don't run when disabled (as the owner correctly pointed out), but the cron tasks created by those subscriptions were still active.

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

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

@@ -129,13 +129,6 @@ jobs:
         with:
           cache: "pnpm"
 
-      - name: Read version from version.yaml
-        id: version
-        run: |
-          VERSION=$(grep '^version:' version.yaml | awk '{print $2}')
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "Version: $VERSION"
-
       - name: Setup timezone
         uses: szenius/set-timezone@v2.0
         with:
@@ -161,13 +154,19 @@ jobs:
           images: |
             ${{ github.repository }}
             ghcr.io/${{ github.repository }}
+          # generate Docker tags based on the following events/attributes
+          #   nightly, master, pr-2, 1.2.3, 1.2, 1
           flavor: |
             latest=false
           tags: |
+            type=schedule,pattern=nightly
+            type=edge
+            type=ref,event=pr
             type=ref,event=branch,enable=${{ github.ref != format('refs/heads/{0}', 'master') }}
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
-            type=raw,value=${{ steps.version.outputs.version }},enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
             type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -217,13 +216,6 @@ jobs:
         with:
           cache: "pnpm"
 
-      - name: Read version from version.yaml
-        id: version
-        run: |
-          VERSION=$(grep '^version:' version.yaml | awk '{print $2}')
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "Version: $VERSION"
-
       - name: Setup timezone
         uses: szenius/set-timezone@v2.0
         with:
@@ -262,9 +254,7 @@ jobs:
           context: .
           file: ./docker/310.Dockerfile
           push: true
-          tags: |
+          tags: whyour/qinglong:python3.10
-            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
 

back/api/script.ts

@@ -129,8 +129,7 @@ export default (app: Router) => {
         content: Joi.string().optional().allow(''),
         originFilename: Joi.string().optional().allow(''),
         directory: Joi.string().optional().allow(''),
-        file: Joi.string().optional().allow(''),
+      }),
-      }).unknown(true),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       try {

back/data/notify.ts

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

back/services/cron.ts

@@ -507,7 +507,7 @@ export default class CronService {
         let { id, command, log_name } = cron;
 
         const uniqPath =
-          log_name === '/dev/null' || !log_name
+          log_name === '/dev/null'
             ? await getUniqPath(command, `${id}`)
             : log_name;
         const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
@@ -641,11 +641,7 @@ export default class CronService {
     if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
       command = `${TASK_PREFIX}${tab.command}`;
     }
-    let commandVariable = `real_time=${Boolean(realTime)} no_tee=true ID=${tab.id} `;
+    let commandVariable = `real_time=${Boolean(realTime)} log_name=${tab.log_name} no_tee=true ID=${tab.id} `;
-    // Only include log_name if it has a truthy value to avoid passing null/undefined to shell
-    if (tab.log_name) {
-      commandVariable += `log_name=${tab.log_name} `;
-    }
     if (tab.task_before) {
       commandVariable += `task_before='${tab.task_before
         .replace(/'/g, "'\\''")

back/services/notify.ts

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

back/services/sshKey.ts

@@ -133,15 +133,15 @@ export default class SshKeyService {
   }
 
   public async addGlobalSSHKey(key: string, alias: string): Promise<void> {
-    await this.generatePrivateKeyFile(`~global_${alias}`, key);
+    await this.generatePrivateKeyFile(`global_${alias}`, key);
     // Create a global SSH config entry that matches all hosts
     // This allows the key to be used for any Git repository
-    await this.generateGlobalSshConfig(`~global_${alias}`);
+    await this.generateGlobalSshConfig(`global_${alias}`);
   }
 
   public async removeGlobalSSHKey(alias: string): Promise<void> {
-    await this.removePrivateKeyFile(`~global_${alias}`);
+    await this.removePrivateKeyFile(`global_${alias}`);
-    await this.removeSshConfig(`~global_${alias}`);
+    await this.removeSshConfig(`global_${alias}`);
   }
 
   private async generateGlobalSshConfig(alias: string) {

back/services/subscription.ts

@@ -350,6 +350,11 @@ export default class SubscriptionService {
     for (const doc of docs) {
       await this.handleTask(doc.get({ plain: true }), false);
     }
+    // Disable associated cron tasks
+    const crons = await CrontabModel.findAll({ where: { sub_id: ids } });
+    if (crons?.length) {
+      await this.crontabService.disabled(crons.map((x) => x.id!));
+    }
   }
 
   public async enabled(ids: number[]) {
@@ -359,6 +364,11 @@ export default class SubscriptionService {
     for (const doc of docs) {
       await this.handleTask(doc.get({ plain: true }));
     }
+    // Enable associated cron tasks
+    const crons = await CrontabModel.findAll({ where: { sub_id: ids } });
+    if (crons?.length) {
+      await this.crontabService.enabled(crons.map((x) => x.id!));
+    }
   }
 
   public async log(id: number) {

back/shared/runCron.ts

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

back/validation/schedule.ts

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

docker/docker-entrypoint.sh

@@ -23,7 +23,7 @@ log_with_style() {
 if [ -f /etc/alpine-release ]; then
   if ! grep -q "^options ndots:0" /etc/resolv.conf 2>/dev/null; then
     echo "options ndots:0" >> /etc/resolv.conf
-    log_with_style "INFO" "🔧  0. 已配置 DNS 解析优化 (ndots:0)"
+    log_with_style "INFO" "🔧 已配置 DNS 解析优化 (ndots:0)"
   fi
 fi
 

sample/notify.js

@@ -52,7 +52,6 @@ const push_config = {
   DD_BOT_TOKEN: '', // 钉钉机器人的 DD_BOT_TOKEN
 
   FSKEY: '', // 飞书机器人的 FSKEY
-  FSSECRET: '', // 飞书机器人的 FSSECRET，对应安全设置里的签名校验密钥
 
   // 推送到个人QQ：http://127.0.0.1/send_private_msg
   // 群：http://127.0.0.1/send_group_msg
@@ -990,26 +989,11 @@ function aibotkNotify(text, desp) {
 
 function fsBotNotify(text, desp) {
   return new Promise((resolve) => {
-    const { FSKEY, FSSECRET } = push_config;
+    const { FSKEY } = push_config;
     if (FSKEY) {
-      const body = { msg_type: 'text', content: { text: `${text}\n\n${desp}` } };
-
-      // Add signature if secret is provided
-      // Note: Feishu's signature algorithm uses timestamp+"\n"+secret as the HMAC key
-      // and signs an empty message, which differs from typical HMAC usage
-      if (FSSECRET) {
-        const crypto = require('crypto');
-        const timestamp = Math.floor(Date.now() / 1000).toString();
-        const stringToSign = `${timestamp}\n${FSSECRET}`;
-        const hmac = crypto.createHmac('sha256', stringToSign);
-        const sign = hmac.digest('base64');
-        body.timestamp = timestamp;
-        body.sign = sign;
-      }
-
       const options = {
         url: `https://open.feishu.cn/open-apis/bot/v2/hook/${FSKEY}`,
-        json: body,
+        json: { msg_type: 'text', content: { text: `${text}\n\n${desp}` } },
         headers: {
           'Content-Type': 'application/json',
         },

sample/notify.py

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

src/locales/en-US.json

@@ -389,7 +389,6 @@
   "消息接收人": "message recipient",
   "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版": "Version, you can specify 'pro' for the Professional version and 'personal' for the Personal version. If left blank, it will default to the Professional version.",
   "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "Feishu group bot: https://www.feishu.cn/hc/zh-CN/articles/360024984973",
-  "飞书群组机器人加签密钥，安全设置中开启签名校验后获得": "Feishu group bot signature secret, obtained after enabling signature verification in security settings",
   "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "Email service name, e.g., 126, 163, Gmail, QQ, etc. Supported list: https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
   "邮箱地址": "Email Address",
   "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "The SMTP login password may also be a special passphrase, depending on the specific email service provider's instructions",

src/locales/zh-CN.json

@@ -389,7 +389,6 @@
   "消息接收人": "消息接收人",
   "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版": "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版",
   "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973",
-  "飞书群组机器人加签密钥，安全设置中开启签名校验后获得": "飞书群组机器人加签密钥，安全设置中开启签名校验后获得",
   "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
   "邮箱地址": "邮箱地址",
   "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定",

src/utils/config.ts

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