lyhzzz 2 years ago
parent
commit
ba2ed4df94

+ 2 - 2
src/main/java/com/fdkankan/fusion/common/util/ShellCmd.java

@@ -10,6 +10,6 @@ public class ShellCmd {
 	public static final String FYUN_UPLOAD = "sudo bash /opt/ossutil/fyun-upload.sh %s %s /%s %s %s";
 	public static final String FYUN_DOWN = "sudo bash /opt/ossutil/fyun-download.sh %s /%s %s %s %s";
 
-	public static final String osgbTob3dmCmd = "sudo docker exec 3dtile /bin/bash -c \"/mnt/fusion/3dtile.sh -f osgb -i " +
-			"@inputFile -o @outputFile\"";
+	public static final String osgbTob3dmCmd = "sudo docker exec -it 3dtile /bin/bash -c '/mnt/fusion/3dtile.sh -f osgb -i " +
+			"@inputFile -o @outputFile'";
 }

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -217,7 +217,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                         redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"80");
                         ShellUtil.yunUpload(localPath,b3dmPath);
                         model.setModelGlbUrl((JSONArray.toJSONString(Arrays.asList(queryPath +  jsonPath.replace(FilePath.LOCAL_BASE_PATH,"fusion/")))));
-                        //FileUtil.del(localPath);
+                        FileUtil.del(localPath);
                     }
                     if(name.contains(".b3dm") && b3dmJsonPath != null){
                         model.setModelDateType("b3dm");