完善header

src/main/java/com/esv/freight/app/common/filter/CheckCustomToken.java

@@ -45,7 +45,7 @@ public class CheckCustomToken {
 
         Long tenantId = customToken.getTenantId();
         // TODO 判断租户ID是否正确，如果不存在此租户，直接返回，目前暂定租户名"100100100"
-        if(tenantId != 100100100L) {
+        if(tenantId != 1L) {
             throw new EException(401, "没有访问权限");
         }
 

src/main/java/com/esv/freight/app/config/FeignConfigure.java

 package com.esv.freight.app.config;
 
 import com.esv.freight.app.common.util.ReqUtils;
+import com.esv.freight.app.common.util.SecurityUtils;
 import com.esv.freight.app.module.account.CustomToken;
 import com.esv.gateway.common.GatewayHeaders;
 import feign.RequestInterceptor;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -24,6 +26,7 @@ import java.lang.reflect.Field;
  */
 @EnableFeignClients(basePackages = "com.esv.freight.app.feign")
 @Configuration
+@Slf4j
 public class FeignConfigure {
 
     @Value("${spring.application.name}")
@@ -39,9 +42,10 @@ public class FeignConfigure {
         RequestInterceptor requestInterceptor = ((requestTemplate -> {
             requestTemplate.header("trace_id", MDC.get("traceId"));
             requestTemplate.header("application_name", applicationName);
-            requestTemplate.header("Source-Type", "4");
+            String requestSource = ReqUtils.getRequestHeader("requestSource");
+            requestTemplate.header("Source-Type", requestSource);
             requestTemplate.header("esv_data_perm", "0");
-            requestTemplate.header("gateway_traceid", "1");
+//            requestTemplate.header("gateway_traceid", "1");
             requestTemplate.header("esv_system", "app");
             requestTemplate.header("esv_department", "5");
             requestTemplate.header("esv_department_children", "5,6,7");

src/main/java/com/esv/freight/app/module/vehicle/form/VehicleForm.java

@@ -79,6 +79,12 @@ public class VehicleForm {
     @Range(min = 1000, max = 5000, message = "参数vehicleHeight不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
     @NotNull(message = "参数vehicleHeight不能为空", groups = {ValidatorInsert.class})
     private Integer vehicleHeight;
+    /**
+     * 车辆所属(字典表)：1-自有车、2-外协车
+     */
+    @Range(min = 1, max = 2, message = "参数vehicleBelong不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
+    @NotNull(message = "参数vehicleBelong不能为空", groups = {ValidatorInsert.class})
+    private Integer vehicleBelong;
     /**
      * 年审日期
      */

src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ server:
 nacos:
   url: 192.168.31.248:8848
   namespace: aad5aa26-5351-4e7a-a65e-ecb332f3c52c
-  group: FREIGHT_GROUP
+  group: DEFAULT_GROUP
 spring:
   application:
     name: freight-app-service