更新版本 v2.13.8

README.md

@@ -163,11 +163,11 @@ task <file_path> desi <env_name> <account_number>
 
 * file_url: 脚本地址
 * repo_url: 仓库地址
-* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串
-* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串
-* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响
+* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割
+* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割
+* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割
+* extensions: 拉取仓库的文件后缀，多个竖线分割
 * branch: 拉取仓库的分支
-* extensions: 拉取仓库的文件后缀
 * days: 需要保留的日志的天数
 * file_path: 任务执行时的文件路径
 * env_name: 任务执行时需要并发或者指定时的环境变量名称

back/loaders/initTask.ts

@@ -3,12 +3,30 @@ import _ from 'lodash';
 import SystemService from '../services/system';
 import ScheduleService from '../services/schedule';
 import SubscriptionService from '../services/subscription';
+import config from '../config';
+import { fileExist } from '../config/util';
 
 export default async () => {
   const systemService = Container.get(SystemService);
   const scheduleService = Container.get(ScheduleService);
   const subscriptionService = Container.get(SubscriptionService);
 
+  // 生成内置token
+  let tokenCommand = `ts-node-transpile-only ${config.rootPath}/back/token.ts`;
+  const tokenFile = `${config.rootPath}/static/build/token.js`;
+  if (await fileExist(tokenFile)) {
+    tokenCommand = `node ${tokenFile}`;
+  }
+  const cron = {
+    id: 'token',
+    name: '生成token',
+    command: tokenCommand,
+  };
+  scheduleService.createIntervalTask(cron as any, {
+    days: 28,
+    runImmediately: true,
+  });
+
   // 运行删除日志任务
   const data = await systemService.getLogRemoveFrequency();
   if (data && data.info && data.info.frequency) {
@@ -17,7 +35,7 @@ export default async () => {
       name: '删除日志',
       command: `ql rmlog ${data.info.frequency}`,
     };
-    await scheduleService.createIntervalTask(cron, {
+    scheduleService.createIntervalTask(cron, {
       days: data.info.frequency,
       runImmediately: true,
     });

back/services/env.ts

@@ -168,7 +168,7 @@ export default class EnvService {
             .filter((x) => x.status !== EnvStatus.disabled)
             .map('value')
             .join('&')
-            .replace(/(\\)[^\n]/g, '\\\\')
+            .replace(/(\\)[^n]/g, '\\\\')
             .replace(/(\\$)/, '\\\\')
             .replace(/"/g, '\\"')
             .trim();

back/services/open.ts

@@ -145,7 +145,7 @@ export default class OpenService {
     }
   }
 
-  public async findSystemToken(): Promise<{
+  public async generateSystemToken(): Promise<{
     value: string;
     expiration: number;
   }> {
@@ -158,22 +158,13 @@ export default class OpenService {
         scopes: ['crons', 'system'],
       } as App);
     }
-    const nowTime = Math.round(Date.now() / 1000);
-    let token;
-    if (
-      !systemApp.tokens ||
-      !systemApp.tokens.length ||
-      nowTime > [...systemApp.tokens].pop()!.expiration
-    ) {
-      const authToken = await this.authToken({
-        client_id: systemApp.client_id,
-        client_secret: systemApp.client_secret,
-      });
-      token = authToken.data;
-      token.value = token.token;
-    } else {
-      token = [...systemApp.tokens].pop();
-    }
-    return token;
+    const { data } = await this.authToken({
+      client_id: systemApp.client_id,
+      client_secret: systemApp.client_secret,
+    });
+    return {
+      ...data,
+      value: data.token,
+    };
   }
 }

back/services/schedule.ts

@@ -169,7 +169,7 @@ export default class ScheduleService {
     );
 
     const job = new LongIntervalJob(
-      { ...schedule, runImmediately: false },
+      { runImmediately: false, ...schedule },
       task,
       _id,
     );

back/services/subscription.ts

@@ -42,47 +42,22 @@ export default class SubscriptionService {
   public async list(searchText?: string): Promise<Subscription[]> {
     let query = {};
     if (searchText) {
-      const textArray = searchText.split(':');
-      switch (textArray[0]) {
-        case 'name':
-        case 'command':
-        case 'schedule':
-        case 'label':
-          const column = textArray[0] === 'label' ? 'labels' : textArray[0];
-          query = {
-            [column]: {
-              [Op.or]: [
-                { [Op.like]: `%${textArray[1]}%` },
-                { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
-              ],
-            },
-          };
-          break;
-        default:
-          const reg = {
-            [Op.or]: [
-              { [Op.like]: `%${searchText}%` },
-              { [Op.like]: `%${encodeURIComponent(searchText)}%` },
-            ],
-          };
-          query = {
-            [Op.or]: [
-              {
-                name: reg,
-              },
-              {
-                command: reg,
-              },
-              {
-                schedule: reg,
-              },
-              {
-                labels: reg,
-              },
-            ],
-          };
-          break;
-      }
+      const reg = {
+        [Op.or]: [
+          { [Op.like]: `%${searchText}%` },
+          { [Op.like]: `%${encodeURIComponent(searchText)}%` },
+        ],
+      };
+      query = {
+        [Op.or]: [
+          {
+            name: reg,
+          },
+          {
+            url: reg,
+          },
+        ],
+      };
     }
     try {
       const result = await SubscriptionModel.findAll({

back/token.ts

@@ -10,41 +10,19 @@ const tokenFile = path.join(config.configPath, 'token.json');
 
 async function getToken() {
   try {
-    const data = await readFile();
-    const nowTime = Math.round(Date.now() / 1000);
-    if (data.value && data.expiration > nowTime) {
-      console.log(data.value);
-    } else {
-      Container.set('logger', LoggerInstance);
-      const openService = Container.get(OpenService);
-      const appToken = await openService.findSystemToken();
-      console.log(appToken.value);
-      await writeFile({
-        value: appToken.value,
-        expiration: appToken.expiration,
-      });
-    }
+    Container.set('logger', LoggerInstance);
+    const openService = Container.get(OpenService);
+    const appToken = await openService.generateSystemToken();
+    console.log(appToken.value);
+    await writeFile({
+      value: appToken.value,
+      expiration: appToken.expiration,
+    });
   } catch (error) {
     console.log(error);
   }
 }
 
-async function readFile() {
-  return new Promise<any>((resolve, reject) => {
-    fs.readFile(
-      path.join(config.configPath, 'token.json'),
-      { encoding: 'utf8' },
-      (err, data) => {
-        if (err) {
-          resolve({});
-        } else {
-          resolve(JSON.parse(data));
-        }
-      },
-    );
-  });
-}
-
 async function writeFile(data: any) {
   return new Promise<void>((resolve, reject) => {
     fs.writeFile(tokenFile, JSON.stringify(data), { encoding: 'utf8' }, () => {

docker/Dockerfile

@@ -34,10 +34,12 @@ RUN set -x \
                              openssh \
                              py3-pip \
     && rm -rf /var/cache/apk/* \
+    && apk update \
     && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && echo "Asia/Shanghai" > /etc/timezone \
     && git config --global user.email "qinglong@@users.noreply.github.com" \
     && git config --global user.name "qinglong" \
+    && git config --global http.postBuffer 524288000 \
     && npm install -g pnpm \
     && pnpm add -g pm2 ts-node typescript tslib \
     && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \

sample/notify.js

@@ -97,6 +97,13 @@ let IGOT_PUSH_KEY = '';
 let PUSH_PLUS_TOKEN = '';
 let PUSH_PLUS_USER = '';
 
+// =======================================Cool Push设置区域=======================================
+//官方文档：https://cp.xuthus.cc/docs
+//QQ_SKEY: Cool Push登录授权后推送消息的调用代码Skey
+//QQ_MODE: 推送模式详情请登录获取QQ_SKEY后见https://cp.xuthus.cc/feat
+let QQ_SKEY = '';
+let QQ_MODE = '';
+
 //==========================云端环境变量的判断与接收=========================
 if (process.env.GOTIFY_URL) {
   GOTIFY_URL = process.env.GOTIFY_URL;
@@ -723,9 +730,9 @@ function qywxamNotify(text, desp) {
         timeout,
       };
       $.post(options_accesstoken, (err, resp, data) => {
-        html = desp.replace(/\n/g, '<br/>');
-        var json = JSON.parse(data);
-        accesstoken = json.access_token;
+        let html = desp.replace(/\n/g, '<br/>');
+        let json = JSON.parse(data);
+        let accesstoken = json.access_token;
         let options;
 
         switch (QYWX_AM_AY[4]) {

shell/api.sh

@@ -1,12 +1,7 @@
 #!/usr/bin/env bash
 
 get_token() {
-    local tokenFile="$dir_static/build/token.js"
-    if [[ ! -f  "$tokenFile" ]]; then
-        token=$(ts-node-transpile-only "$dir_root/back/token.ts")
-    else
-        token=$(node "$tokenFile")
-    fi
+    token=$(cat $file_auth_token | jq -r .value)
 }
 
 add_cron_api() {

shell/share.sh

@@ -24,6 +24,7 @@ file_sharecode=$dir_config/sharecode.sh
 file_config_user=$dir_config/config.sh
 file_auth_sample=$dir_sample/auth.sample.json
 file_auth_user=$dir_config/auth.json
+file_auth_token=$dir_config/token.json
 file_extra_shell=$dir_config/extra.sh
 file_task_before=$dir_config/task_before.sh
 file_task_after=$dir_config/task_after.sh

shell/update.sh

@@ -388,6 +388,9 @@ gen_list_repo() {
     local index=0
     if [[ $6 ]]; then
         file_extensions="$6"
+        if [[ $file_extensions =~ "|" ]]; then
+            file_extensions=$(echo $file_extensions | sed 's/|/ /g')
+        fi
     fi
     for extension in $file_extensions; do
         if [[ $index -eq 0 ]]; then

src/version.ts

@@ -1,5 +1,5 @@
-export const version = '2.13.6';
-export const changeLogLink = 'https://t.me/jiao_long/321';
-export const changeLog = `2.13.6 版本说明
-1. 修复 cant't find .env
+export const version = '2.13.8';
+export const changeLogLink = 'https://t.me/jiao_long/323';
+export const changeLog = `2.13.8 版本说明
+1. 修改系统token访问逻辑，加快任务启动速度
 `;