适应linux文件路径

houko · houko · commit 20a7faad6d42 · 2016-04-25T19:45:14.000+08:00
diff --git a/core/src/main/java/info/xiaomo/core/constant/WebDefaultValueConst.java b/core/src/main/java/info/xiaomo/core/constant/WebDefaultValueConst.java
@@ -18,5 +18,7 @@ public interface WebDefaultValueConst {
 
     String defaultImage = "https://ss0.bdstatic.com/5aV1bjqh_Q23odCf/static/superman/img/logo/bd_logo1_31bdc765.png";
 
-    String imgBaseUrl = System.getProperty("user.dir") + "/static/images";
+    String imgBaseUrl = "http://static.xiaomo.info/images/";
+
+    String saveBaseUrl = "/data2/xiaomo.info/static/images/";
 }
diff --git a/core/src/main/java/info/xiaomo/core/untils/FileUtil.java b/core/src/main/java/info/xiaomo/core/untils/FileUtil.java
@@ -683,18 +683,18 @@ private static void list(ArrayList list, File file,
      * @return fileUrl
      */
     public static String upload(MultipartFile file, String email) {
-        String savePath = "";
+        String savePath;
+        String filename = "";
         if (file != null && !file.isEmpty()) {
             // 获取图片的文件名
             String fileName = file.getOriginalFilename();
             // 重新定义图片名字
-            String filename = FileUtil.getNewFileName(fileName, email);
+            filename = FileUtil.getNewFileName(fileName, email);
             //上传服务器上 新文件路径
-            savePath = WebDefaultValueConst.imgBaseUrl;
+            savePath = WebDefaultValueConst.saveBaseUrl;
             try {
-                File newFile;
                 // 判断服务器上 文件夹是否存在
-                newFile = new File(savePath);
+                File newFile = new File(savePath);
                 if (!newFile.exists()) {
                     newFile.mkdirs();
                 }
@@ -708,7 +708,7 @@ public static String upload(MultipartFile file, String email) {
                 e.printStackTrace();
             }
         }
-        return savePath;
+        return WebDefaultValueConst.imgBaseUrl + filename;
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,7 @@ public interface WebDefaultValueConst {`
`18`	`18`
`19`	`19`	`String defaultImage = "https://ss0.bdstatic.com/5aV1bjqh_Q23odCf/static/superman/img/logo/bd_logo1_31bdc765.png";`
`20`	`20`
`21`		`- String imgBaseUrl = System.getProperty("user.dir") + "/static/images";`
	`21`	`+ String imgBaseUrl = "http://static.xiaomo.info/images/";`
	`22`	`+`
	`23`	`+ String saveBaseUrl = "/data2/xiaomo.info/static/images/";`
`22`	`24`	`}`