lyhzzz 1 år sedan
förälder
incheckning
ecef317c9b

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

@@ -7,9 +7,9 @@ public class ShellCmd {
 	 * opType: file or folder
 	 * fyunType : oss ,aws
 	 */
-	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 FYUN_UPLOAD = "bash /opt/ossutil/fyun-upload.sh %s %s /%s %s %s";
+	public static final String FYUN_DOWN = "bash /opt/ossutil/fyun-download.sh %s /%s %s %s %s";
 
-	public static final String osgbTob3dmCmd = "sudo docker run --rm -v /mnt/fusion:/mnt/fusion 3dtile:v2 /mnt/fusion/3dtile.sh -f osgb -i " +
+	public static final String osgbTob3dmCmd = "bash /mnt/fusion/3dtile.sh -f osgb -i " +
 			"@inputFile -o @outputFile";
 }

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

@@ -163,12 +163,12 @@ public class ShellUtil {
      */
     public static void yunUpload(String srcPath,String destPath){
         String opType = srcPath.contains(".")? "file":"folder" ;
-        String cmd = String.format(ShellCmd.FYUN_UPLOAD, "4dkankan",srcPath,destPath,"oss",opType);
+        String cmd = String.format(ShellCmd.FYUN_UPLOAD, "4dkankan",srcPath,destPath,"local",opType);
         execCmd(cmd);
     }
     public static void yunDownload(String srcPath,String destPath){
         String opType = srcPath.contains(".")? "file":"folder" ;
-        String cmd = String.format(ShellCmd.FYUN_DOWN,"4dkankan",srcPath,destPath,"oss",opType);
+        String cmd = String.format(ShellCmd.FYUN_DOWN,"4dkankan",srcPath,destPath,"local",opType);
         execCmd(cmd);
     }
 }