Merge branch 'master-ucc-feature' into dev

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/authenticationInterface/UserAuthentication.java

@@ -5,7 +5,7 @@ import com.xxfc.platform.universal.biz.UserMessage;
 import java.util.Map;
 
 /**
- * 用户认证类
+ * 用户认证接口 (使用@Primary实现的优先级提升优先级)
  * @author Administrator
  */
 public interface UserAuthentication {

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/authenticationInterface/impl/BJCYAuthentication.java

@@ -25,7 +25,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-@Primary
+//@Primary
 public class BJCYAuthentication implements UserAuthentication {
     private final String host = "http://aliyunverifyidcard.haoservice.com";
     private final String path = "/idcard/VerifyIdcardv2";
@@ -39,7 +39,8 @@ public class BJCYAuthentication implements UserAuthentication {
     private final String ret="error_code";
     @Override
     public boolean certificate(UserMessage message) {
-        Map<String, String> headers = new HashMap<String, String>();
+        return true;
+        /*Map<String, String> headers = new HashMap<String, String>();
         headers.put(tokenHead, token);
         Map<String, String> querys = new HashMap<String, String>();
         querys.put(cardNo, message.getIdNumber());
@@ -66,7 +67,7 @@ public class BJCYAuthentication implements UserAuthentication {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return false;
+        return false;*/
     }
 
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/authenticationInterface/impl/XCFQAuthentication.java

@@ -12,6 +12,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
 import org.apache.http.util.EntityUtils;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -24,6 +25,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
+@Primary
 public class XCFQAuthentication implements UserAuthentication {
 
     private String cAppcode="acea1c8811f748b3a65815f11db357c4";
@@ -33,10 +35,8 @@ public class XCFQAuthentication implements UserAuthentication {
      */
     private String cHost = "https://idcert.market.alicloudapi.com";
 
-
     private String cPath = "/idcard";
 
-
     private String cMethod = "GET";
 
     //响应:认证错误码字段名
@@ -45,7 +45,6 @@ public class XCFQAuthentication implements UserAuthentication {
     //响应:认证通过码
     private String certifResultCode = "01";
 
-
     //请求:身份证号字段名
     private String idCardName = "idCard";
 
@@ -55,11 +54,9 @@ public class XCFQAuthentication implements UserAuthentication {
     @Override
     public boolean certificate(UserMessage message) {
         //map携带身份证和姓名进行认证
-
         Map<String, String> querys = new HashMap<>();
         querys.put(idCardName, message.getIdNumber());
         querys.put(cName, message.getName());
-
         Map<String, String> headers = new HashMap<String, String>();
         headers.put("Authorization", "APPCODE " + cAppcode);
         try {

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/BranchCompanyListDTO.java

@@ -20,6 +20,7 @@ public class BranchCompanyListDTO {
      */
     @ApiModelProperty("分公司名称")
     private String name;
+    private String companyName;
     /**
      * 公司封面
      */

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/BranchCompanyListVO.java

@@ -20,6 +20,7 @@ public class BranchCompanyListVO {
      */
     @ApiModelProperty("分公司名称")
     private String name;
+    private String companyName;
     /**
      * 公司封面
      */

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -73,6 +73,7 @@
         cb.town_name AS `townName`,
         bc.addr_detail AS `address`,
         bc.NAME AS `name`,
+        cb.name AS `companyName`,
         cb.cover,
         bc.leader,
         bc.leader_contact_info AS `leaderContactInfo`,