@whyour/qinglong 0.11.2 → 0.12.0

package/sample/notify.py

@@ -101,7 +101,17 @@ push_config = {
     'SMTP_PASSWORD': '',                # SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
     'SMTP_NAME': '',                    # SMTP 收发件人姓名，可随意填写
 
-    'PUSHME_KEY': '',                     # PushMe 酱的 PUSHME_KEY
+    'PUSHME_KEY': '',                   # PushMe 酱的 PUSHME_KEY
+    
+    'CHRONOCAT_QQ': '',                 # qq号
+    'CHRONOCAT_TOKEN': '',              # CHRONOCAT 的token
+    'CHRONOCAT_URL': '',                # CHRONOCAT的url地址
+    
+    'WEBHOOK_URL': '',                  # 自定义通知 请求地址
+    'WEBHOOK_BODY': '',                 # 自定义通知 请求体
+    'WEBHOOK_HEADERS': '',              # 自定义通知 请求头
+    'WEBHOOK_METHOD': '',               # 自定义通知 请求方法
+    'WEBHOOK_CONTENT_TYPE': ''          # 自定义通知 content-type
 }
 notify_function = []
 # fmt: on
@@ -446,7 +456,9 @@ class WeCom:
         return data["access_token"]
 
     def send_text(self, message, touser="@all"):
-        send_url = f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        send_url = (
+            f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        )
         send_values = {
             "touser": touser,
             "msgtype": "text",
@@ -460,7 +472,9 @@ class WeCom:
         return respone["errmsg"]
 
     def send_mpnews(self, title, message, media_id, touser="@all"):
-        send_url = f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        send_url = (
+            f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        )
         send_values = {
             "touser": touser,
             "msgtype": "mpnews",
@@ -643,6 +657,7 @@ def smtp(title: str, content: str) -> None:
     except Exception as e:
         print(f"SMTP 邮件 推送失败！{e}")
 
+
 def pushme(title: str, content: str) -> None:
     """
     使用 PushMe 推送消息。
@@ -665,6 +680,157 @@ def pushme(title: str, content: str) -> None:
         print(f"PushMe 推送失败！{response.status_code} {response.text}")
 
 
+def chronocat(title: str, content: str) -> None:
+    """
+    使用 CHRONOCAT 推送消息。
+    """
+    if (
+        not push_config.get("CHRONOCAT_URL")
+        or not push_config.get("CHRONOCAT_QQ")
+        or not push_config.get("CHRONOCAT_TOKEN")
+    ):
+        print("CHRONOCAT 服务的 CHRONOCAT_URL 或 CHRONOCAT_QQ 未设置!!\n取消推送")
+        return
+
+    print("CHRONOCAT 服务启动")
+
+    user_ids = re.findall(r"user_id=(\d+)", push_config.get("CHRONOCAT_QQ"))
+    group_ids = re.findall(r"group_id=(\d+)", push_config.get("CHRONOCAT_QQ"))
+
+    url = f'{push_config.get("CHRONOCAT_URL")}/api/message/send'
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": f'Bearer {push_config.get("CHRONOCAT_TOKEN")}',
+    }
+
+    for chat_type, ids in [(1, user_ids), (2, group_ids)]:
+        if not ids:
+            continue
+        for chat_id in ids:
+            data = {
+                "peer": {"chatType": chat_type, "peerUin": chat_id},
+                "elements": [
+                    {
+                        "elementType": 1,
+                        "textElement": {"content": f"{title}\n\n{content}"},
+                    }
+                ],
+            }
+            response = requests.post(url, headers=headers, data=json.dumps(data))
+            if response.status_code == 200:
+                if chat_type == 1:
+                    print(f"QQ个人消息:{ids}推送成功！")
+                else:
+                    print(f"QQ群消息:{ids}推送成功！")
+            else:
+                if chat_type == 1:
+                    print(f"QQ个人消息:{ids}推送失败！")
+                else:
+                    print(f"QQ群消息:{ids}推送失败！")
+
+
+def parse_headers(headers):
+    if not headers:
+        return {}
+
+    parsed = {}
+    lines = headers.split("\n")
+
+    for line in lines:
+        i = line.find(":")
+        if i == -1:
+            continue
+
+        key = line[:i].strip().lower()
+        val = line[i + 1 :].strip()
+        parsed[key] = parsed.get(key, "") + ", " + val if key in parsed else val
+
+    return parsed
+
+
+def parse_body(body, content_type):
+    if not body:
+        return ""
+
+    parsed = {}
+    lines = body.split("\n")
+
+    for line in lines:
+        i = line.find(":")
+        if i == -1:
+            continue
+
+        key = line[:i].strip().lower()
+        val = line[i + 1 :].strip()
+
+        if not key or key in parsed:
+            continue
+
+        try:
+            json_value = json.loads(val)
+            parsed[key] = json_value
+        except:
+            parsed[key] = val
+
+    if content_type == "application/x-www-form-urlencoded":
+        data = urlencode(parsed, doseq=True)
+        return data
+
+    if content_type == "application/json":
+        data = json.dumps(parsed)
+        return data
+
+    return parsed
+
+
+def format_notify_content(url, body, title, content):
+    if "$title" not in url and "$title" not in body:
+        return {}
+
+    formatted_url = url.replace("$title", urllib.parse.quote_plus(title)).replace(
+        "$content", urllib.parse.quote_plus(content)
+    )
+    formatted_body = body.replace("$title", title).replace("$content", content)
+
+    return formatted_url, formatted_body
+
+
+def custom_notify(title: str, content: str) -> None:
+    """
+    通过 自定义通知 推送消息。
+    """
+    if not push_config.get("WEBHOOK_URL") or not push_config.get("WEBHOOK_METHOD"):
+        print("自定义通知的 WEBHOOK_URL 或 WEBHOOK_METHOD 未设置!!\n取消推送")
+        return
+
+    print("自定义通知服务启动")
+
+    WEBHOOK_URL = push_config.get("WEBHOOK_URL")
+    WEBHOOK_METHOD = push_config.get("WEBHOOK_METHOD")
+    WEBHOOK_CONTENT_TYPE = push_config.get("WEBHOOK_CONTENT_TYPE")
+    WEBHOOK_BODY = push_config.get("WEBHOOK_BODY")
+    WEBHOOK_HEADERS = push_config.get("WEBHOOK_HEADERS")
+
+    formatUrl, formatBody = format_notify_content(
+        WEBHOOK_URL, WEBHOOK_BODY, title, content
+    )
+
+    if not formatUrl and not formatBody:
+        print("请求头或者请求体中必须包含 $title 和 $content")
+        return
+
+    headers = parse_headers(WEBHOOK_HEADERS)
+    body = parse_body(formatBody, WEBHOOK_CONTENT_TYPE)
+    response = requests.request(
+        method=WEBHOOK_METHOD, url=formatUrl, headers=headers, timeout=15, data=body
+    )
+
+    if response.status_code == 200:
+        print("自定义通知推送成功！")
+    else:
+        print(f"自定义通知推送失败！{response.status_code} {response.text}")
+
+
 def one() -> str:
     """
     获取一条一言。
@@ -721,6 +887,14 @@ if (
     notify_function.append(smtp)
 if push_config.get("PUSHME_KEY"):
     notify_function.append(pushme)
+if (
+    push_config.get("CHRONOCAT_URL")
+    and push_config.get("CHRONOCAT_QQ")
+    and push_config.get("CHRONOCAT_TOKEN")
+):
+    notify_function.append(chronocat)
+if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"):
+    notify_function.append(custom_notify)
 
 
 def send(title: str, content: str) -> None:

package/shell/otask.sh

@@ -89,7 +89,7 @@ run_normal() {
     file_param=${file_param/$relative_path\//}
   fi
 
-  $timeoutCmd $which_program $file_param
+  $timeoutCmd $which_program $file_param "${script_params[@]}"
 }
 
 ## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
@@ -131,7 +131,7 @@ run_concurrent() {
   for i in "${!array[@]}"; do
     export "${env_param}=${array[i]}"
     single_log_path="$dir_log/$log_dir/${single_log_time}_$((i + 1)).log"
-    eval $timeoutCmd $which_program $file_param &>$single_log_path &
+    eval $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
   done
 
   wait
@@ -174,7 +174,7 @@ run_designated() {
     cd ${relative_path}
     file_param=${file_param/$relative_path\//}
   fi
-  $timeoutCmd $which_program $file_param
+  $timeoutCmd $which_program $file_param "${script_params[@]}"
 }
 
 ## 运行其他命令
@@ -225,6 +225,8 @@ main() {
   fi
 }
 
-handle_task_before "$@"
-main "$@"
-handle_task_after "$@"
+handle_task_start "${task_shell_params[@]}"
+run_task_before "${task_shell_params[@]}"
+main "${task_shell_params[@]}"
+run_task_after "${task_shell_params[@]}"
+handle_task_end "${task_shell_params[@]}"

package/shell/share.sh

@@ -105,9 +105,6 @@ set_proxy() {
 unset_proxy() {
   unset http_proxy
   unset https_proxy
-  unset ftp_proxy
-  unset all_proxy
-  unset no_proxy
 }
 
 make_dir() {
@@ -316,10 +313,8 @@ random_range() {
 
 reload_pm2() {
   cd $dir_root
-  # 代理会影响 grpc 服务
-  unset_proxy
   pm2 flush &>/dev/null
-  pm2 startOrGracefulReload $file_ecosystem_js --update-env
+  env ALL_PROXY= HTTP_PROXY= HTTPS_PROXY= all_proxy= http_proxy= https_proxy= pm2 startOrGracefulReload $file_ecosystem_js --update-env
 }
 
 diff_time() {
@@ -412,8 +407,18 @@ init_nginx() {
   local aliasStr=""
   local rootStr=""
   if [[ $ql_base_url != "/" ]]; then
+    if [[ $ql_base_url != /* ]]; then
+      ql_base_url="/$ql_base_url"
+    fi
+    if [[ $ql_base_url != */ ]]; then
+      ql_base_url="$ql_base_url/"
+    fi
     location_url="^~${ql_base_url%*/}"
     aliasStr="alias ${dir_static}/dist;"
+    if ! grep -q "<base href=\"$ql_base_url\">" "${dir_static}/dist/index.html"; then
+      awk -v text="<base href=\"$ql_base_url\">" '/<link/ && !inserted {print text; inserted=1} 1' "${dir_static}/dist/index.html" >temp.html
+      mv temp.html "${dir_static}/dist/index.html"
+    fi
   else
     rootStr="root ${dir_static}/dist;"
   fi
@@ -433,10 +438,13 @@ init_nginx() {
   sed -i "s,IPV4_CONFIG,${ipv4Str},g" /etc/nginx/conf.d/front.conf
 }
 
-handle_task_before() {
+handle_task_start() {
   [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
-
   echo -e "## 开始执行... $begin_time\n"
+}
+
+run_task_before() {
+  [[ $is_macos -eq 0 ]] && check_server
 
   . $file_task_before "$@"
 
@@ -447,7 +455,7 @@ handle_task_before() {
   fi
 }
 
-handle_task_after() {
+run_task_after() {
   . $file_task_after "$@"
 
   if [[ $task_after ]]; then
@@ -455,7 +463,9 @@ handle_task_after() {
     eval "$task_after"
     echo -e "\n执行后置命令结束"
   fi
+}
 
+handle_task_end() {
   local etime=$(date "+$time_format")
   local end_time=$(format_time "$time_format" "$etime")
   local end_timestamp=$(format_timestamp "$time_format" "$etime")
@@ -463,8 +473,7 @@ handle_task_after() {
 
   [[ "$diff_time" == 0 ]] && diff_time=1
 
-  echo -e "\n\n## 执行结束... $end_time  耗时 $diff_time 秒　　　　　"
-
+  echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒　　　　　"
   [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
 }
 

package/shell/task.sh

@@ -5,9 +5,9 @@ dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
-trap "single_hanle" 2 3 20 15 14
+trap "single_hanle" 2 3 20 15 14 19 1
 single_hanle() {
-  eval handle_task_after "$@" "$cmd"
+  eval handle_task_end "$@" "$cmd"
   exit 1
 }
 
@@ -95,6 +95,21 @@ format_params() {
     fi
   fi
   # params=$(echo "$@" | sed -E 's/([^ ])&([^ ])/\1\\\&\2/g')
+
+  # 分割 task 内置参数和脚本参数
+  task_shell_params=()
+  script_params=()
+  found_double_dash=false
+
+  for arg in "$@"; do
+    if $found_double_dash; then
+      script_params+=("$arg")
+    elif [ "$arg" == "--" ]; then
+      found_double_dash=true
+    else
+      task_shell_params+=("$arg")
+    fi
+  done
 }
 
 init_begin_time() {
@@ -119,11 +134,12 @@ if [[ $max_time ]]; then
 fi
 
 format_params "$@"
-define_program "$@"
-handle_log_path "$@"
+define_program "${task_shell_params[@]}"
+handle_log_path "${task_shell_params[@]}"
 init_begin_time
 
 eval . $dir_shell/otask.sh "$cmd"
-[[ -f "$dir_log/$log_path" ]] && [[ ! $show_log ]] && [[ "$real_time" != "true" ]] && cat "$dir_log/$log_path"
+# mac cat 无法正常退出
+# [[ -f "$dir_log/$log_path" ]] && [[ ! $show_log ]] && [[ "$real_time" != "true" ]] && cat "$dir_log/$log_path"
 
 exit 0

package/static/build/api/cron.js

@@ -370,10 +370,9 @@ exports.default = (app) => {
             last_execution_time: celebrate_1.Joi.number().optional().allow(null),
         }),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
             const cronService = typedi_1.Container.get(cron_1.default);
-            const data = await cronService.status(Object.assign(Object.assign({}, req.body), { status: parseInt(req.body.status), pid: parseInt(req.body.pid) || '' }));
+            const data = await cronService.status(Object.assign(Object.assign({}, req.body), { status: req.body.status ? parseInt(req.body.status) : undefined, pid: req.body.pid ? parseInt(req.body.pid) : undefined }));
             return res.send({ code: 200, data });
         }
         catch (e) {

package/static/build/api/log.js

@@ -76,7 +76,7 @@ exports.default = (app) => {
             let { filename, path, type } = req.body;
             const filePath = (0, path_1.join)(config_1.default.logPath, path, filename);
             if (type === 'directory') {
-                (0, util_1.emptyDir)(filePath);
+                await (0, util_1.emptyDir)(filePath);
             }
             else {
                 fs.unlinkSync(filePath);

package/static/build/api/script.js

@@ -155,7 +155,7 @@ exports.default = (app) => {
             let { filename, path, type } = req.body;
             const filePath = (0, path_1.join)(config_1.default.scriptPath, path, filename);
             if (type === 'directory') {
-                (0, util_1.emptyDir)(filePath);
+                await (0, util_1.emptyDir)(filePath);
             }
             else {
                 fs.unlinkSync(filePath);
@@ -218,7 +218,6 @@ exports.default = (app) => {
             pid: celebrate_1.Joi.number().optional().allow(''),
         }),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
             let { filename, path, pid } = req.body;
             const { name, ext } = (0, path_1.parse)(filename);
@@ -226,7 +225,9 @@ exports.default = (app) => {
             const logPath = (0, path_1.join)(config_1.default.logPath, path, `${name}.swap`);
             const scriptService = typedi_1.Container.get(script_1.default);
             const result = await scriptService.stopScript(filePath, pid);
-            (0, util_1.emptyDir)(logPath);
+            setTimeout(() => {
+                (0, util_1.emptyDir)(logPath);
+            }, 3000);
             res.send(result);
         }
         catch (e) {

package/static/build/config/serverEnv.js

@@ -10,6 +10,14 @@ function getPickedEnv() {
     if (pickedEnv)
         return pickedEnv;
     const picked = (0, pick_1.default)(process.env, ['QlBaseUrl', 'DeployEnv']);
+    if (picked.QlBaseUrl) {
+        if (!picked.QlBaseUrl.startsWith('/')) {
+            picked.QlBaseUrl = `/${picked.QlBaseUrl}`;
+        }
+        if (!picked.QlBaseUrl.endsWith('/')) {
+            picked.QlBaseUrl = `${picked.QlBaseUrl}/`;
+        }
+    }
     pickedEnv = picked;
     return picked;
 }

package/static/build/config/util.js

@@ -109,6 +109,9 @@ async function getNetIp(req) {
     if (ip.includes('127.0') || ip.includes('192.168') || ip.includes('10.7')) {
         ip = '';
     }
+    if (!ip) {
+        return { address: `获取失败`, ip };
+    }
     try {
         const baiduApi = got_1.default
             .get(`https://www.cip.cc/${ip}`, { timeout: 10000, retry: 0 })
@@ -300,18 +303,22 @@ function readDir(dir, baseDir = '', blacklist = []) {
     return result;
 }
 exports.readDir = readDir;
-function emptyDir(path) {
+async function emptyDir(path) {
+    const pathExist = await fileExist(path);
+    if (!pathExist) {
+        return;
+    }
     const files = fs.readdirSync(path);
-    files.forEach((file) => {
+    for (const file of files) {
         const filePath = `${path}/${file}`;
         const stats = fs.statSync(filePath);
         if (stats.isDirectory()) {
-            emptyDir(filePath);
+            await emptyDir(filePath);
         }
         else {
             fs.unlinkSync(filePath);
         }
-    });
+    }
     fs.rmdirSync(path);
 }
 exports.emptyDir = emptyDir;
@@ -405,11 +412,10 @@ function psTree(pid) {
 exports.psTree = psTree;
 async function killTask(pid) {
     const pids = await psTree(pid);
-    // SIGINT 2 程序终止(interrupt)信号，不会打印额外信息
     if (pids.length) {
         try {
-            [pid, ...pids].forEach((x) => {
-                process.kill(x, 2);
+            [pid, ...pids].reverse().forEach((x) => {
+                process.kill(x, 15);
             });
         }
         catch (error) { }

package/static/build/data/notify.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LarkNotification = exports.WebhookNotification = exports.PushMeNotification = exports.EmailNotification = exports.PushPlusNotification = exports.IGotNotification = exports.AibotkNotification = exports.WeWorkAppNotification = exports.WeWorkBotNotification = exports.DingtalkBotNotification = exports.TelegramBotNotification = exports.BarkNotification = exports.ChatNotification = exports.PushDeerNotification = exports.ServerChanNotification = exports.GoCqHttpBotNotification = exports.GotifyNotification = exports.NotificationMode = void 0;
+exports.LarkNotification = exports.WebhookNotification = exports.ChronocatNotification = exports.PushMeNotification = exports.EmailNotification = exports.PushPlusNotification = exports.IGotNotification = exports.AibotkNotification = exports.WeWorkAppNotification = exports.WeWorkBotNotification = exports.DingtalkBotNotification = exports.TelegramBotNotification = exports.BarkNotification = exports.ChatNotification = exports.PushDeerNotification = exports.ServerChanNotification = exports.GoCqHttpBotNotification = exports.GotifyNotification = exports.NotificationMode = void 0;
 var NotificationMode;
 (function (NotificationMode) {
     NotificationMode["gotify"] = "gotify";
@@ -20,6 +20,7 @@ var NotificationMode;
     NotificationMode["pushMe"] = "pushMe";
     NotificationMode["feishu"] = "feishu";
     NotificationMode["webhook"] = "webhook";
+    NotificationMode["chronocat"] = "Chronocat";
 })(NotificationMode || (exports.NotificationMode = NotificationMode = {}));
 class NotificationBaseInfo {
 }
@@ -152,6 +153,15 @@ class PushMeNotification extends NotificationBaseInfo {
     }
 }
 exports.PushMeNotification = PushMeNotification;
+class ChronocatNotification extends NotificationBaseInfo {
+    constructor() {
+        super(...arguments);
+        this.chronocatURL = '';
+        this.chronocatQQ = '';
+        this.chronocatToekn = '';
+    }
+}
+exports.ChronocatNotification = ChronocatNotification;
 class WebhookNotification extends NotificationBaseInfo {
     constructor() {
         super(...arguments);

package/static/build/loaders/server.js

@@ -31,13 +31,9 @@ exports.default = async ({ server }) => {
     });
     process.on('uncaughtException', (error) => {
         logger_1.default.error('Uncaught exception:', error);
-        console.error('Uncaught exception:', error);
-        process.exit(1);
     });
     process.on('unhandledRejection', (reason, promise) => {
         logger_1.default.error('Unhandled rejection:', reason, promise);
-        console.error('Unhandled rejection:', reason, promise);
-        process.exit(1);
     });
 };
 //# sourceMappingURL=server.js.map

package/static/build/protos/cron.js

@@ -58,7 +58,7 @@ exports.ISchedule = {
     },
 };
 function createBaseICron() {
-    return { id: "", schedule: "", command: "", extraSchedules: [] };
+    return { id: "", schedule: "", command: "", extraSchedules: [], name: "" };
 }
 exports.ICron = {
     encode(message, writer = minimal_1.default.Writer.create()) {
@@ -74,6 +74,9 @@ exports.ICron = {
         for (const v of message.extraSchedules) {
             exports.ISchedule.encode(v, writer.uint32(34).fork()).ldelim();
         }
+        if (message.name !== "") {
+            writer.uint32(42).string(message.name);
+        }
         return writer;
     },
     decode(input, length) {
@@ -107,6 +110,12 @@ exports.ICron = {
                     }
                     message.extraSchedules.push(exports.ISchedule.decode(reader, reader.uint32()));
                     continue;
+                case 5:
+                    if (tag !== 42) {
+                        break;
+                    }
+                    message.name = reader.string();
+                    continue;
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;
@@ -123,6 +132,7 @@ exports.ICron = {
             extraSchedules: Array.isArray(object === null || object === void 0 ? void 0 : object.extraSchedules)
                 ? object.extraSchedules.map((e) => exports.ISchedule.fromJSON(e))
                 : [],
+            name: isSet(object.name) ? String(object.name) : "",
         };
     },
     toJSON(message) {
@@ -136,18 +146,20 @@ exports.ICron = {
         else {
             obj.extraSchedules = [];
         }
+        message.name !== undefined && (obj.name = message.name);
         return obj;
     },
     create(base) {
         return exports.ICron.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const message = createBaseICron();
         message.id = (_a = object.id) !== null && _a !== void 0 ? _a : "";
         message.schedule = (_b = object.schedule) !== null && _b !== void 0 ? _b : "";
         message.command = (_c = object.command) !== null && _c !== void 0 ? _c : "";
         message.extraSchedules = ((_d = object.extraSchedules) === null || _d === void 0 ? void 0 : _d.map((e) => exports.ISchedule.fromPartial(e))) || [];
+        message.name = (_e = object.name) !== null && _e !== void 0 ? _e : "";
         return message;
     },
 };

package/static/build/schedule/addCron.js

@@ -11,25 +11,25 @@ const logger_1 = __importDefault(require("../loaders/logger"));
 const addCron = (call, callback) => {
     var _a;
     for (const item of call.request.crons) {
-        const { id, schedule, command, extraSchedules } = item;
+        const { id, schedule, command, extraSchedules, name } = item;
         if (data_1.scheduleStacks.has(id)) {
             (_a = data_1.scheduleStacks.get(id)) === null || _a === void 0 ? void 0 : _a.forEach((x) => x.cancel());
         }
-        logger_1.default.info('[schedule][创建定时任务], 任务ID: %s, cron: %s, 执行命令: %s', id, schedule, command);
+        logger_1.default.info('[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s', id, name, schedule, command);
         if (extraSchedules === null || extraSchedules === void 0 ? void 0 : extraSchedules.length) {
             extraSchedules.forEach(x => {
-                logger_1.default.info('[schedule][创建定时任务], 任务ID: %s, cron: %s, 执行命令: %s', id, x.schedule, command);
+                logger_1.default.info('[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s', id, name, x.schedule, command);
             });
         }
         data_1.scheduleStacks.set(id, [
             node_schedule_1.default.scheduleJob(id, schedule, async () => {
                 logger_1.default.info(`[schedule][准备运行任务] 命令: ${command}`);
-                (0, runCron_1.runCron)(command);
+                (0, runCron_1.runCron)(command, { name, schedule, extraSchedules });
             }),
             ...((extraSchedules === null || extraSchedules === void 0 ? void 0 : extraSchedules.length)
                 ? extraSchedules.map((x) => node_schedule_1.default.scheduleJob(id, x.schedule, async () => {
                     logger_1.default.info(`[schedule][准备运行任务] 命令: ${command}`);
-                    (0, runCron_1.runCron)(command);
+                    (0, runCron_1.runCron)(command, { name, schedule, extraSchedules });
                 }))
                 : []),
         ]);