|
|
@ -89,7 +89,6 @@ public class FileServiceImpl implements FileService {
|
|
|
|
if(!isExists)
|
|
|
|
if(!isExists)
|
|
|
|
return ResultVOUtils.error(9999,filePath + filePathSlash + imagePath + strs[0]);
|
|
|
|
return ResultVOUtils.error(9999,filePath + filePathSlash + imagePath + strs[0]);
|
|
|
|
String result = relayFile(files,host);
|
|
|
|
String result = relayFile(files,host);
|
|
|
|
logger.error(result);
|
|
|
|
|
|
|
|
if (IDCUtils.isJson(result)) {
|
|
|
|
if (IDCUtils.isJson(result)) {
|
|
|
|
BaseResponse baseResponse = JSON.parseObject(result,BaseResponse.class);
|
|
|
|
BaseResponse baseResponse = JSON.parseObject(result,BaseResponse.class);
|
|
|
|
return baseResponse;
|
|
|
|
return baseResponse;
|
|
|
@ -219,7 +218,6 @@ public class FileServiceImpl implements FileService {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
Response response = client.newCall(req).execute();
|
|
|
|
Response response = client.newCall(req).execute();
|
|
|
|
result = response.body().string();
|
|
|
|
result = response.body().string();
|
|
|
|
logger.info("result--->" + result);
|
|
|
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
} catch (IOException e) {
|
|
|
|
// TODO Auto-generated catch block
|
|
|
|
// TODO Auto-generated catch block
|
|
|
|
e.printStackTrace();
|
|
|
|
e.printStackTrace();
|
|
|
@ -231,10 +229,9 @@ public class FileServiceImpl implements FileService {
|
|
|
|
return result;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public BaseResponse downloadFile(HttpServletRequest request,Map<String,Object> params) {
|
|
|
|
public BaseResponse downloadFile(HttpServletRequest request,Map<String,Object> params) {
|
|
|
|
String host = "";
|
|
|
|
String host = "";
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
Map<String,Object> config =dbDao.get("select paramValue from system_param_config where paramKey='upper_server_ip'");
|
|
|
|
Map<String,Object> config =dbDao.get("select paramValue from system_param_config where paramKey='upper_server_ip'");
|
|
|
|
if(config!=null&&config.get("paramValue")!=null)
|
|
|
|
if(config!=null&&config.get("paramValue")!=null)
|
|
|
|