lyhzzz 1 年間 前
コミット
d4b2d1d4d9

+ 1 - 1
src/main/java/com/fdkankan/fusion/common/FilePath.java

@@ -2,7 +2,7 @@ package com.fdkankan.fusion.common;
 
 public class FilePath {
 
-    public final static String LOCAL_BASE_PATH = "/home/tomcat/jar-fusion-8808/";
+    public final static String LOCAL_BASE_PATH = "/mnt/fusion/";
     public final static String MNT_BASE_PATH = "/mnt/fusion/";
 
     public final static String OBJ_OSS_PATH = "scene_view_data/%s/data/mesh";

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

@@ -7,8 +7,8 @@ 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 = "/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);
     }
 }