合并jzl

gassafety-admin/src/main/java/com/zehong/web/controller/common/CommonController.java

@@ -77,7 +77,8 @@ public class CommonController
 //            String fileName = FileUploadUtils.upload(filePath, file);
 //            String url = serverConfig.getUrl() + fileName;
             String fileName = file.getOriginalFilename();
-            String url = serverConfig.getUrl() + FileUploadUtils.upload(filePath, file);
+            String fileServer = serverConfig.getUrl().contains("127") && serverConfig.getUrl().contains("8093") && !filePath.contains("/data")? serverConfig.getUrl() : serverConfig.getUrl().replace("127.0.0.1:8903","36.148.23.59:8901");
+            String url = fileServer + FileUploadUtils.upload(filePath, file);
             AjaxResult ajax = AjaxResult.success();
             ajax.put("fileName", fileName);
             ajax.put("url", url);