修复日志获取

back/api/log.ts

@@ -3,7 +3,8 @@ import { Container } from 'typedi';
 import { Logger } from 'winston';
 import * as fs from 'fs';
 import config from '../config';
-import { getFileContentByName } from '../config/util';
+import { getFileContentByName, readDirs } from '../config/util';
+import { join } from 'path';
 const route = Router();
 
 export default (app: Router) => {
@@ -12,59 +13,28 @@ export default (app: Router) => {
   route.get('/', async (req: Request, res: Response, next: NextFunction) => {
     const logger: Logger = Container.get('logger');
     try {
-      const fileList = fs.readdirSync(config.logPath, 'utf-8');
-      const dirs = [];
-      for (let i = 0; i < fileList.length; i++) {
-        const stat = fs.lstatSync(config.logPath + fileList[i]);
-        if (stat.isDirectory()) {
-          const fileListTmp = fs.readdirSync(
-            `${config.logPath}/${fileList[i]}`,
-            'utf-8',
-          );
-          dirs.push({
-            name: fileList[i],
-            isDir: true,
-            files: fileListTmp.reverse(),
-          });
-        } else {
-          dirs.push({
-            name: fileList[i],
-            isDir: false,
-            files: [],
-          });
-        }
-      }
-      res.send({ code: 200, dirs });
+      const result = readDirs(config.logPath, config.logPath);
+      res.send({
+        code: 200,
+        data: result,
+      });
     } catch (e) {
       logger.error('🔥 error: %o', e);
       return next(e);
     }
   });
 
-  route.get(
-    '/:dir/:file',
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const { dir, file } = req.params;
-        const content = getFileContentByName(
-          `${config.logPath}/${dir}/${file}`,
-        );
-        res.send({ code: 200, data: content });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
-
   route.get(
     '/:file',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        const { file } = req.params;
-        const content = getFileContentByName(`${config.logPath}/${file}`);
+        const filePath = join(
+          config.logPath,
+          req.query.path as string,
+          req.params.file,
+        );
+        const content = getFileContentByName(filePath);
         res.send({ code: 200, data: content });
       } catch (e) {
         logger.error('🔥 error: %o', e);

back/api/script.ts

@@ -17,22 +17,19 @@ const route = Router();
 export default (app: Router) => {
   app.use('/scripts', route);
 
-  route.get(
-    '/files',
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const result = readDirs(config.scriptPath, config.scriptPath);
-        res.send({
-          code: 200,
-          data: result,
-        });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
+    const logger: Logger = Container.get('logger');
+    try {
+      const result = readDirs(config.scriptPath, config.scriptPath);
+      res.send({
+        code: 200,
+        data: result,
+      });
+    } catch (e) {
+      logger.error('🔥 error: %o', e);
+      return next(e);
+    }
+  });
 
   route.get(
     '/:file',