From 8bc698dd14f30e40c8c83d42b9b08c38051e0cd0 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 01 二月 2024 18:16:21 +0800
Subject: [PATCH] 优化代码
---
springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java | 77 +++++++++++++++++---------------------
1 files changed, 34 insertions(+), 43 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java b/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
index 9ed8433..f40ebd7 100644
--- a/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
+++ b/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
@@ -5,12 +5,14 @@
import com.java110.boot.properties.WechatAuthProperties;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.core.factory.AuthenticationFactory;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.app.AppDto;
+import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.dto.store.StoreDto;
import com.java110.dto.user.UserDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.cache.PrivilegeCache;
@@ -37,7 +39,8 @@
protected static final String DEFAULT_PAY_ADAPT = "wechatPayAdapt";// 榛樿寰俊閫氱敤鏀粯
private static final String URL_API = "";
-
+ @Autowired
+ private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;
@Autowired
private WechatAuthProperties wechatAuthProperties;
@@ -61,10 +64,6 @@
private static final String WECHAT_SERVICE_APP_ID = "SERVICE_APP_ID";
private static final String WECHAT_SERVICE_MCH_ID = "SERVICE_MCH_ID";
-
-
- @Autowired
- private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
/**
@@ -92,20 +91,18 @@
headers.put(CommonConstant.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
- if (!headers.containsKey(CommonConstant.HTTP_USER_ID)) {
- headers.put(CommonConstant.HTTP_USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
- }
if (!headers.containsKey(CommonConstant.HTTP_APP_ID)) {
headers.put(CommonConstant.HTTP_APP_ID, pd.getAppId());
}
+ if (!headers.containsKey(CommonConstant.APP_ID)) {
+ headers.put(CommonConstant.APP_ID, pd.getAppId());
+ }
+
if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());
}
if (!headers.containsKey(CommonConstant.HTTP_REQ_TIME)) {
headers.put(CommonConstant.HTTP_REQ_TIME, DateUtil.getNowDefault());
- }
- if (!headers.containsKey(CommonConstant.HTTP_SIGN)) {
- headers.put(CommonConstant.HTTP_SIGN, "");
}
if (url.indexOf("?") > -1) {
@@ -113,13 +110,14 @@
}
headers.put(CommonConstant.HTTP_SERVICE, url);
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.getHttpMethodStr(httpMethod));
-
if (HttpMethod.GET == httpMethod) {
initUrlParam(JSONObject.parseObject(param), headers);
- }
- if (HttpMethod.GET == httpMethod) {
headers.put("REQUEST_URL", "http://127.0.0.1:8008/" + url + mapToUrlParam(JSONObject.parseObject(param)));
+ } else {
+ headers.put("REQUEST_URL", "http://127.0.0.1:8008/" + url);
}
+ AuthenticationFactory.createSign(headers, httpMethod, headers.get("REQUEST_URL"), param);
+
try {
responseEntity = apiServiceSMOImpl.service(param, headers);
} catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
@@ -148,19 +146,14 @@
headers.put(CommonConstant.HTTP_USER_ID, "-1");
}
- headers.put(CommonConstant.USER_ID, "-1");
-
- if (!headers.containsKey(CommonConstant.HTTP_USER_ID)) {
- headers.put(CommonConstant.HTTP_USER_ID, "-1");
+ if (!headers.containsKey(CommonConstant.USER_ID)) {
+ headers.put(CommonConstant.USER_ID, headers.get(CommonConstant.HTTP_USER_ID));
}
if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());
}
if (!headers.containsKey(CommonConstant.HTTP_REQ_TIME)) {
headers.put(CommonConstant.HTTP_REQ_TIME, DateUtil.getNowDefault());
- }
- if (!headers.containsKey(CommonConstant.HTTP_SIGN)) {
- headers.put(CommonConstant.HTTP_SIGN, "");
}
if (url.indexOf("?") > -1) {
@@ -174,7 +167,11 @@
}
if (HttpMethod.GET == httpMethod) {
headers.put("REQUEST_URL", "http://127.0.0.1:8008/" + url + mapToUrlParam(JSONObject.parseObject(param)));
+ }else {
+ headers.put("REQUEST_URL", "http://127.0.0.1:8008/" + url);
}
+ AuthenticationFactory.createSign(headers, httpMethod, headers.get("REQUEST_URL"), param);
+
try {
responseEntity = apiServiceSMOImpl.service(param, headers);
} catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
@@ -339,6 +336,7 @@
if (basePrivilegeDtos == null || basePrivilegeDtos.size() < 1) {
return;
}
+ String tmpResource = null;
boolean hasPrivilege = false;
for (BasePrivilegeDto privilegeDto : basePrivilegeDtos) {
if (resource.equals(privilegeDto.getResource())) {
@@ -349,18 +347,20 @@
return;
}
- BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
- basePrivilegeDto.setResource(resource);
- basePrivilegeDto.setUserId(pd.getUserId());
- List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
+ 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("鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔");
}
-
- hasPrivilege = false;
for (int privilegeIndex = 0; privilegeIndex < privileges.size(); privilegeIndex++) {
- if (resource.equals(privileges.get(privilegeIndex).get("resource"))) {
+ tmpResource = privileges.getJSONObject(privilegeIndex).getString("resource");
+ if (resource.equals(tmpResource)) {
hasPrivilege = true;
break;
}
@@ -379,15 +379,11 @@
protected ResponseEntity<String> getStoreInfo(IPageData pd, RestTemplate restTemplate) {
Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
- ResultVo resultVo = null;
+ ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreInfo(pd, restTemplate, pd.getUserId());
return new ResponseEntity<String>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
}
- private ResponseEntity<String> getStoreEnterCommunitys(IPageData pd, String storeId, String storeTypeCd, RestTemplate restTemplate) {
- ResultVo resultVo = null;
- return new ResponseEntity<String>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
- }
/**
* 鏌ヨ鍟嗘埛淇℃伅
@@ -396,17 +392,12 @@
*/
protected void checkStoreEnterCommunity(IPageData pd, String storeId, String storeTypeCd, String communityId, RestTemplate restTemplate) {
Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
- ResponseEntity<String> responseEntity = null;
- responseEntity = getStoreEnterCommunitys(pd, storeId, storeTypeCd, restTemplate);
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreEnterCommunitys(pd, storeId, storeTypeCd, restTemplate);
+ if (resultVo.getCode() != ResultVo.CODE_OK) {
throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "杩樻湭鍏ラ┗灏忓尯锛岃鍏堝叆椹诲皬鍖�");
}
- Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "data", "杩樻湭鍏ラ┗灏忓尯锛岃鍏堝叆椹诲皬鍖�");
-
- JSONObject community = JSONObject.parseObject(responseEntity.getBody().toString());
-
- JSONArray communitys = community.getJSONArray("data");
+ JSONArray communitys = JSONArray.parseArray(resultVo.getData().toString());
if (communitys == null || communitys.size() == 0) {
throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "杩樻湭鍏ラ┗灏忓尯锛岃鍏堝叆椹诲皬鍖�");
--
Gitblit v1.8.0