From 5d15287b2a06f978485ac6af71e33e1a82b43a65 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 15 四月 2020 16:29:55 +0800
Subject: [PATCH] fix 上传后生成版本连接池用完不释放问题
---
src/main/java/com/highdatas/mdm/job/JobClient.java | 114 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 56 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/job/JobClient.java b/src/main/java/com/highdatas/mdm/job/JobClient.java
index fe0119a..5b339f4 100644
--- a/src/main/java/com/highdatas/mdm/job/JobClient.java
+++ b/src/main/java/com/highdatas/mdm/job/JobClient.java
@@ -12,16 +12,14 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.http.*;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import org.springframework.web.client.RestTemplate;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
@Slf4j
@@ -45,10 +43,10 @@
}
public boolean login() {
String url = this.url + prefix + "login";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("userName","mdmadmin");
- params.set("password","datacvg123");
- params.set("ifRemember","false");
+ Map<String, String> params = new LinkedHashMap<>();
+ params.put("userName","mdmadmin");
+ params.put("password","datacvg123");
+ params.put("ifRemember","false");
Map<String, Object> paramMap = new HashMap<>();
paramMap.putAll(params);
String urlParamsByMap = HttpUtils.getUrlParamsByMap(paramMap);
@@ -73,13 +71,13 @@
public boolean saveJobGroup() {
try {
String url = this.url + prefix + "xxlcustapi/saveJobGroup";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("appName","MDMApp");
- params.set("order", "1");
- params.set("title","鏁版嵁姹囬泦瀹氭椂浠诲姟鎵ц鍣�");
- params.set("modelId","MDM");
- params.set("addressType","1");
- params.set("addressList",local);
+ Map<String, String> params = new LinkedHashMap<>();
+ params.put("appName","MDMApp");
+ params.put("order", "1");
+ params.put("title","鏁版嵁姹囬泦瀹氭椂浠诲姟鎵ц鍣�");
+ params.put("modelId","MDM");
+ params.put("addressType","1");
+ params.put("addressList",local);
String s = null;
Map<String, Object> paramMap = new HashMap<>();
paramMap.putAll(params);
@@ -103,8 +101,8 @@
public boolean removeJobGroup() {
try {
String url = this.url + prefix + "xxlcustapi/saveJobGroup";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("modelid","MDM");
+ Map<String, String> params = new LinkedHashMap<>();
+ params.put("modelid","MDM");
Map<String, Object> paramMap = new HashMap<>();
paramMap.putAll(params);
String urlParamsByMap = HttpUtils.getUrlParamsByMap(paramMap);
@@ -127,21 +125,21 @@
try {
String jobId = createJobId(assemble.getId());
String url = this.url + prefix + "xxlcustapi/addJob";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("modelId","MDM");
- params.set("modelJobId", jobId);
- params.set("jobCron",assemble.getCron());
- params.set("author",assemble.getUserId());
- params.set("executorHandler","assembleJob");
- params.set("executorParam",assemble.getId());
- params.set("cronGen_display",assemble.getCron());
- params.set("executorBlockStrategy","DISCARD_LATER");
- params.set("executorTimeout","0");
- params.set("executorFailRetryCount","3");
- params.set("triggerStatus","1");
- params.set("glueType","BEAN");
- params.set("executorRouteStrategy","FIRST");
- params.set("jobDesc","鍒涘缓姹囬泦job");
+ Map<String, String> params = new LinkedHashMap<>();
+ params.put("modelId","MDM");
+ params.put("modelJobId", jobId);
+ params.put("jobCron",assemble.getCron());
+ params.put("author",assemble.getUserId());
+ params.put("executorHandler","assembleJob");
+ params.put("executorParam",assemble.getId());
+ params.put("cronGen_display",assemble.getCron());
+ params.put("executorBlockStrategy","DISCARD_LATER");
+ params.put("executorTimeout","0");
+ params.put("executorFailRetryCount","3");
+ params.put("triggerStatus","1");
+ params.put("glueType","BEAN");
+ params.put("executorRouteStrategy","FIRST");
+ params.put("jobDesc","鍒涘缓姹囬泦job");
Map<String, Object> paramMap = new HashMap<>();
paramMap.putAll(params);
String urlParamsByMap = HttpUtils.getUrlParamsByMap(paramMap);
@@ -178,21 +176,21 @@
public boolean updateJob(SysAssemble assemble) {
try {
String url = this.url + prefix + "xxlcustapi/updateJob";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("modelId","MDM");
- params.set("modelJobId",assemble.getJobId());
- params.set("jobCron",assemble.getCron());
- params.set("author",assemble.getUserId());
- params.set("executorHandler","assembleJob");
- params.set("executorParam",assemble.getId());
- params.set("cronGen_display",assemble.getCron());
- params.set("executorBlockStrategy","DISCARD_LATER");
- params.set("executorTimeout","0");
- params.set("executorFailRetryCount","3");
- params.set("triggerStatus","1");
- params.set("glueType","BEAN");
- params.set("executorRouteStrategy","FIRST");
- params.set("jobDesc","鏇存柊姹囬泦job");
+ Map<String, String> params = new LinkedHashMap<>();
+ params.put("modelId","MDM");
+ params.put("modelJobId",assemble.getJobId());
+ params.put("jobCron",assemble.getCron());
+ params.put("author",assemble.getUserId());
+ params.put("executorHandler","assembleJob");
+ params.put("executorParam",assemble.getId());
+ params.put("cronGen_display",assemble.getCron());
+ params.put("executorBlockStrategy","DISCARD_LATER");
+ params.put("executorTimeout","0");
+ params.put("executorFailRetryCount","3");
+ params.put("triggerStatus","1");
+ params.put("glueType","BEAN");
+ params.put("executorRouteStrategy","FIRST");
+ params.put("jobDesc","鏇存柊姹囬泦job");
Map<String, Object> paramMap = new HashMap<>();
paramMap.putAll(params);
String urlParamsByMap = HttpUtils.getUrlParamsByMap(paramMap);
@@ -215,9 +213,9 @@
try {
String url = this.url + prefix + "xxlcustapi/removeJob";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("modelId","MDM");
- params.set("modelJobId", jobId);
+ Map<String, String> params = new LinkedHashMap<>();
+ params.put("modelId","MDM");
+ params.put("modelJobId", jobId);
Map<String, Object> paramMap = new HashMap<>();
paramMap.putAll(params);
@@ -243,9 +241,9 @@
}
try {
String url = this.url + prefix + "xxlcustapi/queryJobLogById";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("modelId","MDM");
- params.set("modelJobId", assemble.getJobId());
+ Map<String, String> params = new LinkedHashMap<>();
+ params.put("modelId","MDM");
+ params.put("modelJobId", assemble.getJobId());
Map<String, Object> paramMap = new HashMap<>();
paramMap.putAll(params);
@@ -271,10 +269,10 @@
}
try {
String url = this.url + prefix + "xxlcustapi/trigger";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("modelId","MDM");
- params.set("modelJobId", assemble.getJobId());
- params.set("executorParam", assemble.getId());
+ Map<String, String> params = new LinkedHashMap<>();
+ params.put("modelId","MDM");
+ params.put("modelJobId", assemble.getJobId());
+ params.put("executorParam", assemble.getId());
Map<String, Object> paramMap = new HashMap<>();
paramMap.putAll(params);
@@ -295,7 +293,7 @@
}
- private String HttpRestClient(String url, HttpMethod method, MultiValueMap<String, String> formParams, String getParams, MediaType mediaType) {
+ private String HttpRestClient(String url, HttpMethod method, Map<String, String> formParams, String getParams, MediaType mediaType) {
if (!StringUtils.isEmpty(getParams)) {
url = url + Constant.QUESTION + getParams;
}
@@ -308,7 +306,7 @@
headers.setContentType(mediaType);
}
- HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<MultiValueMap<String, String>>(formParams, headers);
+ HttpEntity<Map<String, String>> requestEntity = new HttpEntity<Map<String, String>>(formParams, headers);
// 鎵цHTTP璇锋眰
ResponseEntity<String> response = client.exchange(url, method, requestEntity, String.class);
--
Gitblit v1.8.0