Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/ExtractServiceImpl.java

@@ -286,7 +286,7 @@ public class ExtractServiceImpl implements ExtractService {
                 if (cutOff) {
                 if (cutOff) {
                     AllotResultParam allotResultParam = new AllotResultParam();
                     AllotResultParam allotResultParam = new AllotResultParam();
                     allotResultParam.setRisId(orderInfo.getOrderId());
                     allotResultParam.setRisId(orderInfo.getOrderId());
-                    allotResultParam.setExecutorWorkNo(orderInfo.getEngineerCode());
+                    allotResultParam.setExecutorWorkNo(engineerInfo.getCosmosId());
                     allotResultParam.setAssistantWorkNo(null);
                     allotResultParam.setAssistantWorkNo(null);
                     allotResultParam.setReason("自动派单");
                     allotResultParam.setReason("自动派单");
                     String format = "yyyy-MM-dd HH:mm:ss";
                     String format = "yyyy-MM-dd HH:mm:ss";

project-gateway/src/main/java/com/dituhui/pea/gateway/config/AuthFilter.java

@@ -86,7 +86,6 @@ public class AuthFilter implements GlobalFilter, Ordered {
         }
         }
 
 
         // ak登录处理
         // ak登录处理
-        if (StringUtils.isEmpty(authToken)) {
         final String ak = getParams(exchange, "ak", headers);
         final String ak = getParams(exchange, "ak", headers);
         if (log.isTraceEnabled()) {
         if (log.isTraceEnabled()) {
             log.trace("ak is {}", ak);
             log.trace("ak is {}", ak);
@@ -106,7 +105,6 @@ public class AuthFilter implements GlobalFilter, Ordered {
                 userDTO.setId(Globals.SUPER_ADMIN_ID);
                 userDTO.setId(Globals.SUPER_ADMIN_ID);
             }
             }
         }
         }
-        }
 
 
         if (userDTO == null) {
         if (userDTO == null) {
             log.info("未授权访问{} ip:{}", url, getRemoteIP(exchange));
             log.info("未授权访问{} ip:{}", url, getRemoteIP(exchange));