更新版本 v2.13.7

检测termux时只看环境变量，以便于区分原生termux和termux中安装的Linux发行版
测试发现${ANDROID_RUNTIME_ROOT}${ANDROID_ROOT}在termux中安装的Linux发行版中仍旧存在，但是发行版中应该不用设置软连接吧

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/app.ts

@@ -1,10 +1,8 @@
 import 'reflect-metadata'; // We need this in order to use @Decorators
-
 import config from './config';
-
 import express from 'express';
-
 import Logger from './loaders/logger';
+import path from 'path';
 
 async function startServer() {
   const app = express();

back/config/index.ts

@@ -4,10 +4,21 @@ import { createRandomString } from './util';
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
+if (!process.env.QL_DIR) {
+  // 声明QL_DIR环境变量
+  let qlHomePath = path.join(__dirname, '../../');
+  // 生产环境
+  if (qlHomePath.endsWith('/static/')) {
+    qlHomePath = path.join(qlHomePath, '../');
+  }
+  process.env.QL_DIR = qlHomePath;
+}
+
 const lastVersionFile = `http://qn.whyour.cn/version.ts?v=${Date.now()}`;
 
-const envFound = dotenv.config();
-const rootPath = process.cwd();
+const rootPath = process.env.QL_DIR as string;
+const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
+
 const dataPath = path.join(rootPath, 'data/');
 const samplePath = path.join(rootPath, 'sample/');
 const configPath = path.join(dataPath, 'config/');

back/loaders/initFile.ts

@@ -5,7 +5,7 @@ import dotenv from 'dotenv';
 import Logger from './logger';
 import { fileExist } from '../config/util';
 
-const rootPath = process.cwd();
+const rootPath = process.env.QL_DIR as string;;
 const dataPath = path.join(rootPath, 'data/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
@@ -64,13 +64,5 @@ export default async () => {
 
   dotenv.config({ path: confFile });
 
-  // 声明QL_DIR环境变量
-  let qlHomePath = path.join(__dirname, '../../');
-  // 生产环境
-  if (qlHomePath.endsWith('/static/')) {
-    qlHomePath = path.join(qlHomePath, '../');
-  }
-  process.env.QL_DIR = qlHomePath;
-
   Logger.info('✌️ Init file down');
 };

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

@@ -170,6 +170,7 @@ export default class OpenService {
         client_secret: systemApp.client_secret,
       });
       token = authToken.data;
+      token.value = token.token;
     } else {
       token = [...systemApp.tokens].pop();
     }

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

@@ -1,9 +1,9 @@
 import 'reflect-metadata';
-import OpenService from '../back/services/open';
+import OpenService from './services/open';
 import { Container } from 'typedi';
-import LoggerInstance from '../back/loaders/logger';
+import LoggerInstance from './loaders/logger';
 import fs from 'fs';
-import config from '../back/config';
+import config from './config';
 import path from 'path';
 
 const tokenFile = path.join(config.configPath, 'token.json');

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,7 +1,12 @@
 #!/usr/bin/env bash
 
 get_token() {
-    token=$(ts-node-transpile-only "$dir_shell/token.ts")
+    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
 }
 
 add_cron_api() {

shell/share.sh

@@ -401,6 +401,17 @@ format_time() {
     fi
 }
 
+format_log_time() {
+    local format="$1"
+    local time="$2"
+
+    if [[ $is_macos -eq 1 ]]; then
+        echo $(date -j -f "$format" "$time" "+%Y-%m-%d-%H-%M-%S")
+    else
+        echo $(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
+    fi
+}
+
 format_timestamp() {
     local format="$1"
     local time="$2"

shell/task.sh

@@ -84,8 +84,8 @@ run_normal() {
         fi
     fi
 
-    local time=$(date "+%Y-%m-%d-%H-%M-%S")
-    log_time="$time"
+    local time=$(date "+$time_format")
+    log_time=$(format_log_time "$time_format" "$time")
     log_dir_tmp="${file_param##*/}"
     if [[ $file_param =~ "/" ]]; then
         if [[ $file_param == /* ]]; then
@@ -103,8 +103,9 @@ run_normal() {
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir "$dir_log/$log_dir"
 
-    local begin_time=$(format_time "%Y-%m-%d-%H-%M-%S" "$time")
-    local begin_timestamp=$(format_timestamp "%Y-%m-%d-%H-%M-%S" "$time")
+    local begin_time=$(format_time "$time_format" "$time")
+    local begin_timestamp=$(format_timestamp "$time_format" "$time")
+    
     eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
     [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
 
@@ -155,8 +156,8 @@ run_concurrent() {
     [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
 
     define_program "$file_param"
-    local time=$(date "+%Y-%m-%d-%H-%M-%S")
-    log_time="$time"
+    local time=$(date "+$time_format")
+    log_time=$(format_log_time "$time_format" "$time")
     log_dir_tmp="${file_param##*/}"
     if [[ $file_param =~ "/" ]]; then
         if [[ $file_param == /* ]]; then
@@ -174,8 +175,8 @@ run_concurrent() {
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir "$dir_log/$log_dir"
 
-    local begin_time=$(format_time "%Y-%m-%d-%H-%M-%S" "$time")
-    local begin_timestamp=$(format_timestamp "%Y-%m-%d-%H-%M-%S" "$time")
+    local begin_time=$(format_time "$time_format" "$time")
+    local begin_timestamp=$(format_timestamp "$time_format" "$time")
 
     eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
     [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
@@ -225,8 +226,8 @@ run_designated() {
     fi
 
     define_program "$file_param"
-    local time=$(date "+%Y-%m-%d-%H-%M-%S")
-    log_time="$time"
+    local time=$(date "+$time_format")
+    log_time=$(format_log_time "$time_format" "$time")
     log_dir_tmp="${file_param##*/}"
     if [[ $file_param =~ "/" ]]; then
         if [[ $file_param == /* ]]; then
@@ -244,8 +245,8 @@ run_designated() {
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir "$dir_log/$log_dir"
 
-    local begin_time=$(format_time "%Y-%m-%d-%H-%M-%S" "$time")
-    local begin_timestamp=$(format_timestamp "%Y-%m-%d-%H-%M-%S" "$time")
+    local begin_time=$(format_time "$time_format" "$time")
+    local begin_timestamp=$(format_timestamp "$time_format" "$time")
 
     local envs=$(eval echo "\$${env_param}")
     local array=($(echo $envs | sed 's/&/ /g'))
@@ -289,8 +290,8 @@ run_designated() {
 run_else() {
     local file_param="$1"
     define_program "$file_param"
-    local time=$(date "+%Y-%m-%d-%H-%M-%S")
-    log_time="$time"
+    local time=$(date "+$time_format")
+    log_time=$(format_log_time "$time_format" "$time")
     log_dir_tmp="${file_param##*/}"
     if [[ $file_param =~ "/" ]]; then
         if [[ $file_param == /* ]]; then
@@ -308,8 +309,8 @@ run_else() {
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir "$dir_log/$log_dir"
 
-    local begin_time=$(format_time "%Y-%m-%d-%H-%M-%S" "$time")
-    local begin_timestamp=$(format_timestamp "%Y-%m-%d-%H-%M-%S" "$time")
+    local begin_time=$(format_time "$time_format" "$time")
+    local begin_timestamp=$(format_timestamp "$time_format" "$time")
 
     eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
     [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
@@ -354,6 +355,7 @@ main() {
         timeoutCmd="timeout -k 10s $command_timeout_time "
     fi
 
+    time_format="%Y-%m-%d %H:%M:%S"
     if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
         case $# in
         1)

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,14 +1,8 @@
-export const version = '2.13.4';
-export const changeLogLink = 'https://t.me/jiao_long/303';
-export const changeLog = `2.13.4 版本说明
-1. 增加系统token，防止未登录时无法更新仓库和任务状态
-2. 脚本管理按照类型排序
-3. 任务详情中编辑脚本支持全屏
-4. 环境变量增加导出功能
-5. 修复无法更新脚本内容为空
-6. 修复停止node脚本报错
-7. 修改手动停止任务耗时
-8. 修复脚本管理、日志管理树
-9. 修复获取环境变量详情
-10. 区分原生termux和termux中安装的Linux发，感谢 erma0
+export const version = '2.13.7';
+export const changeLogLink = 'https://t.me/jiao_long/322';
+export const changeLog = `2.13.7 版本说明
+1. 修复typescript脚本引用sendNotify文件，感谢 charmingYouYou
+2. 修复订阅管理搜索
+3. 修复环境变量\n转义
+4. repo命令后缀参数改为竖线分割
 `;