优化代码

java110-core/src/main/java/com/java110/core/factory/AuthenticationFactory.java

@@ -311,7 +311,7 @@ public class AuthenticationFactory {
             transactionId = headers.getFirst(CommonConstant.TRANSACTION_ID);
         }
         String requestTime = headers.getFirst(CommonConstant.HTTP_REQ_TIME);
-        if (StringUtil.isEmpty(transactionId)) {
+        if (StringUtil.isEmpty(requestTime)) {
             requestTime = headers.getFirst(CommonConstant.REQUEST_TIME);
         }
 
@@ -351,7 +351,7 @@ public class AuthenticationFactory {
             transactionId = headers.get(CommonConstant.HTTP_TRANSACTION_ID);
         }
         String requestTime = headers.get(CommonConstant.REQUEST_TIME);
-        if (StringUtil.isEmpty(transactionId)) {
+        if (StringUtil.isEmpty(requestTime)) {
             requestTime = headers.get(CommonConstant.HTTP_REQ_TIME);
         }
 
@@ -369,6 +369,7 @@ public class AuthenticationFactory {
             paramStr = param;
         }
         String sign = transactionId + requestTime + appId + paramStr + appRoutes.get(0).getSecurityCode();
+        logger.debug("鉴权前createSign:{}",sign);
         headers.put("sign", md5(sign));
     }
 

service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java

@@ -91,10 +91,10 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
         headers.put(CommonConstant.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
 
         if (!headers.containsKey(CommonConstant.HTTP_APP_ID)) {
-            headers.put(CommonConstant.HTTP_APP_ID, AppDto.WEB_APP_ID);
+            headers.put(CommonConstant.HTTP_APP_ID, pd.getAppId());
         }
         if (!headers.containsKey(CommonConstant.APP_ID)) {
-            headers.put(CommonConstant.APP_ID, AppDto.WEB_APP_ID);
+            headers.put(CommonConstant.APP_ID, pd.getAppId());
         }
 
         if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
@@ -112,8 +112,10 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
         if (HttpMethod.GET == httpMethod) {
             initUrlParam(JSONObject.parseObject(param), headers);
             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);
+        AuthenticationFactory.createSign(headers, httpMethod, headers.get("REQUEST_URL"), param);
 
         try {
             responseEntity = apiServiceSMOImpl.service(param, headers);
@@ -164,8 +166,10 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
         }
         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);
+        AuthenticationFactory.createSign(headers, httpMethod, headers.get("REQUEST_URL"), param);
 
         try {
             responseEntity = apiServiceSMOImpl.service(param, headers);

springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java

@@ -92,10 +92,10 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
         headers.put(CommonConstant.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
 
         if (!headers.containsKey(CommonConstant.HTTP_APP_ID)) {
-            headers.put(CommonConstant.HTTP_APP_ID, AppDto.WEB_APP_ID);
+            headers.put(CommonConstant.HTTP_APP_ID, pd.getAppId());
         }
         if (!headers.containsKey(CommonConstant.APP_ID)) {
-            headers.put(CommonConstant.APP_ID, AppDto.WEB_APP_ID);
+            headers.put(CommonConstant.APP_ID, pd.getAppId());
         }
 
         if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
@@ -113,8 +113,10 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
         if (HttpMethod.GET == httpMethod) {
             initUrlParam(JSONObject.parseObject(param), headers);
             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);
+        AuthenticationFactory.createSign(headers, httpMethod, headers.get("REQUEST_URL"), param);
 
         try {
             responseEntity = apiServiceSMOImpl.service(param, headers);
@@ -165,8 +167,10 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
         }
         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);
+        AuthenticationFactory.createSign(headers, httpMethod, headers.get("REQUEST_URL"), param);
 
         try {
             responseEntity = apiServiceSMOImpl.service(param, headers);