From 6cd222d13f03901362f9a4c36a204e1e0b93a6e4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 08 九月 2022 00:31:22 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/base/controller/BaseController.java | 82 ++++++++++++++--------------------------
1 files changed, 29 insertions(+), 53 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 c2397a3..c7abae0 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
@@ -8,7 +8,6 @@
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;
@@ -31,8 +30,7 @@
*/
public class BaseController extends AppBase {
- @Autowired
- private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;
+
/**
@@ -67,21 +65,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 +92,30 @@
}
}
+
+ 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;
+ }
+
+ return false;
+ }
+
public static Map<String, String> getParameterStringMap(HttpServletRequest request) {
Map<String, String[]> properties = request.getParameterMap();//鎶婅姹傚弬鏁板皝瑁呭埌Map<String, String[]>涓�
@@ -293,54 +316,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