Merge branch 'dev' into master

# Conflicts:
#	mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java
#	mhd_product/pom.xml

mhd-common/mhd-common-core/pom.xml

@@ -156,7 +156,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.4</version>
+            <version>1.18.22</version>
         </dependency>
 
         <dependency>

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java

@@ -522,4 +522,22 @@ public class TmsOrder implements Serializable {
 
     @ApiModelProperty(value = "付款方名称")
     private String payer;
+
+    @ApiModelProperty("客户编码nc")
+    private String customsCodeNc;
+
+    @ApiModelProperty("制单人编码nc")
+    private String makerCodeNc;
+
+    @ApiModelProperty("业务员编码nc")
+    private String salesmanCodeNc;
+
+    @ApiModelProperty("税率")
+    private BigDecimal taxRate;
+
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
 }

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java

@@ -301,4 +301,13 @@ public class UserDriverListPo {
     @ApiModelProperty(value = "是否允许竞价(0-不允许竞价,1-允许参与竞价，2-允许查看竞价)")
     private Integer isDriverBidding;
 
+    @ApiModelProperty(value = "用户身份")
+    private Integer userIdentity;
+
+    @ApiModelProperty(name = "车辆主体")
+    private String vehicleBody;
+
+    @ApiModelProperty(name = "")
+    private String wlhydriverId;
+
 }

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverPo.java

@@ -185,6 +185,9 @@ public class UserDriverPo {
     @ApiModelProperty(name = "用户实名认证状态：0-无状态，1-已注册未认证，2-已认证待审核，3-审核通过，4-已驳回")
     private Integer userAuthStatus;
 
+    @ApiModelProperty(name = "车辆主体")
+    private String vehicleBody;
+
 
     //===================车队司机参数===============
     @ApiModelProperty("车队队长userId")

mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java

@@ -15,10 +15,12 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+
 @Service
 public class MinIoUploadService {
-    @Autowired(required=false)
+
     private MinioClient minioClient;
+
     private static String bucket="ngwl";
     private static String host="http://10.102.192.5:6000";
     private static String accessKey="minioadmin";
@@ -32,7 +34,7 @@ public class MinIoUploadService {
 
     /**
      * 上传到minio
-     * @param
+     * @param fileName
      * @throws Exception
      */
 
@@ -65,7 +67,7 @@ public class MinIoUploadService {
                     .stream(inputStream,inputStream.available(),-1).build();
             //文件名称相同会覆盖
             minioClient.putObject(objectArgs);
-            String url =host+ "/"+bucket + "/"+fileName;
+            String url =host+"/browser/"+bucket + "/"+fileName;
 
 //
             return url;

mhd-common/mhd-common-security/src/main/java/com/mhd/common/security/service/TokenService.java

@@ -129,6 +129,7 @@ public class TokenService
         if (StringUtils.isNotEmpty(token))
         {
             String userkey = JwtUtils.getUserKey(token);
+            redisService.deleteObject(userkey);
             redisService.deleteObject(getTokenKey(userkey));
         }
     }