@whyour/qinglong 0.9.3 → 0.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "0.9.3",
+  "version": "0.10.1",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/sample/notify.py

@@ -456,7 +456,7 @@ class WeCom:
         return respone["errmsg"]
 
     def send_mpnews(self, title, message, media_id, touser="@all"):
-        send_url = f"https://{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",

package/shell/api.sh

@@ -36,7 +36,7 @@ add_cron_api() {
     local sub_id="$4"
   fi
 
-  if [[ ! $sub_id ]];then
+  if [[ ! $sub_id ]]; then
     sub_id="null"
   fi
 

package/shell/otask.sh

@@ -70,6 +70,11 @@ run_nohup() {
 }
 
 
+env_str_to_array() {
+  local IFS="&"
+  read -ra array <<<"${!env_param}"
+}
+
 ## 正常运行单个脚本，$1：传入参数
 run_normal() {
   local file_param=$1
@@ -97,8 +102,7 @@ run_concurrent() {
     exit 1
   fi
 
-  local envs=$(eval echo "\$${env_param}")
-  local array=($(echo $envs | sed 's/&/ /g'))
+  env_str_to_array
   local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
   local runArr=($(eval echo $tempArr))
   runArr=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
@@ -109,11 +113,13 @@ run_concurrent() {
     let n++
   done
 
-  local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
-  [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
+  local cookieStr=$(
+    IFS="&"
+    echo "${array_run[*]}"
+  )
+  [[ ! -z $cookieStr ]] && export "${env_param}=${cookieStr}"
 
-  local envs=$(eval echo "\$${env_param}")
-  local array=($(echo $envs | sed 's/&/ /g'))
+  env_str_to_array
   single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%3N")
 
   cd $dir_scripts
@@ -123,7 +129,7 @@ run_concurrent() {
     file_param=${file_param/$relative_path\//}
   fi
   for i in "${!array[@]}"; do
-    export ${env_param}=${array[i]}
+    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 &
   done
@@ -145,8 +151,7 @@ run_designated() {
     exit 1
   fi
 
-  local envs=$(eval echo "\$${env_param}")
-  local array=($(echo $envs | sed 's/&/ /g'))
+  env_str_to_array
   local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
   local runArr=($(eval echo $tempArr))
   runArr=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
@@ -157,8 +162,11 @@ run_designated() {
     let n++
   done
 
-  local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
-  [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
+  local cookieStr=$(
+    IFS="&"
+    echo "${array_run[*]}"
+  )
+  [[ ! -z $cookieStr ]] && export "${env_param}=${cookieStr}"
 
   cd $dir_scripts
   local relative_path="${file_param%/*}"

package/shell/task.sh

@@ -69,7 +69,7 @@ handle_log_path() {
   if [[ $real_log_path ]]; then
     log_path="$real_log_path"
   fi
-  
+
   cmd=">> $dir_log/$log_path 2>&1"
   make_dir "$dir_log/$log_dir"
   if [[ "$show_log" == "true" ]]; then

package/shell/update.sh

@@ -31,7 +31,7 @@ output_list_add_drop() {
   local list=$1
   local type=$2
   if [[ -s $list ]]; then
-    echo -e "检测到有${type}的定时任务：\n"
+    echo -e "检测到有${type}的定时任务:"
     cat $list
     echo
   fi
@@ -134,10 +134,10 @@ update_repo() {
   git_clone_scripts "${formatUrl}" ${repo_path} "${branch}" "${proxy}"
 
   if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n更新${repo_path}成功...\n"
+    echo -e "\n拉取 ${uniq_path} 成功...\n"
     diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
   else
-    echo -e "\n更新${repo_path}失败，请检查网络...\n"
+    echo -e "\n拉取 ${uniq_path} 失败，请检查网络...\n"
   fi
 }
 

package/static/build/api/env.js

@@ -10,6 +10,7 @@ const celebrate_1 = require("celebrate");
 const multer_1 = __importDefault(require("multer"));
 const config_1 = __importDefault(require("../config"));
 const fs_1 = __importDefault(require("fs"));
+const util_1 = require("../config/util");
 const route = (0, express_1.Router)();
 const storage = multer_1.default.diskStorage({
     destination: function (req, file, cb) {
@@ -164,7 +165,7 @@ exports.default = (app) => {
         try {
             const envService = typedi_1.Container.get(env_1.default);
             const fileContent = await fs_1.default.promises.readFile(req.file.path, 'utf8');
-            const parseContent = JSON.parse(fileContent);
+            const parseContent = (0, util_1.safeJSONParse)(fileContent);
             const data = Array.isArray(parseContent)
                 ? parseContent
                 : [parseContent];

package/static/build/api/script.js

@@ -223,8 +223,10 @@ exports.default = (app) => {
             let { filename, path, pid } = req.body;
             const { name, ext } = (0, path_1.parse)(filename);
             const filePath = (0, path_1.join)(config_1.default.scriptPath, path, `${name}.swap${ext}`);
+            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);
             res.send(result);
         }
         catch (e) {

package/static/build/api/system.js

@@ -164,7 +164,10 @@ exports.default = (app) => {
     }), async (req, res, next) => {
         try {
             const systemService = typedi_1.Container.get(system_1.default);
-            const uniqPath = await (0, util_1.getUniqPath)(req.body.command);
+            const command = req.body.command;
+            const idStr = `cat ${config_1.default.crontabFile} | grep -E "${command}" | perl -pe "s|.*ID=(.*) ${command}.*|\\1|" | head -1 | awk -F " " '{print $1}' | xargs echo -n`;
+            let id = await (0, util_1.promiseExec)(idStr);
+            const uniqPath = await (0, util_1.getUniqPath)(command, id);
             const logTime = (0, dayjs_1.default)().format('YYYY-MM-DD-HH-mm-ss-SSS');
             const logPath = `${uniqPath}/${logTime}.log`;
             res.setHeader('Content-type', 'application/octet-stream');

package/static/build/config/index.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const dotenv_1 = __importDefault(require("dotenv"));
 const path_1 = __importDefault(require("path"));
-const util_1 = require("./util");
+const share_1 = require("./share");
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 if (!process.env.QL_DIR) {
     // 声明QL_DIR环境变量
@@ -55,7 +55,7 @@ exports.default = {
     port: parseInt(process.env.BACK_PORT, 10),
     cronPort: parseInt(process.env.CRON_PORT, 10),
     publicPort: parseInt(process.env.PUBLIC_PORT, 10),
-    secret: process.env.SECRET || (0, util_1.createRandomString)(16, 32),
+    secret: process.env.SECRET || (0, share_1.createRandomString)(16, 32),
     logs: {
         level: process.env.LOG_LEVEL || 'silly',
     },

package/static/build/config/share.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRandomString = void 0;
+function createRandomString(min, max) {
+    const num = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+    const english = [
+        'a',
+        'b',
+        'c',
+        'd',
+        'e',
+        'f',
+        'g',
+        'h',
+        'i',
+        'j',
+        'k',
+        'l',
+        'm',
+        'n',
+        'o',
+        'p',
+        'q',
+        'r',
+        's',
+        't',
+        'u',
+        'v',
+        'w',
+        'x',
+        'y',
+        'z',
+    ];
+    const ENGLISH = [
+        'A',
+        'B',
+        'C',
+        'D',
+        'E',
+        'F',
+        'G',
+        'H',
+        'I',
+        'J',
+        'K',
+        'L',
+        'M',
+        'N',
+        'O',
+        'P',
+        'Q',
+        'R',
+        'S',
+        'T',
+        'U',
+        'V',
+        'W',
+        'X',
+        'Y',
+        'Z',
+    ];
+    const special = ['-', '_'];
+    const config = num.concat(english).concat(ENGLISH).concat(special);
+    const arr = [];
+    arr.push(getOne(num));
+    arr.push(getOne(english));
+    arr.push(getOne(ENGLISH));
+    arr.push(getOne(special));
+    const len = min + Math.floor(Math.random() * (max - min + 1));
+    for (let i = 4; i < len; i++) {
+        arr.push(config[Math.floor(Math.random() * config.length)]);
+    }
+    const newArr = [];
+    for (let j = 0; j < len; j++) {
+        newArr.push(arr.splice(Math.random() * arr.length, 1)[0]);
+    }
+    function getOne(arr) {
+        return arr[Math.floor(Math.random() * arr.length)];
+    }
+    return newArr.join('');
+}
+exports.createRandomString = createRandomString;
+//# sourceMappingURL=share.js.map

package/static/build/config/util.js

@@ -22,11 +22,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUniqPath = exports.parseContentVersion = exports.parseVersion = exports.getPid = exports.killTask = exports.psTree = exports.parseBody = exports.parseHeaders = exports.promiseExecSuccess = exports.promiseExec = exports.emptyDir = exports.readDir = exports.readDirs = exports.dirSort = exports.concurrentRun = exports.handleLogPath = exports.createFile = exports.fileExist = exports.getPlatform = exports.getNetIp = exports.getToken = exports.createRandomString = exports.getLastModifyFilePath = exports.getFileContentByName = void 0;
+exports.safeJSONParse = exports.getUniqPath = exports.parseContentVersion = exports.parseVersion = exports.getPid = exports.killTask = exports.psTree = exports.parseBody = exports.parseHeaders = exports.promiseExecSuccess = exports.promiseExec = exports.emptyDir = exports.readDir = exports.readDirs = exports.dirSort = exports.concurrentRun = exports.handleLogPath = exports.createFile = exports.fileExist = exports.getPlatform = exports.getNetIp = exports.getToken = exports.getLastModifyFilePath = exports.getFileContentByName = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const got_1 = __importDefault(require("got"));
@@ -38,6 +41,8 @@ const util_1 = require("util");
 const js_yaml_1 = require("js-yaml");
 const index_1 = __importDefault(require("./index"));
 const const_1 = require("./const");
+const logger_1 = __importDefault(require("../loaders/logger"));
+__exportStar(require("./share"), exports);
 function getFileContentByName(fileName) {
     if (fs.existsSync(fileName)) {
         return fs.readFileSync(fileName, 'utf8');
@@ -62,85 +67,6 @@ function getLastModifyFilePath(dir) {
     return filePath;
 }
 exports.getLastModifyFilePath = getLastModifyFilePath;
-function createRandomString(min, max) {
-    const num = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-    const english = [
-        'a',
-        'b',
-        'c',
-        'd',
-        'e',
-        'f',
-        'g',
-        'h',
-        'i',
-        'j',
-        'k',
-        'l',
-        'm',
-        'n',
-        'o',
-        'p',
-        'q',
-        'r',
-        's',
-        't',
-        'u',
-        'v',
-        'w',
-        'x',
-        'y',
-        'z',
-    ];
-    const ENGLISH = [
-        'A',
-        'B',
-        'C',
-        'D',
-        'E',
-        'F',
-        'G',
-        'H',
-        'I',
-        'J',
-        'K',
-        'L',
-        'M',
-        'N',
-        'O',
-        'P',
-        'Q',
-        'R',
-        'S',
-        'T',
-        'U',
-        'V',
-        'W',
-        'X',
-        'Y',
-        'Z',
-    ];
-    const special = ['-', '_'];
-    const config = num.concat(english).concat(ENGLISH).concat(special);
-    const arr = [];
-    arr.push(getOne(num));
-    arr.push(getOne(english));
-    arr.push(getOne(ENGLISH));
-    arr.push(getOne(special));
-    const len = min + Math.floor(Math.random() * (max - min + 1));
-    for (let i = 4; i < len; i++) {
-        arr.push(config[Math.floor(Math.random() * config.length)]);
-    }
-    const newArr = [];
-    for (let j = 0; j < len; j++) {
-        newArr.push(arr.splice(Math.random() * arr.length, 1)[0]);
-    }
-    function getOne(arr) {
-        return arr[Math.floor(Math.random() * arr.length)];
-    }
-    return newArr.join('');
-}
-exports.createRandomString = createRandomString;
 function getToken(req) {
     const { authorization = '' } = req.headers;
     if (authorization && authorization.split(' ')[0] === 'Bearer') {
@@ -507,10 +433,8 @@ async function parseContentVersion(content) {
     return (0, js_yaml_1.load)(content);
 }
 exports.parseContentVersion = parseContentVersion;
-async function getUniqPath(command) {
-    const idStr = `cat ${index_1.default.crontabFile} | grep -E "${command}" | perl -pe "s|.*ID=(.*) ${command}.*|\\1|" | head -1 | awk -F " " '{print $1}' | xargs echo -n`;
-    let id = await promiseExec(idStr);
-    if (/^\d\d*\d$/.test(id)) {
+async function getUniqPath(command, id) {
+    if (/^\d+$/.test(id)) {
         id = `_${id}`;
     }
     else {
@@ -538,4 +462,17 @@ async function getUniqPath(command) {
     return `${str}${id}`;
 }
 exports.getUniqPath = getUniqPath;
+function safeJSONParse(value) {
+    if (!value) {
+        return {};
+    }
+    try {
+        return JSON.parse(value);
+    }
+    catch (error) {
+        logger_1.default.error('[JSON.parse失败]', error);
+        return {};
+    }
+}
+exports.safeJSONParse = safeJSONParse;
 //# sourceMappingURL=util.js.map

package/static/build/loaders/express.js

@@ -50,7 +50,7 @@ exports.default = ({ app }) => {
     app.get(`${config_1.default.api.prefix}/env.js`, serverEnv_1.serveEnv);
     app.use(`${config_1.default.api.prefix}/static`, express_1.default.static(config_1.default.uploadPath));
     app.use('/api/public', (0, http_proxy_middleware_1.createProxyMiddleware)({
-        target: `http://localhost:${config_1.default.publicPort}/api`,
+        target: `http://0.0.0.0:${config_1.default.publicPort}/api`,
         changeOrigin: true,
         pathRewrite: { '/api/public': '' },
         logProvider: () => logger_1.default
@@ -97,7 +97,7 @@ exports.default = ({ app }) => {
         }
         const data = fs_1.default.readFileSync(config_1.default.authConfigFile, 'utf8');
         if (data && headerToken) {
-            const { token = '', tokens = {} } = JSON.parse(data);
+            const { token = '', tokens = {} } = (0, util_1.safeJSONParse)(data);
             if (headerToken === token || tokens[req.platform] === headerToken) {
                 return next();
             }

package/static/build/loaders/sock.js

@@ -20,7 +20,7 @@ exports.default = async ({ server }) => {
         const platform = (0, util_1.getPlatform)(conn.headers['user-agent'] || '') || 'desktop';
         const headerToken = conn.url.replace(`${conn.pathname}?token=`, '');
         if (data) {
-            const { token = '', tokens = {} } = JSON.parse(data);
+            const { token = '', tokens = {} } = (0, util_1.safeJSONParse)(data);
             if (headerToken === token || tokens[platform] === headerToken) {
                 conn.write(JSON.stringify({ type: 'ping', message: 'hanhh' }));
                 sockService.addClient(conn);

package/static/build/schedule/addCron.js

@@ -9,7 +9,6 @@ const data_1 = require("./data");
 const runCron_1 = require("../shared/runCron");
 const const_1 = require("../config/const");
 const logger_1 = __importDefault(require("../loaders/logger"));
-const dayjs_1 = __importDefault(require("dayjs"));
 const addCron = (call, callback) => {
     var _a;
     for (const item of call.request.crons) {
@@ -23,7 +22,7 @@ const addCron = (call, callback) => {
         }
         logger_1.default.info('[schedule][创建定时任务], 任务ID: %s, cron: %s, 执行命令: %s', id, schedule, command);
         data_1.scheduleStacks.set(id, node_schedule_1.default.scheduleJob(id, schedule, async () => {
-            logger_1.default.info(`[schedule] 时间: ${(0, dayjs_1.default)().format('YYYY-MM-DD HH:mm:ss')}，运行命令: ${cmdStr}`);
+            logger_1.default.info(`[schedule][准备运行任务] 命令: ${cmdStr}`);
             (0, runCron_1.runCron)(`ID=${id} ${cmdStr}`);
         }));
     }

package/static/build/schedule/client.js

@@ -8,7 +8,7 @@ const cron_1 = require("../protos/cron");
 const config_1 = __importDefault(require("../config"));
 class Client {
     constructor() {
-        this.client = new cron_1.CronClient(`localhost:${config_1.default.cronPort}`, grpc_js_1.credentials.createInsecure());
+        this.client = new cron_1.CronClient(`0.0.0.0:${config_1.default.cronPort}`, grpc_js_1.credentials.createInsecure());
     }
     addCron(request) {
         return new Promise((resolve, reject) => {

package/static/build/schedule/health.js

@@ -9,7 +9,7 @@ const util_1 = require("../config/util");
 const check = async (call, callback) => {
     switch (call.request.service) {
         case 'cron':
-            const res = await (0, util_1.promiseExec)(`curl -s http://localhost:${config_1.default.port}/api/system`);
+            const res = await (0, util_1.promiseExec)(`curl -s http://0.0.0.0:${config_1.default.port}/api/system`);
             if (res.includes('200')) {
                 return callback(null, { status: 1 });
             }

package/static/build/services/cron.js

@@ -30,6 +30,7 @@ const const_1 = require("../config/const");
 const client_1 = __importDefault(require("../schedule/client"));
 const pLimit_1 = __importDefault(require("../shared/pLimit"));
 const cross_spawn_1 = require("cross-spawn");
+const dayjs_1 = __importDefault(require("dayjs"));
 let CronService = class CronService {
     constructor(logger) {
         this.logger = logger;
@@ -274,9 +275,9 @@ let CronService = class CronService {
         const searchText = params === null || params === void 0 ? void 0 : params.searchValue;
         const page = Number((params === null || params === void 0 ? void 0 : params.page) || '0');
         const size = Number((params === null || params === void 0 ? void 0 : params.size) || '0');
-        const viewQuery = JSON.parse((params === null || params === void 0 ? void 0 : params.queryString) || '{}');
-        const filterQuery = JSON.parse((params === null || params === void 0 ? void 0 : params.filters) || '{}');
-        const sorterQuery = JSON.parse((params === null || params === void 0 ? void 0 : params.sorter) || '{}');
+        const viewQuery = (0, util_1.safeJSONParse)(params === null || params === void 0 ? void 0 : params.queryString);
+        const filterQuery = (0, util_1.safeJSONParse)(params === null || params === void 0 ? void 0 : params.filters);
+        const sorterQuery = (0, util_1.safeJSONParse)(params === null || params === void 0 ? void 0 : params.sorter);
         let query = {};
         let order = [
             ['isPinned', 'DESC'],
@@ -338,14 +339,21 @@ let CronService = class CronService {
     async runSingle(cronId) {
         return pLimit_1.default.runWithCpuLimit(() => {
             return new Promise(async (resolve) => {
+                var _a;
                 const cron = await this.getDb({ id: cronId });
                 if (cron.status !== cron_1.CrontabStatus.queued) {
                     resolve();
                     return;
                 }
                 let { id, command, log_path } = cron;
-                const absolutePath = path_1.default.resolve(config_1.default.logPath, `${log_path}`);
-                const logFileExist = log_path && (await (0, util_1.fileExist)(absolutePath));
+                const uniqPath = await (0, util_1.getUniqPath)(command, `${id}`);
+                const logTime = (0, dayjs_1.default)().format('YYYY-MM-DD-HH-mm-ss-SSS');
+                const logDirPath = path_1.default.resolve(config_1.default.logPath, `${uniqPath}`);
+                if ((_a = log_path === null || log_path === void 0 ? void 0 : log_path.split('/')) === null || _a === void 0 ? void 0 : _a.every(x => x !== uniqPath)) {
+                    fs_1.default.mkdirSync(logDirPath, { recursive: true });
+                }
+                const logPath = `${uniqPath}/${logTime}.log`;
+                const absolutePath = path_1.default.resolve(config_1.default.logPath, `${logPath}`);
                 this.logger.silly('Running job');
                 this.logger.silly('ID: ' + id);
                 this.logger.silly('Original command: ' + command);
@@ -360,20 +368,16 @@ let CronService = class CronService {
                     cmdStr.endsWith('.ts')) {
                     cmdStr = `${cmdStr} now`;
                 }
-                const cp = (0, cross_spawn_1.spawn)(`ID=${id} ${cmdStr}`, { shell: '/bin/bash' });
-                await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.running, pid: cp.pid }, { where: { id } });
+                const cp = (0, cross_spawn_1.spawn)(`real_log_path=${logPath} ID=${id} ${cmdStr}`, { shell: '/bin/bash' });
+                await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.running, pid: cp.pid, log_path: logPath }, { where: { id } });
                 cp.stderr.on('data', (data) => {
-                    if (logFileExist) {
-                        fs_1.default.appendFileSync(`${absolutePath}`, `${data.toString()}`);
-                    }
+                    fs_1.default.appendFileSync(`${absolutePath}`, `${data.toString()}`);
                 });
                 cp.on('error', (err) => {
-                    if (logFileExist) {
-                        fs_1.default.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
-                    }
+                    fs_1.default.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
                 });
                 cp.on('exit', async (code, signal) => {
-                    this.logger.info(`任务 ${command} 进程id: ${cp.pid} 退出，退出码 ${code}`);
+                    this.logger.info(`[panel][任务退出] 任务 ${command} 进程id: ${cp.pid}, 退出码 ${code}`);
                 });
                 cp.on('close', async (code) => {
                     await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id } });

package/static/build/services/env.js

@@ -198,11 +198,9 @@ let EnvService = class EnvService {
                     let value = group
                         .map((x) => x.value)
                         .join('&')
-                        .replace(/(\\)[^n]/g, '\\\\')
-                        .replace(/(\\$)/, '\\\\')
-                        .replace(/"/g, '\\"')
+                        .replace(/'/g, "'\\''")
                         .trim();
-                    env_string += `export ${key}="${value}"\n`;
+                    env_string += `export ${key}='${value}'\n`;
                 }
             }
         }

package/static/build/services/schedule.js

@@ -45,16 +45,16 @@ let ScheduleService = class ScheduleService {
                     });
                     cp.stderr.on('data', async (data) => {
                         var _a;
-                        this.logger.info('[执行任务失败] %s, 时间: %s, 错误信息: %j', command, new Date().toLocaleString(), data.toString());
+                        this.logger.info('[panel][执行任务失败] 命令: %s, 错误信息: %j', command, data.toString());
                         await ((_a = callbacks.onError) === null || _a === void 0 ? void 0 : _a.call(callbacks, data.toString()));
                     });
                     cp.on('error', async (err) => {
                         var _a;
-                        this.logger.error('[创建任务失败] %s, 时间: %s, 错误信息: %j', command, new Date().toLocaleString(), err);
+                        this.logger.error('[panel][创建任务失败] 命令: %s, 错误信息: %j', command, err);
                         await ((_a = callbacks.onError) === null || _a === void 0 ? void 0 : _a.call(callbacks, JSON.stringify(err)));
                     });
                     cp.on('exit', async (code, signal) => {
-                        this.logger.info(`[任务退出] ${command} 进程id: ${cp.pid}, 退出码 ${code}`);
+                        this.logger.info(`[panel][任务退出] ${command} 进程id: ${cp.pid}, 退出码 ${code}`);
                     });
                     cp.on('close', async (code) => {
                         var _a;
@@ -64,7 +64,7 @@ let ScheduleService = class ScheduleService {
                     });
                 }
                 catch (error) {
-                    await this.logger.error('[执行任务失败] 命令: %s, 时间: %s, 错误信息: %j', command, new Date().toLocaleString(), error);
+                    this.logger.error('[panel][执行任务失败] 命令: %s, 错误信息: %j', command, error);
                     await ((_c = callbacks.onError) === null || _c === void 0 ? void 0 : _c.call(callbacks, JSON.stringify(error)));
                 }
             });
@@ -72,7 +72,7 @@ let ScheduleService = class ScheduleService {
     }
     async createCronTask({ id = 0, command, name, schedule = '' }, callbacks, runImmediately = false) {
         const _id = this.formatId(id);
-        this.logger.info('[创建cron任务], 任务ID: %s, cron: %s, 任务名: %s, 执行命令: %s', _id, schedule, name, command);
+        this.logger.info('[panel][创建cron任务], 任务ID: %s, cron: %s, 任务名: %s, 执行命令: %s', _id, schedule, name, command);
         this.scheduleStacks.set(_id, node_schedule_1.default.scheduleJob(_id, schedule, async () => {
             this.runTask(command, callbacks);
         }));
@@ -83,7 +83,7 @@ let ScheduleService = class ScheduleService {
     async cancelCronTask({ id = 0, name }) {
         var _a;
         const _id = this.formatId(id);
-        this.logger.info('[取消定时任务], 任务名: %s', name);
+        this.logger.info('[panel][取消定时任务], 任务名: %s', name);
         if (this.scheduleStacks.has(_id)) {
             (_a = this.scheduleStacks.get(_id)) === null || _a === void 0 ? void 0 : _a.cancel();
             this.scheduleStacks.delete(_id);
@@ -91,11 +91,11 @@ let ScheduleService = class ScheduleService {
     }
     async createIntervalTask({ id = 0, command, name = '' }, schedule, runImmediately = true, callbacks) {
         const _id = this.formatId(id);
-        this.logger.info('[创建interval任务], 任务ID: %s, 任务名: %s, 执行命令: %s', _id, name, command);
+        this.logger.info('[panel][创建interval任务], 任务ID: %s, 任务名: %s, 执行命令: %s', _id, name, command);
         const task = new toad_scheduler_1.Task(name, () => {
             this.runTask(command, callbacks);
         }, (err) => {
-            this.logger.error('[执行任务失败] 命令: %s, 时间: %s, 错误信息: %j', command, new Date().toLocaleString(), err);
+            this.logger.error('[执行任务失败] 命令: %s, 错误信息: %j', command, err);
         });
         const job = new toad_scheduler_1.LongIntervalJob(Object.assign({ runImmediately: false }, schedule), task, _id);
         this.intervalSchedule.addIntervalJob(job);

package/static/build/services/script.js

@@ -61,7 +61,6 @@ let ScriptService = class ScriptService {
         return { code: 200, data: pid };
     }
     async stopScript(filePath, pid) {
-        let str = '';
         if (!pid) {
             const relativePath = path_1.default.relative(config_1.default.scriptPath, filePath);
             pid = await (0, util_1.getPid)(`${const_1.TASK_COMMAND} -l ${relativePath} now`);