lyhzzz 2 yıl önce
ebeveyn
işleme
e04e986250

+ 0 - 17
src/main/java/com/fdkankan/fusion/common/util/ShellUtil.java

@@ -14,23 +14,6 @@ public class ShellUtil {
     public final static String LAS_TO_BIN = "bash  /home/ubuntu/bin/PotreeConverter.sh @inPath @outPath ''";
 
 
-    public static void execDockerCmd(String []cmd){
-        log.info("execDockerCmd:{}",cmd);
-        Process process;
-        try {
-            process = Runtime.getRuntime().exec(cmd);
-            long startTime = System.currentTimeMillis();
-            // 获取命令执行结果, 有两个结果: 正常的输出 和 错误的输出(PS: 子进程的输出就是主进程的输入)
-            //处理InputStream的线程
-            threadRun(process);
-            // 方法阻塞, 等待命令执行完成(成功会返回0)
-            process.waitFor();
-            log.info("execDockerCmd:{},耗时:{}", cmd,System.currentTimeMillis() -startTime);
-        } catch (Exception e) {
-            log.error("execDockerCmd:{},error:{}",cmd,e);
-        }
-
-    }
 
         /**
          * 执行系统命令, 返回执行结果

+ 2 - 4
src/main/java/com/fdkankan/fusion/controller/TestController.java

@@ -22,10 +22,8 @@ public class TestController {
 
     @RequestMapping("/test")
     public ResultData test(){
-        String cmd1 = "docker run --rm -v /mnt/fusion:/mnt/fusion/";
-        String cmd = "docker exec -it 3dtile /bin/bash -c '/mnt/fusion/3dtile.sh -f osgb -i /mnt/fusion/osgb/modelId_578/OSGB -o /mnt/fusion/b3dm/modelId_578/OSGB'";
-        String[] cmds = new String[]{cmd1, cmd};
-        ShellUtil.execDockerCmd(cmds);
+        String cmd = "sudo bash docker3dtile.sh /mnt/fusion/osgb/modelId_576/OSGB /mnt/fusion/b3dm/modelId_576/OSGB";
+        ShellUtil.execCmd(cmd);
         return ResultData.ok();
     }