Authored by jack-xue

优化

... ... @@ -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;
// }
}
}
... ...
... ... @@ -31,7 +31,7 @@ public class JavaApiThreadFactory implements ThreadFactory {
namePrefix + threadNumber.getAndIncrement(),
0);
if (t.isDaemon())
t.setDaemon(false);
t.setDaemon(true);
if (t.getPriority() != Thread.NORM_PRIORITY)
t.setPriority(Thread.NORM_PRIORITY);
return t;
... ...
... ... @@ -5,8 +5,8 @@
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
<bean id="javaapi_ConnectionManager" class="org.apache.http.impl.conn.PoolingHttpClientConnectionManager">
<property name="maxTotal" value="40" />
<property name="defaultMaxPerRoute" value="10" />
<property name="maxTotal" value="50" />
<property name="defaultMaxPerRoute" value="20" />
</bean>
<bean id="javaapi_httpClientBuilder" class="org.apache.http.impl.client.HttpClientBuilder"
... ...