Commit a3c650eb authored by jianqian's avatar jianqian

BASE

parent 024732ef
...@@ -78,6 +78,9 @@ public class CommonController ...@@ -78,6 +78,9 @@ public class CommonController
// String url = serverConfig.getUrl() + fileName; // String url = serverConfig.getUrl() + fileName;
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
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 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");
if(fileServer.contains("rqgw.zhkjgf.com")){
fileServer = serverConfig.getUrl().replace("rqgw.zhkjgf.com","36.148.23.59:8901");
}
String url = fileServer + FileUploadUtils.upload(filePath, file); String url = fileServer + FileUploadUtils.upload(filePath, file);
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
ajax.put("fileName", fileName); ajax.put("fileName", fileName);
......
...@@ -127,7 +127,6 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService ...@@ -127,7 +127,6 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
String[] strgps = str.split(","); String[] strgps = str.split(",");
map.put("longitude",strgps[0].substring(3, strgps[0].length() - 1)); map.put("longitude",strgps[0].substring(3, strgps[0].length() - 1));
map.put("latitude",strgps[1].substring(1, strgps[1].length() - 2)); map.put("latitude",strgps[1].substring(1, strgps[1].length() - 2));
System.out.println("============================="+map.get("longitude")+","+map.get("latitude"));
//JSONObject jo = JSONObject.parseObject(str); //JSONObject jo = JSONObject.parseObject(str);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment