From 4e7907983a99e695f2acba4dec8bd73b7dbe6b2b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 14:41:33 +0800
Subject: [PATCH] optimize
---
java110-core/src/main/java/com/java110/core/base/controller/BaseController.java | 109 +++++++++++++++++++++++-------------------------------
1 files changed, 46 insertions(+), 63 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
index 255598d..4849a93 100755
--- 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,25 +1,15 @@
package com.java110.core.base.controller;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.java110.core.base.AppBase;
import com.java110.core.context.BusinessServiceDataFlow;
-import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
import com.java110.core.factory.DataFlowFactory;
-import com.java110.core.smo.IGetCommunityStoreInfoSMO;
-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;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
@@ -31,8 +21,7 @@
*/
public class BaseController extends AppBase {
- @Autowired
- private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;
+
/**
@@ -67,21 +56,22 @@
String[] value = (String[]) readOnlyMap.get(key);
// String[] value = (String[]) readOnlyMap.get(key);
if (value.length > 1) {
- headers.put(key, value[0]);
for (int j = 0; j < value.length; j++) {
queryString.append(key);
queryString.append("=");
queryString.append(value[j]);
queryString.append("&");
}
-
} else {
- headers.put(key, value[0]);
queryString.append(key);
queryString.append("=");
queryString.append(value[0]);
queryString.append("&");
}
+ if(!hasValidHeader(key.toLowerCase())){
+ continue;
+ }
+ headers.put(key, value[0]);
}
}
@@ -93,6 +83,33 @@
}
}
+
+ private boolean hasValidHeader(String key) {
+ if("app-id".equals(key) || "app_id".equals(key)){
+ return true;
+ }
+ if("transaction-id".equals(key) || "transaction_id".equals(key)){
+ return true;
+ }
+ if("req-time".equals(key) || "req_time".equals(key)){
+ return true;
+ }
+ if("sign".equals(key)){
+ return true;
+ }
+ if("user-id".equals(key) || "user_id".equals(key)){
+ return true;
+ }
+ if("java110-lang".equals(key)){
+ return true;
+ }
+ if("store-id".equals(key)){
+ return true;
+ }
+
+ return false;
+ }
+
public static Map<String, String> getParameterStringMap(HttpServletRequest request) {
Map<String, String[]> properties = request.getParameterMap();//鎶婅姹傚弬鏁板皝瑁呭埌Map<String, String[]>涓�
@@ -116,6 +133,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) {
@@ -149,7 +179,7 @@
}
//澶勭悊req-time
- if (headers.containsKey("user-id")) {
+ if (headers.containsKey("user-id") && !"-1".equals(headers.get("user-id"))) {
headers.put("user_id", headers.get("user-id"));
}
@@ -280,54 +310,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());
- //鏍￠獙璧勬簮璺姴鏄惁瀹氫箟鏉冮檺
- List<BasePrivilegeDto> basePrivilegeDtos = PrivilegeCache.getPrivileges();
- if (basePrivilegeDtos == null || basePrivilegeDtos.size() < 1) {
- return;
- }
- String tmpResource = null;
- boolean hasPrivilege = false;
- for (BasePrivilegeDto privilegeDto : basePrivilegeDtos) {
- if (resource.equals(privilegeDto.getResource())) {
- hasPrivilege = true;
- }
- }
- if (!hasPrivilege) { //鏉冮檺娌℃湁閰嶇疆锛岀洿鎺ヨ烦杩�
- return;
- }
-
- ResultVo resultVo = getCommunityStoreInfoSMOImpl.checkUserHasResourceListener(restTemplate, pd, paramIn, pd.getUserId());
- if (resultVo == null || resultVo.getCode() != ResultVo.CODE_OK) {
- throw new UnsupportedOperationException("鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔");
- }
- JSONArray privileges = JSONArray.parseArray(resultVo.getMsg());
-
- hasPrivilege = false;
- if (privileges == null || privileges.size() < 1) {
- throw new UnsupportedOperationException("鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔");
- }
- for (int privilegeIndex = 0; privilegeIndex < privileges.size(); privilegeIndex++) {
- tmpResource = privileges.getJSONObject(privilegeIndex).getString("resource");
- if (resource.equals(tmpResource)) {
- hasPrivilege = true;
- break;
- }
- }
- if (!hasPrivilege) {
- throw new UnsupportedOperationException("鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔");
- }
-
- }
}
--
Gitblit v1.8.0