From 8dc6389c6d65d49bfb2569a39ffa3494b5e7ff48 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 五月 2022 12:28:25 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java | 99 +++++++++++++++++++++++++++++--------------------
1 files changed, 58 insertions(+), 41 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java b/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java
old mode 100644
new mode 100755
index a4bbbe1..b4cf899
--- a/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java
+++ b/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java
@@ -2,22 +2,16 @@
import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.util.ProtocolUtil;
-import com.java110.utils.util.StringUtil;
import com.java110.core.base.AppBase;
import com.java110.core.context.AppContext;
-import com.java110.core.context.IPageData;
-import com.java110.core.smo.code.IPrimaryKeyInnerServiceSMO;
+import com.java110.intf.code.IPrimaryKeyInnerServiceSMO;
+import com.java110.utils.util.ProtocolUtil;
+import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.HttpStatusCodeException;
-import org.springframework.web.client.RestTemplate;
+import com.java110.core.log.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
/**
* 鎵�鏈夋湇鍔＄鐨勫熀绫�
@@ -58,34 +52,6 @@
return targetId;
}
- /**
- * 璋冪敤涓績鏈嶅姟
- *
- * @return
- */
- protected ResponseEntity<String> callCenterService(RestTemplate restTemplate, IPageData pd, String param, String url, HttpMethod httpMethod) {
- ResponseEntity<String> responseEntity = null;
- HttpHeaders header = new HttpHeaders();
- header.add(CommonConstant.HTTP_APP_ID.toLowerCase(), CommonConstant.HC_WEB_APP_ID);
- header.add(CommonConstant.HTTP_USER_ID.toLowerCase(), StringUtil.isEmpty(pd.getUserId()) ? CommonConstant.ORDER_DEFAULT_USER_ID : pd.getUserId());
- header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), pd.getTransactionId());
- header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), pd.getRequestTime());
- header.add(CommonConstant.HTTP_SIGN.toLowerCase(), "");
- HttpEntity<String> httpEntity = new HttpEntity<String>(param, header);
- //logger.debug("璇锋眰涓績鏈嶅姟淇℃伅锛寋}", httpEntity);
- try {
- responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
- } catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
- responseEntity = new ResponseEntity<String>("璇锋眰涓嬫父绯荤粺寮傚父锛�" + e.getResponseBodyAsString(), e.getStatusCode());
- } catch (Exception e) {
- responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
- } finally {
- logger.debug("璇锋眰鍦板潃涓�,{} 璇锋眰涓績鏈嶅姟淇℃伅锛寋},涓績鏈嶅姟杩斿洖淇℃伅锛寋}", url, httpEntity, responseEntity);
- return responseEntity;
- }
-
- }
-
/**
* 鍒涘缓涓婁笅鏂囧璞�
@@ -97,4 +63,55 @@
}
+ /**
+ * map 鍙傛暟杞� url get 鍙傛暟 闈炵┖鍊艰浆涓篻et鍙傛暟 绌哄�煎拷鐣�
+ *
+ * @param info map鏁版嵁
+ * @return url get 鍙傛暟 甯︼紵
+ */
+ protected String mapToUrlParam(Map info) {
+ String urlParam = "";
+ if (info == null || info.isEmpty()) {
+ return urlParam;
+ }
+
+ urlParam += "?";
+
+ for (Object key : info.keySet()) {
+ if (StringUtil.isNullOrNone(info.get(key))) {
+ continue;
+ }
+
+ urlParam += (key + "=" + info.get(key) + "&");
+ }
+
+ urlParam = urlParam.endsWith("&") ? urlParam.substring(0, urlParam.length() - 1) : urlParam;
+
+ return urlParam;
+ }
+
+ /**
+ * @param urlparam 甯﹀垎闅旂殑url鍙傛暟
+ * @return
+ */
+ public static Map<String, String> urlToMap(String urlparam) {
+ if (urlparam.indexOf("?") < 0) {
+ return new HashMap<>();
+ }
+ urlparam = urlparam.substring(urlparam.indexOf("?")+1);
+ Map<String, String> map = new HashMap<String, String>();
+ String[] param = urlparam.split("&");
+ for (String keyvalue : param) {
+ String[] pair = keyvalue.split("=");
+ if (pair.length == 2) {
+ map.put(pair[0], pair[1]);
+ }
+ }
+ return map;
+ }
+
+ public static void main(String[] args) {
+ String url = "https://www.xx.com";
+ System.out.println(url.substring(0,url.indexOf("?")));
+ }
}
--
Gitblit v1.8.0