feature(配置文件修改): 配置文件修改

配置文件修改

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/business/impl/AuthApplyBusiness.java

@@ -711,17 +711,17 @@ public class AuthApplyBusiness implements IAuthApplyBusiness
     private List<Header> getBusApprovalHeaders() {
         List<Header> headers = new ArrayList<>();
         RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-        String userToken = "";
-        String appToken = "";
-        if (requestAttributes != null) {
-            ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
-            HttpServletRequest request = servletRequestAttributes.getRequest();
-            userToken = request.getHeader(Constants.USER_TOKEN);
-            appToken = request.getHeader(Constants.APP_TOKEN);
-            BasicHeader appTokenHeader = new BasicHeader(Constants.BUS_SRA_TOKEN, appToken);
-            BasicHeader userTokenHeader = new BasicHeader(Constants.BUS_SRE_TOKEN, userToken);
-            headers.add(appTokenHeader);
-            headers.add(userTokenHeader);
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
+        HttpServletRequest request = servletRequestAttributes.getRequest();
+        String userToken = request.getHeader(Constants.USER_TOKEN);
+        String appToken  = request.getHeader(Constants.APP_TOKEN);
+        if (StrUtil.isNotBlank(userToken)) {
+            Header userTokenHead = new BasicHeader(Constants.BUS_SRE_TOKEN, userToken);
+            headers.add(userTokenHead);
+        }
+        if (StrUtil.isNotBlank(appToken)) {
+            Header appTokeHead = new BasicHeader(Constants.BUS_SRA_TOKEN, appToken);
+            headers.add(appTokeHead);
         }
 
         String idcard = UserContextUtils.getCurrentUser().getIdcard();
@@ -745,19 +745,18 @@ public class AuthApplyBusiness implements IAuthApplyBusiness
     private List<Header> getApprovalHeaders() {
         List<Header> headers = new ArrayList<>();
         RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-        if (requestAttributes != null) {
-            ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
-            HttpServletRequest request = servletRequestAttributes.getRequest();
-            String userToken = request.getHeader(Constants.USER_TOKEN);
-            String appToken = request.getHeader(Constants.APP_TOKEN);
-            log.info("getApprovalHeaders userToken:{}, appToken:{}", userToken, appToken);
-            if(StringUtils.isNotBlank(userToken) && StringUtils.isNotBlank(appToken)) {
-                BasicHeader appTokenHeader = new BasicHeader(Constants.APP_TOKEN, appToken);
-                BasicHeader userTokenHeader = new BasicHeader(Constants.USER_TOKEN, userToken);
-                headers.add(appTokenHeader);
-                headers.add(userTokenHeader);
-            }
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
+        HttpServletRequest request = servletRequestAttributes.getRequest();
+        String userToken = request.getHeader(Constants.USER_TOKEN);
+        String appToken = request.getHeader(Constants.APP_TOKEN);
+        log.info("getApprovalHeaders userToken:{}, appToken:{}", userToken, appToken);
+        if(StringUtils.isNotBlank(userToken) && StringUtils.isNotBlank(appToken)) {
+            BasicHeader appTokenHeader = new BasicHeader(Constants.APP_TOKEN, appToken);
+            BasicHeader userTokenHeader = new BasicHeader(Constants.USER_TOKEN, userToken);
+            headers.add(appTokenHeader);
+            headers.add(userTokenHeader);
         }
+
         String idcard = UserContextUtils.getCurrentUser().getIdcard();
         BasicHeader appCodeHeader = new BasicHeader(Constants.APP_CODE, authConfig.getAppCode());
         BasicHeader idcardHeader = new BasicHeader(Constants.IDCARD, idcard);

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/business/impl/SubSyncBusiness.java

@@ -143,14 +143,10 @@ public class SubSyncBusiness implements ISubSyncBusiness {
         BasicHeader appCodeHeader = new BasicHeader("appCode", authConfig.getAppCode());
         BasicHeader idcardHeader = new BasicHeader("idcard", idcard);
         RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-        String userToken = "";
-        String appToken = "";
-        if (requestAttributes != null) {
-            ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
-            HttpServletRequest request = servletRequestAttributes.getRequest();
-            userToken = request.getHeader(Constants.USER_TOKEN);
-            appToken = request.getHeader(Constants.APP_TOKEN);
-        }
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
+        HttpServletRequest request = servletRequestAttributes.getRequest();
+        String userToken = request.getHeader(Constants.USER_TOKEN);
+        String appToken  = request.getHeader(Constants.APP_TOKEN);
         logger.info("getHeaders >>> request userToken:{},appToken:{}", userToken, appToken);
         if (StrUtil.isNotBlank(userToken)) {
             Header userTokenHead = new BasicHeader(Constants.USER_TOKEN, userToken);
@@ -161,6 +157,7 @@ public class SubSyncBusiness implements ISubSyncBusiness {
             Header appTokeHead = new BasicHeader(Constants.APP_TOKEN, appToken);
             headers.add(appTokeHead);
         }
+
         headers.add(appCodeHeader);
         headers.add(idcardHeader);
         return headers;