...
|
...
|
@@ -53,13 +53,15 @@ public class JavaApiTask implements Callable<JavaApiStatics> { |
|
|
JSONObject req = null;
|
|
|
if (javaApiInfo.getApiData() != null && !(javaApiInfo.getApiData().equals("")))
|
|
|
req = JSON.parseObject(javaApiInfo.getApiData());
|
|
|
log.info("test java api url {}",url);
|
|
|
|
|
|
if (javaApiInfo.getApiReqMethod() == 0) {
|
|
|
jsonRep = restTemplate.getForObject(url, String.class);
|
|
|
} else {
|
|
|
jsonRep = restTemplate.postForObject(url, req, String.class);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
log.warn("exception {} ", url);
|
|
|
log.warn("url {} exception {} ", url, e);
|
|
|
apiStatics.setHasException(true);
|
|
|
apiStatics.setException(e);
|
|
|
} finally {
|
...
|
...
|
@@ -76,7 +78,7 @@ public class JavaApiTask implements Callable<JavaApiStatics> { |
|
|
}
|
|
|
|
|
|
private String createReqUrl() {
|
|
|
if(javaApiInfo.getApiUrlCustom()!=null&&javaApiInfo.getApiUrlCustom()==1&&javaApiInfo.getApiUrl()!=null) {
|
|
|
if (javaApiInfo.getApiUrlCustom() != null && javaApiInfo.getApiUrlCustom() == 1 && javaApiInfo.getApiUrl() != null) {
|
|
|
return javaApiInfo.getApiUrl(); //custom url
|
|
|
}
|
|
|
if (mObjectInfo.getMoHostIp() == null || mObjectInfo.getMoHostIp() == null || javaApiInfo.getApiUrl() == null) {
|
...
|
...
|
@@ -91,11 +93,6 @@ public class JavaApiTask implements Callable<JavaApiStatics> { |
|
|
|
|
|
url += "/" + javaApiInfo.getApiUrl();
|
|
|
|
|
|
// try {
|
|
|
// return URLDecoder.decode(url.replaceAll("%", "%25"), "UTF-8");
|
|
|
// } catch (UnsupportedEncodingException e) {
|
|
|
// log.warn("url decode error : {}", url);
|
|
|
return url;
|
|
|
// }
|
|
|
}
|
|
|
} |
...
|
...
|
|