定时任务显示完整运行历史

back/api/cron.ts

@@ -434,6 +434,7 @@ export default (app: Router) => {
         log_path: Joi.string().optional().allow(null),
         last_running_time: Joi.number().optional().allow(null),
         last_execution_time: Joi.number().optional().allow(null),
+        exit_code: Joi.number().optional().allow(null),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -463,7 +464,6 @@ export default (app: Router) => {
         const instances = await RunningInstanceModel.findAll({
           where: {
             cron_id: req.params.id,
-            status: InstanceStatus.running,
           },
           order: [['started_at', 'DESC']],
           raw: true,

back/api/log.ts

@@ -11,6 +11,7 @@ import {
   rmPath,
 } from '../config/util';
 import LogService from '../services/log';
+import { InstanceStatus, RunningInstanceModel } from '../data/runningInstance';
 const route = Router();
 const blacklist = ['.tmp'];
 
@@ -46,8 +47,17 @@ export default (app: Router) => {
             message: t('暂无权限'),
           });
         }
+        const logPath = `${req.query.path as string}/${req.query.file as string}`;
+        const runningInstance = await RunningInstanceModel.findOne({
+          where: { log_path: logPath, status: InstanceStatus.running },
+        });
+
         const content = await getFileContentByName(finalPath);
-        res.send({ code: 200, data: removeAnsi(content) });
+        res.send({
+          code: 200,
+          data: removeAnsi(content),
+          logStatus: runningInstance ? 'running' : undefined,
+        });
       } catch (e) {
         return next(e);
       }