From e52ddfe8caf7d0027950033a5aff2a1fd3482e9d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 01 六月 2022 17:50:25 +0800
Subject: [PATCH] 优化装修 跟踪记录 回显

---
 java110-core/src/main/java/com/java110/core/base/controller/BaseController.java |   76 +++++++++++++++++++++++--------------
 1 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java b/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java
old mode 100644
new mode 100755
index b8e7a70..cd84e18
--- a/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java
+++ b/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java
@@ -1,20 +1,21 @@
 package com.java110.core.base.controller;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.core.context.IPageData;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.ServiceConstant;
-import com.java110.utils.exception.NoAuthorityException;
-
-import com.java110.utils.util.StringUtil;
 import com.java110.core.base.AppBase;
 import com.java110.core.context.BusinessServiceDataFlow;
-import com.java110.core.factory.DataFlowFactory;
+import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
+import com.java110.core.factory.DataFlowFactory;
+import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.utils.cache.PrivilegeCache;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.NoAuthorityException;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.ui.Model;
 import org.springframework.web.client.RestTemplate;
@@ -28,6 +29,8 @@
  * Created by wuxw on 2017/2/23.
  */
 public class BaseController extends AppBase {
+
+
 
 
     /**
@@ -113,6 +116,19 @@
         return returnMap;
     }
 
+    // 鑾峰彇HttpServletRequest閲岄潰鐨勫弬鏁�
+    public static Map<String, String> getRequestParams(HttpServletRequest request) {
+        Map<String, String[]> params = request.getParameterMap();
+        Map<String, String> params2 = new HashMap<>();
+        for (String key : params.keySet()) {
+            String[] values = params.get(key);
+            if (values.length > 0) {
+                params2.put(key, request.getParameter(key));
+            }
+        }
+        return params2;
+    }
+
     protected void initHeadParam(HttpServletRequest request, Map headers) {
 
         Enumeration reqHeaderEnum = request.getHeaderNames();
@@ -124,11 +140,28 @@
 
         headers.put("IP", getIpAddr(request));
 
-        headers.put("hostName", request.getLocalName());
+        //headers.put("hostName", request.getLocalName()); 杩欓噷瀵艰嚧閮ㄥ垎涓绘満 閫熷害姣旇緝鎱�
+        headers.put("hostName", "localhost");
         headers.put("port", request.getLocalPort() + "");
 
-        if(headers.containsKey("app-id")){
-            headers.put("app_id",headers.get("app-id"));
+        //澶勭悊app-id
+        if (headers.containsKey("app-id")) {
+            headers.put("app_id", headers.get("app-id"));
+        }
+
+        //澶勭悊transaction-id
+        if (headers.containsKey("transaction-id")) {
+            headers.put("transaction_id", headers.get("transaction-id"));
+        }
+
+        //澶勭悊req-time
+        if (headers.containsKey("req-time")) {
+            headers.put("req_time", headers.get("req-time"));
+        }
+
+        //澶勭悊req-time
+        if (headers.containsKey("user-id") && !"-1".equals(headers.get("user-id"))) {
+            headers.put("user_id", headers.get("user-id"));
         }
 
     }
@@ -258,22 +291,7 @@
         return businessServiceDataFlow;
     }
 
-    protected void hasPrivilege(RestTemplate restTemplate, IPageData pd, String resource) {
-        ResponseEntity<String> responseEntity = null;
-        //娌℃湁鐢ㄦ埛鐨勬儏鍐典笅涓嶅仛鏉冮檺鍒ゆ柇
-        if (StringUtil.isEmpty(pd.getUserId())) {
-            return;
-        }
-        JSONObject paramIn = new JSONObject();
-        paramIn.put("resource", resource);
-        paramIn.put("userId", pd.getUserId());
-        responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
-                ServiceConstant.SERVICE_API_URL + "/api/basePrivilege.CheckUserHasResourceListener",
-                HttpMethod.POST);
 
-        if (responseEntity.getStatusCode() != HttpStatus.OK) {
-            throw new UnsupportedOperationException("鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔");
-        }
-    }
+
 
 }

--
Gitblit v1.8.0