1、透传header头

2、config里新家重定向接口

ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RedirectApi.java

@@ -7,20 +7,21 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 @RestController
 public class RedirectApi {
 
 	@PostMapping(path = { "/redirect", "/zkt-sdk/redirect" }, produces = "application/json;charset=UTF-8")
-	public String redirect(@RequestBody String param) {
-		String result = RedirectUtil.redirect(param, false);
+	public String redirect(@RequestBody String param, HttpServletRequest request) {
+		String result = RedirectUtil.redirect(param, false,request);
 		return result;
 	}
 
 	@PostMapping(path = { "/redirect_wrapper", "/zkt-sdk/redirect_wrapper" }, produces = "application/json;charset=UTF-8")
-	public String redirect_wrapper(@RequestBody String param) {
-		String result = RedirectUtil.redirect(param, true);
+	public String redirect_wrapper(@RequestBody String param,HttpServletRequest request) {
+		String result = RedirectUtil.redirect(param, true, request);
 		return result;
 	}
 

ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RedirectUtil.java

@@ -15,11 +15,12 @@ import com.persagy.ibms.data.sdk.util.HttpClientUtil;
 
 import lombok.extern.slf4j.Slf4j;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 @Slf4j
 public class RedirectUtil {
-	public static String redirect(String param, boolean wrapper) {
+	public static String redirect(String param, boolean wrapper, HttpServletRequest request) {
 		JSONObject sql_json = JSON.parseObject(param);
 		String code = sql_json.getString("code");
 		ConfigRedirect ConfigRedirect = Constant.ConfigRedirectMap.get(code);
@@ -103,7 +104,7 @@ public class RedirectUtil {
 			} else {
 				postString = postBody.toString();
 			}
-			resultString = HttpClientUtil.instance("redirect").post(url, postString, null, ConfigRedirect.headerMap,null);
+			resultString = HttpClientUtil.instance("redirect").post(url, postString, null, ConfigRedirect.headerMap,null,null);
 		}
 		Object result;
 		try {

ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/HttpClientUtil.java

@@ -8,6 +8,7 @@ import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -141,22 +142,26 @@ public class HttpClientUtil {
 	}
 
 	public synchronized String post(String url, String content) throws Exception {
-		String result = post(url, content, 300000, null,null);
+		String result = post(url, content, 300000, null,null,null);
 		return result;
 	}
 
 	public synchronized String post(String url, String content,HttpServletResponse response) throws Exception {
-		String result = post(url, content, 300000, null,response);
+		String result = post(url, content, 300000, null,response,null);
 		return result;
 	}
 
 
-	public synchronized String post(String url, String content, Integer timeout, Map<String, String> headerMap,HttpServletResponse response) throws Exception {
+	public synchronized String post(String url, String content, Integer timeout, Map<String, String> headerMap,HttpServletResponse response, HttpServletResponse request) throws Exception {
 		if (Constant.http_interval > 0) {
 			Thread.sleep(Constant.http_interval);
 		}
 
 		HttpPost httpost = new HttpPost(url);
+		if(!url.contains("login")||!url.contains("getCaptchaBase64"))
+		{
+			httpost.setHeader("Authorization", request.getHeader("Authorization"));
+		}
 		if (headerMap != null) {
 			for (String key : headerMap.keySet()) {
 				httpost.setHeader(key, headerMap.get(key));
@@ -176,7 +181,7 @@ public class HttpClientUtil {
 		HttpResponse httpResponse = client.execute(httpost);
 		if(url.contains("login"))
 		{
-			Header responseFirstHeader= httpResponse.getFirstHeader("app-token");
+			Header responseFirstHeader= httpResponse.getFirstHeader("Authorization");
 			response.setHeader(responseFirstHeader.getName(),responseFirstHeader.getValue());
 		}
 		InputStream is = httpResponse.getEntity().getContent();

ibms-data-sdk/src/main/resources/config.xml

@@ -286,6 +286,34 @@
 	<Redirect code="用水量查询" http_request_type="post" url="http://192.168.100.33:9909/zkt-monitor/waterlot/getWaterConsumtionInfo">
 		<header key="Content-Type" value="application/json"/>
 	</Redirect>
+	<!--空间编辑功能查询接口-->
+	<Redirect code="空间编辑查询" http_request_type="post" url="http://192.168.100.33:9909/zkt-monitor/spaceInfo/list">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
+	<!--万达温度面板-->
+	<Redirect code="获取测温点" http_request_type="get" url="http://192.168.100.33:9909/zkt-monitor/floorAvgTemperature/query">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
+	<Redirect code="获取枚举类型" http_request_type="post" url="http://192.168.100.33:9909/zkt-monitor/generalDictionary/list">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
+	<!--单设备关联摄像头-->
+	<Redirect code="查询下拉框" http_request_type="post" url="http://192.168.100.33:9909/zkt-monitor/camera/select">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
+	<Redirect code="查询摄像头列表" http_request_type="post" url="http://192.168.100.33:9909/zkt-monitor/camera/list">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
+	<Redirect code="更改默认显示画面" http_request_type="post" url="http://192.168.100.33:9909/zkt-monitor/camera/update">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
+	<!--公共照明手动模式切换-->
+	<Redirect code="获取模式日程详情" http_request_type="post" url="http://192.168.100.33:9909/zkt-control/logicalGrouping/firstLogicalGrouping">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
+	<Redirect code="下发模式指令" http_request_type="post" url="http://192.168.100.33:9909/zkt-control/logicalGrouping/presentsetByPlanModel">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
 	<Redirect code="test-get1" http_request_type="get" url="http://39.102.43.179:9993/alarm-record/list" />
 	<Redirect code="test-post1" http_request_type="post" url="http://192.168.4.69:8806/zkt-sdk/post" />
 	<Redirect code="test-get2" http_request_type="get" url="http://39.102.43.179:9993/alarm-record/list?projectId=Pj4403070003&amp;groupCode=WD" />