应用日志

src/main/java/io/renren/common/utils/FTPUtils.java

@@ -226,7 +226,7 @@ public class FTPUtils {
             }
         }
 
-        return runLog.toString();
+        return runLog.append(errLog).toString();
 
     }
 

src/main/java/io/renren/modules/generator/controller/ApplicationsController.java

@@ -1,5 +1,7 @@
 package io.renren.modules.generator.controller;
 
+import com.jcraft.jsch.JSchException;
+import io.renren.common.utils.FTPUtils;
 import io.renren.common.utils.PageUtils;
 import io.renren.common.utils.R;
 import io.renren.modules.generator.entity.ApplicationsEntity;
@@ -91,4 +93,13 @@ public class ApplicationsController {
         return R.ok();
     }
 
+    @GetMapping("/appRunningLog/{appName}")
+    public R appRunningLog(@PathVariable("appName")String appName) throws JSchException {
+        String command = "docker ps -aq --filter name="+appName;
+        String containerId= FTPUtils.execCmd(command).substring(0,12);
+        String logCmd="docker logs "+containerId;
+        String log=FTPUtils.execCmd(logCmd);
+        return R.ok().put("log",log);
+    }
+
 }