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) {
                     AllotResultParam allotResultParam = new AllotResultParam();
                     allotResultParam.setRisId(orderInfo.getOrderId());
-                    allotResultParam.setExecutorWorkNo(orderInfo.getEngineerCode());
+                    allotResultParam.setExecutorWorkNo(engineerInfo.getCosmosId());
                     allotResultParam.setAssistantWorkNo(null);
                     allotResultParam.setReason("自动派单");
                     String format = "yyyy-MM-dd HH:mm:ss";

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

@@ -86,25 +86,23 @@ public class AuthFilter implements GlobalFilter, Ordered {
         }
 
         // ak登录处理
-        if (StringUtils.isEmpty(authToken)) {
-            final String ak = getParams(exchange, "ak", headers);
-            if (log.isTraceEnabled()) {
-                log.trace("ak is {}", ak);
-            }
+        final String ak = getParams(exchange, "ak", headers);
+        if (log.isTraceEnabled()) {
+            log.trace("ak is {}", ak);
+        }
 
-            if (StringUtils.isNotEmpty(ak)) {
-                // 验证ak，设置userDTO
-                // 验证成功，设置为管理员
-                // AppDTO appDTO = gson.fromJson(value, AppDTO.class);
-                // String secret = appDTO.getSecret();
-                Optional<Boolean> aBoolean = appKey(ak);
-                if (aBoolean.isPresent() && Objects.equals(Boolean.TRUE, aBoolean.get())) {
-                    final String sign = getParams(exchange, "sign", headers);
-                    //计算签名
-                    //TODO  参数签名校验
-                    userDTO = new UserLoginDTO();
-                    userDTO.setId(Globals.SUPER_ADMIN_ID);
-                }
+        if (StringUtils.isNotEmpty(ak)) {
+            // 验证ak，设置userDTO
+            // 验证成功，设置为管理员
+            // AppDTO appDTO = gson.fromJson(value, AppDTO.class);
+            // String secret = appDTO.getSecret();
+            Optional<Boolean> aBoolean = appKey(ak);
+            if (aBoolean.isPresent() && Objects.equals(Boolean.TRUE, aBoolean.get())) {
+                final String sign = getParams(exchange, "sign", headers);
+                //计算签名
+                //TODO  参数签名校验
+                userDTO = new UserLoginDTO();
+                userDTO.setId(Globals.SUPER_ADMIN_ID);
             }
         }