@whyour/qinglong 0.8.4 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "0.8.4",
+  "version": "0.9.0",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",
@@ -112,6 +112,7 @@
     "typedi": "^0.10.0",
     "uuid": "^8.3.2",
     "winston": "^3.6.0",
+    "winston-daily-rotate-file": "^4.7.1",
     "yargs": "^17.3.1"
   },
   "devDependencies": {
@@ -143,6 +144,8 @@
     "@types/sockjs-client": "^1.5.1",
     "@types/tar": "^6.1.5",
     "@types/uuid": "^8.3.4",
+    "@uiw/codemirror-extensions-langs": "^4.21.9",
+    "@uiw/react-codemirror": "^4.21.9",
     "@umijs/max": "^4.0.72",
     "@umijs/ssr-darkreader": "^4.9.45",
     "ahooks": "^3.7.8",
@@ -150,7 +153,6 @@
     "antd": "^4.24.8",
     "antd-img-crop": "^4.2.3",
     "axios": "^1.4.0",
-    "codemirror": "^5.65.2",
     "compression-webpack-plugin": "9.2.0",
     "concurrently": "^7.0.0",
     "file-saver": "^2.0.5",
@@ -164,7 +166,6 @@
     "rc-tween-one": "^3.0.6",
     "rc-virtual-list": "3.5.3",
     "react": "18.2.0",
-    "react-codemirror2": "^7.2.1",
     "react-copy-to-clipboard": "^5.1.0",
     "react-diff-viewer": "^3.1.1",
     "react-dnd": "^14.0.2",

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.HOST}/cgi-bin/message/send?access_token={self.get_access_token()}"
+        send_url = f"https://{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
         send_values = {
             "touser": touser,
             "msgtype": "mpnews",

package/shell/share.sh

@@ -301,7 +301,7 @@ git_clone_scripts() {
 
   set_proxy "$proxy"
 
-  git clone --depth=1 $part_cmd $url $dir
+  git clone --depth=1 $part_cmd $url $dir 2>&1
   exit_status=$?
 
   unset_proxy

package/static/build/api/system.js

@@ -225,5 +225,14 @@ exports.default = (app) => {
             return next(e);
         }
     });
+    route.get('/log', async (req, res, next) => {
+        try {
+            const systemService = typedi_1.Container.get(system_1.default);
+            await systemService.getSystemLog(res);
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
 };
 //# sourceMappingURL=system.js.map

package/static/build/app.js

@@ -17,10 +17,12 @@ async function startServer() {
         .listen(config_1.default.port, () => {
         var _a;
         logger_1.default.debug(`✌️ 后端服务启动成功！`);
+        console.debug(`✌️ 后端服务启动成功！`);
         (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');
     })
         .on('error', (err) => {
         logger_1.default.error(err);
+        console.error(err);
         process.exit(1);
     });
     await require('./loaders/server').default({ server });

package/static/build/config/index.js

@@ -33,6 +33,7 @@ const logPath = path_1.default.join(dataPath, 'log/');
 const dbPath = path_1.default.join(dataPath, 'db/');
 const uploadPath = path_1.default.join(dataPath, 'upload/');
 const sshdPath = path_1.default.join(dataPath, 'ssh.d/');
+const systemLogPath = path_1.default.join(dataPath, 'syslog/');
 const envFile = path_1.default.join(configPath, 'env.sh');
 const confFile = path_1.default.join(configPath, 'config.sh');
 const crontabFile = path_1.default.join(configPath, 'crontab.list');
@@ -109,5 +110,6 @@ exports.default = {
     lastVersionFile,
     sqliteFile,
     sshdPath,
+    systemLogPath,
 };
 //# sourceMappingURL=index.js.map

package/static/build/config/util.js

@@ -312,10 +312,15 @@ var FileType;
     FileType[FileType["file"] = 1] = "file";
 })(FileType || (FileType = {}));
 function dirSort(a, b) {
-    if (a.type !== b.type)
+    if (a.type !== b.type) {
         return FileType[a.type] < FileType[b.type] ? -1 : 1;
-    else if (a.mtime !== b.mtime)
+    }
+    else if (a.mtime !== b.mtime) {
         return a.mtime > b.mtime ? -1 : 1;
+    }
+    else {
+        return 0;
+    }
 }
 exports.dirSort = dirSort;
 function readDirs(dir, baseDir = '', blacklist = []) {
@@ -343,6 +348,7 @@ function readDirs(dir, baseDir = '', blacklist = []) {
             isLeaf: true,
             key,
             parent: relativePath,
+            size: stats.size,
             mtime: stats.mtime.getTime(),
         };
     });

package/static/build/loaders/app.js

@@ -10,15 +10,26 @@ const initData_1 = __importDefault(require("./initData"));
 const deps_1 = __importDefault(require("./deps"));
 const initTask_1 = __importDefault(require("./initTask"));
 exports.default = async ({ expressApp }) => {
-    await (0, depInjector_1.default)();
-    logger_1.default.info('✌️ Dependency Injector loaded');
-    await (0, express_1.default)({ app: expressApp });
-    logger_1.default.info('✌️ Express loaded');
-    await (0, initData_1.default)();
-    logger_1.default.info('✌️ init data loaded');
-    await (0, deps_1.default)();
-    logger_1.default.info('✌️ link deps loaded');
-    (0, initTask_1.default)();
-    logger_1.default.info('✌️ init task loaded');
+    try {
+        (0, depInjector_1.default)();
+        logger_1.default.info('✌️ Dependency Injector loaded');
+        console.log('✌️ Dependency Injector loaded');
+        (0, express_1.default)({ app: expressApp });
+        logger_1.default.info('✌️ Express loaded');
+        console.log('✌️ Express loaded');
+        await (0, initData_1.default)();
+        logger_1.default.info('✌️ init data loaded');
+        console.log('✌️ init data loaded');
+        await (0, deps_1.default)();
+        logger_1.default.info('✌️ link deps loaded');
+        console.log('✌️ link deps loaded');
+        (0, initTask_1.default)();
+        logger_1.default.info('✌️ init task loaded');
+        console.log('✌️ init task loaded');
+    }
+    catch (error) {
+        logger_1.default.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed, ${error}`);
+        console.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed ${error}`);
+    }
 };
 //# sourceMappingURL=app.js.map

package/static/build/loaders/db.js

@@ -116,11 +116,12 @@ exports.default = async () => {
                 await auth_1.AuthModel.bulkCreate(docs, { ignoreDuplicates: true });
             });
         }
+        console.log('✌️ DB loaded');
         logger_1.default.info('✌️ DB loaded');
     }
     catch (error) {
-        logger_1.default.info('✌️ DB load failed');
-        logger_1.default.info(error);
+        console.error('✌️ DB load failed');
+        logger_1.default.error(error);
     }
 };
 //# sourceMappingURL=db.js.map

package/static/build/loaders/express.js

@@ -43,6 +43,7 @@ const env_1 = require("../data/env");
 const celebrate_1 = require("celebrate");
 const http_proxy_middleware_1 = require("http-proxy-middleware");
 const serverEnv_1 = require("../config/serverEnv");
+const logger_1 = __importDefault(require("./logger"));
 exports.default = ({ app }) => {
     app.enable('trust proxy');
     app.use((0, cors_1.default)());
@@ -52,6 +53,7 @@ exports.default = ({ app }) => {
         target: `http://localhost:${config_1.default.publicPort}/api`,
         changeOrigin: true,
         pathRewrite: { '/api/public': '' },
+        logProvider: () => logger_1.default
     }));
     app.use(body_parser_1.default.json({ limit: '50mb' }));
     app.use(body_parser_1.default.urlencoded({ limit: '50mb', extended: true }));

package/static/build/loaders/initFile.js

@@ -35,6 +35,7 @@ const TaskAfterFile = path_1.default.join(configPath, 'task_after.sh');
 const homedir = os_1.default.homedir();
 const sshPath = path_1.default.resolve(homedir, '.ssh');
 const sshdPath = path_1.default.join(dataPath, 'ssh.d');
+const systemLogPath = path_1.default.join(dataPath, 'syslog');
 exports.default = async () => {
     const authFileExist = await (0, util_1.fileExist)(authConfigFile);
     const confFileExist = await (0, util_1.fileExist)(confFile);
@@ -45,6 +46,7 @@ exports.default = async () => {
     const sshDirExist = await (0, util_1.fileExist)(sshPath);
     const bakDirExist = await (0, util_1.fileExist)(bakPath);
     const sshdDirExist = await (0, util_1.fileExist)(sshdPath);
+    const systemLogDirExist = await (0, util_1.fileExist)(systemLogPath);
     const tmpDirExist = await (0, util_1.fileExist)(tmpPath);
     const scriptNotifyJsFileExist = await (0, util_1.fileExist)(scriptNotifyJsFile);
     const scriptNotifyPyFileExist = await (0, util_1.fileExist)(scriptNotifyPyFile);
@@ -74,6 +76,9 @@ exports.default = async () => {
     if (!sshdDirExist) {
         fs_1.default.mkdirSync(sshdPath);
     }
+    if (!systemLogDirExist) {
+        fs_1.default.mkdirSync(systemLogPath);
+    }
     // 初始化文件
     if (!authFileExist) {
         fs_1.default.writeFileSync(authConfigFile, fs_1.default.readFileSync(sampleAuthFile));
@@ -95,5 +100,6 @@ exports.default = async () => {
     }
     dotenv_1.default.config({ path: confFile });
     logger_1.default.info('✌️ Init file down');
+    console.log('✌️ Init file down');
 };
 //# sourceMappingURL=initFile.js.map

package/static/build/loaders/logger.js

@@ -4,23 +4,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const winston_1 = __importDefault(require("winston"));
+require("winston-daily-rotate-file");
 const config_1 = __importDefault(require("../config"));
-const transports = [];
-if (process.env.NODE_ENV !== 'development') {
-    transports.push(new winston_1.default.transports.Console());
-}
-else {
-    transports.push(new winston_1.default.transports.Console({
-        format: winston_1.default.format.combine(winston_1.default.format.cli(), winston_1.default.format.splat()),
-    }));
-}
+const path_1 = __importDefault(require("path"));
+const levelMap = {
+    info: '🔵',
+    warn: '🟡',
+    error: '🔴',
+    debug: '🔶'
+};
+const customFormat = winston_1.default.format.combine(winston_1.default.format.splat(), winston_1.default.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }), winston_1.default.format.align(), winston_1.default.format.printf((i) => `[${levelMap[i.level]}${i.level}] [${[i.timestamp]}]: ${i.message}`));
+const defaultOptions = {
+    format: customFormat,
+    datePattern: "YYYY-MM-DD",
+    maxSize: "20m",
+    maxFiles: "7d",
+};
 const LoggerInstance = winston_1.default.createLogger({
     level: config_1.default.logs.level,
     levels: winston_1.default.config.npm.levels,
-    format: winston_1.default.format.combine(winston_1.default.format.timestamp({
-        format: 'YYYY-MM-DD HH:mm:ss',
-    }), winston_1.default.format.errors({ stack: true }), winston_1.default.format.splat(), winston_1.default.format.json()),
-    transports,
+    transports: [
+        new winston_1.default.transports.DailyRotateFile(Object.assign({ filename: path_1.default.join(config_1.default.systemLogPath, '%DATE%.log') }, defaultOptions))
+    ],
 });
 exports.default = LoggerInstance;
 //# sourceMappingURL=logger.js.map

package/static/build/loaders/sentry.js

@@ -51,5 +51,6 @@ exports.default = async ({ expressApp }) => {
     expressApp.use(Sentry.Handlers.requestHandler());
     expressApp.use(Sentry.Handlers.tracingHandler());
     logger_1.default.info('✌️ Sentry loaded');
+    console.log('✌️ Sentry loaded');
 };
 //# sourceMappingURL=sentry.js.map

package/static/build/loaders/server.js

@@ -12,9 +12,11 @@ exports.default = async ({ server }) => {
     let timer;
     process.on('SIGINT', (singal) => {
         logger_1.default.warn(`Server need close, singal ${singal}`);
+        console.warn(`Server need close, singal ${singal}`);
         exitTime++;
         if (exitTime >= 3) {
             logger_1.default.warn('Forcing server close');
+            console.warn('Forcing server close');
             clearTimeout(timer);
             process.exit(1);
         }
@@ -29,10 +31,12 @@ 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);
+        logger_1.default.error('Unhandled rejection:', reason, promise);
+        console.error('Unhandled rejection:', reason, promise);
         process.exit(1);
     });
 };

package/static/build/public.js

@@ -9,7 +9,7 @@ const config_1 = __importDefault(require("./config"));
 const health_1 = require("./protos/health");
 const grpc_js_1 = require("@grpc/grpc-js");
 const app = (0, express_1.default)();
-const client = new health_1.HealthClient(`localhost:${config_1.default.cronPort}`, grpc_js_1.credentials.createInsecure());
+const client = new health_1.HealthClient(`0.0.0.0:${config_1.default.cronPort}`, grpc_js_1.credentials.createInsecure());
 app.get('/api/health', (req, res) => {
     client.check({ service: 'cron' }, (err, response) => {
         if (err) {
@@ -24,10 +24,12 @@ app
     await require('./loaders/sentry').default({ expressApp: app });
     await require('./loaders/db').default();
     logger_1.default.debug(`✌️ 公共服务启动成功！`);
+    console.debug(`✌️ 公共服务启动成功！`);
     (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');
 })
     .on('error', (err) => {
     logger_1.default.error(err);
+    console.error(err);
     process.exit(1);
 });
 //# sourceMappingURL=public.js.map

package/static/build/schedule/addCron.js

@@ -21,8 +21,9 @@ const addCron = (call, callback) => {
         if (!cmdStr.startsWith(const_1.TASK_PREFIX) && !cmdStr.startsWith(const_1.QL_PREFIX)) {
             cmdStr = `${const_1.TASK_PREFIX}${cmdStr}`;
         }
+        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(`当前时间: ${(0, dayjs_1.default)().format('YYYY-MM-DD HH:mm:ss')}，运行命令: ${cmdStr}`);
+            logger_1.default.info(`[schedule] 时间: ${(0, dayjs_1.default)().format('YYYY-MM-DD HH:mm:ss')}，运行命令: ${cmdStr}`);
             (0, runCron_1.runCron)(`ID=${id} ${cmdStr}`);
         }));
     }

package/static/build/schedule/delCron.js

@@ -1,11 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.delCron = void 0;
 const data_1 = require("./data");
+const logger_1 = __importDefault(require("../loaders/logger"));
 const delCron = (call, callback) => {
     var _a;
     for (const id of call.request.ids) {
         if (data_1.scheduleStacks.has(id)) {
+            logger_1.default.info('[schedule][取消定时任务], 任务ID: %s', id);
             (_a = data_1.scheduleStacks.get(id)) === null || _a === void 0 ? void 0 : _a.cancel();
             data_1.scheduleStacks.delete(id);
         }

package/static/build/schedule/index.js

@@ -14,13 +14,14 @@ const logger_1 = __importDefault(require("../loaders/logger"));
 const server = new grpc_js_1.Server();
 server.addService(health_1.HealthService, { check: health_2.check });
 server.addService(cron_1.CronService, { addCron: addCron_1.addCron, delCron: delCron_1.delCron });
-server.bindAsync(`localhost:${config_1.default.cronPort}`, grpc_js_1.ServerCredentials.createInsecure(), (err, port) => {
+server.bindAsync(`0.0.0.0:${config_1.default.cronPort}`, grpc_js_1.ServerCredentials.createInsecure(), (err, port) => {
     var _a;
     if (err) {
         throw err;
     }
     server.start();
     logger_1.default.debug(`✌️ 定时服务启动成功！`);
+    console.debug(`✌️ 定时服务启动成功！`);
     (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');
 });
 //# sourceMappingURL=index.js.map

package/static/build/services/cron.js

@@ -139,7 +139,7 @@ let CronService = class CronService {
                     case 'In':
                         q[sequelize_1.Op.or] = [
                             {
-                                [property]: value,
+                                [property]: Array.isArray(value) ? value : [value],
                             },
                             property === 'status' && value.includes(2)
                                 ? { isDisabled: 1 }
@@ -150,7 +150,7 @@ let CronService = class CronService {
                         q[sequelize_1.Op.and] = [
                             {
                                 [property]: {
-                                    [sequelize_1.Op.notIn]: value,
+                                    [sequelize_1.Op.notIn]: Array.isArray(value) ? value : [value],
                                 },
                             },
                             property === 'status' && value.includes(2)
@@ -329,7 +329,7 @@ let CronService = class CronService {
                     await (0, util_1.killTask)(doc.pid);
                 }
                 catch (error) {
-                    this.logger.silly(error);
+                    this.logger.error(error);
                 }
             }
         }
@@ -460,7 +460,6 @@ let CronService = class CronService {
                 crontab_string += '\n';
             }
         });
-        this.logger.silly(crontab_string);
         fs_1.default.writeFileSync(config_1.default.crontabFile, crontab_string);
         await cron_1.CrontabModel.update({ saved: true }, { where: {} });
     }

package/static/build/services/dependence.js

@@ -175,7 +175,7 @@ let DependenceService = class DependenceService {
                     if (depInfo &&
                         ((isNodeDependence && ((_a = depInfo.split(' ')) === null || _a === void 0 ? void 0 : _a[0]) === depName) ||
                             (isLinuxDependence &&
-                                depInfo.toLocaleLowerCase().includes('installed')) ||
+                                depInfo.toLocaleLowerCase().includes('apt-manual-installed')) ||
                             isPythonDependence) &&
                         (!depVersion || depInfo.includes(depVersion))) {
                         const endTime = (0, dayjs_1.default)();

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('[执行任务失败] %s, 时间: %s, 错误信息: %j', command, new Date().toLocaleString(), 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('[创建任务失败] %s, 时间: %s, 错误信息: %j', command, new Date().toLocaleString(), 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(`[任务退出] ${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);
+                    await this.logger.error('[执行任务失败] 命令: %s, 时间: %s, 错误信息: %j', command, new Date().toLocaleString(), 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('[创建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('[取消定时任务], 任务名: %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('[创建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, 时间: %s, 错误信息: %j', command, new Date().toLocaleString(), err);
         });
         const job = new toad_scheduler_1.LongIntervalJob(Object.assign({ runImmediately: false }, schedule), task, _id);
         this.intervalSchedule.addIntervalJob(job);
@@ -105,7 +105,7 @@ let ScheduleService = class ScheduleService {
     }
     async cancelIntervalTask({ id = 0, name }) {
         const _id = this.formatId(id);
-        this.logger.info('[取消interval任务]，任务ID: %s，任务名：%s', _id, name);
+        this.logger.info('[取消interval任务], 任务ID: %s, 任务名: %s', _id, name);
         this.intervalSchedule.removeById(_id);
     }
     formatId(id) {

package/static/build/services/subscription.js

@@ -255,7 +255,7 @@ let SubscriptionService = class SubscriptionService {
                     await (0, util_1.killTask)(doc.pid);
                 }
                 catch (error) {
-                    this.logger.silly(error);
+                    this.logger.error(error);
                 }
             }
             const absolutePath = await (0, util_1.handleLogPath)(doc.log_path);

package/static/build/services/system.js

@@ -29,6 +29,8 @@ const const_1 = require("../config/const");
 const pLimit_1 = __importDefault(require("../shared/pLimit"));
 const tar_1 = __importDefault(require("tar"));
 const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const lodash_1 = require("lodash");
 let SystemService = class SystemService {
     constructor(logger, scheduleService, sockService) {
         this.logger = logger;
@@ -228,6 +230,27 @@ let SystemService = class SystemService {
             return { code: 400, message: error.message };
         }
     }
+    async getSystemLog(res) {
+        const result = (0, util_1.readDirs)(config_1.default.systemLogPath, config_1.default.systemLogPath);
+        const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
+        res.set({
+            'Content-Length': (0, lodash_1.sum)(logs.map((x) => x.size)),
+        });
+        (function sendFiles(res, fileNames) {
+            if (fileNames.length === 0) {
+                res.end();
+                return;
+            }
+            const currentLog = fileNames.shift();
+            if (currentLog) {
+                const currentFileStream = fs_1.default.createReadStream(path_1.default.join(config_1.default.systemLogPath, currentLog.title));
+                currentFileStream.on('end', () => {
+                    sendFiles(res, fileNames);
+                });
+                currentFileStream.pipe(res, { end: false });
+            }
+        })(res, logs);
+    }
 };
 __decorate([
     (0, typedi_1.Inject)((type) => notify_1.default),

package/static/build/shared/runCron.js

@@ -10,16 +10,16 @@ const logger_1 = __importDefault(require("../loaders/logger"));
 function runCron(cmd) {
     return pLimit_1.default.runWithCpuLimit(() => {
         return new Promise(async (resolve) => {
-            logger_1.default.silly('运行命令: ' + cmd);
+            logger_1.default.info(`[schedule][开始执行任务] 运行命令: ${cmd}`);
             const cp = (0, cross_spawn_1.spawn)(cmd, { shell: '/bin/bash' });
             cp.stderr.on('data', (data) => {
-                logger_1.default.info('[执行任务失败] %s，时间：%s, 错误信息：%j', cmd, new Date().toLocaleString(), data.toString());
+                logger_1.default.info('[schedule][执行任务失败] %s, 时间: %s, 错误信息: %j', cmd, new Date().toLocaleString(), data.toString());
             });
             cp.on('error', (err) => {
-                logger_1.default.error('[创建任务失败] %s，时间：%s, 错误信息：%j', cmd, new Date().toLocaleString(), err);
+                logger_1.default.error('[schedule][创建任务失败] %s, 时间: %s, 错误信息: %j', cmd, new Date().toLocaleString(), err);
             });
             cp.on('close', async (code) => {
-                logger_1.default.info(`[任务退出] ${cmd} 进程id: ${cp.pid} 退出，退出码 ${code}`);
+                logger_1.default.info(`[schedule][任务退出] ${cmd} 进程id: ${cp.pid} 退出, 退出码 ${code}`);
                 resolve();
             });
         });