卓望最新代码，提交保存一版

src/main/java/info/aspirecn/rdc/iov/sjjh/servicenode/supplier/action/WycChannelActionImpl.java

@@ -62,41 +62,41 @@ public class WycChannelActionImpl {
         request.setAttribute(Constant.CHANNEL_PRICE,request.getHeader(Constant.CHANNEL_PRICE));
         ChannelTypeHandleResponseObject responseObject = new ChannelTypeHandleResponseObject();
         try{
-         responseObject = wycChannelService.WycInfoRequest(
-        		request, channelId,outTime,customBody);
-        //日志记录通道响应码
-        if(responseObject.getCode() != 1){
-            request.setAttribute(Constant.ACCESSLOG_MG_RESPONSE_CODE_KEY,Constant.CHANNEL_LOG_ERROR_CODE);
-        }else{
-            log.info("ifJk:{}",request.getHeader(Constant.CUSTOMER_RETURN_TYPE_PARA));
-        	 if(Constant.CUSTOMER_RETURN_JK.equals(request.getHeader(Constant.CUSTOMER_RETURN_TYPE_PARA))){
-
-             	String code = property.getCode().get(responseObject.getResultCode());
-             	log.info("resultCode:{},jkCode:{}",responseObject.getResultCode(),code);
-             	if(code!=null){
-             		responseObject.setResultCode(Integer.valueOf(code));
-             	}
-             }
-            request.setAttribute(Constant.ACCESSLOG_MG_RESPONSE_CODE_KEY,Constant.CHANNEL_LOG_SUCCESS_CODE);
-        }
-        //日志记录通道查询参数
-        if(customBody != null){
-            try {
-                request.setAttribute(Constant.CHANNEL_LOG_QUERY,Base64.encodeBase64String(customBody.getBytes("utf-8")));
-            } catch (UnsupportedEncodingException e) {
-                ExceptionUtils.handleThrowable(e);
-                log.error("异常信息：{}",e);
+            responseObject = wycChannelService.WycInfoRequest(
+                    request, channelId,outTime,customBody);
+            //日志记录通道响应码
+            if(responseObject.getCode() != 1){
+                request.setAttribute(Constant.ACCESSLOG_MG_RESPONSE_CODE_KEY,Constant.CHANNEL_LOG_ERROR_CODE);
+            }else{
+                log.info("ifJk:{}",request.getHeader(Constant.CUSTOMER_RETURN_TYPE_PARA));
+                if(Constant.CUSTOMER_RETURN_JK.equals(request.getHeader(Constant.CUSTOMER_RETURN_TYPE_PARA))){
+
+                    String code = property.getCode().get(responseObject.getResultCode());
+                    log.info("resultCode:{},jkCode:{}",responseObject.getResultCode(),code);
+                    if(code!=null){
+                        responseObject.setResultCode(Integer.valueOf(code));
+                    }
+                }
+                request.setAttribute(Constant.ACCESSLOG_MG_RESPONSE_CODE_KEY,Constant.CHANNEL_LOG_SUCCESS_CODE);
+            }
+            //日志记录通道查询参数
+            if(customBody != null){
+                try {
+                    request.setAttribute(Constant.CHANNEL_LOG_QUERY,Base64.encodeBase64String(customBody.getBytes("utf-8")));
+                } catch (UnsupportedEncodingException e) {
+                    ExceptionUtils.handleThrowable(e);
+                    log.error("异常信息：{}",e);
+                }
             }
-        }
 
-        request.setAttribute(Constant.ACCESSLOG_MG_ISCHARGE_KEY,responseObject.getIsCharge());
+            request.setAttribute(Constant.ACCESSLOG_MG_ISCHARGE_KEY,responseObject.getIsCharge());
 
-        return responseObject;
-       }catch(Exception ex){
-    	   ErrorUtils.captureException(ex);
-    	   log.error("message:{}",ex);
-    	   return responseObject;
-       }
+            return responseObject;
+        }catch(Exception ex){
+            ErrorUtils.captureException(ex);
+            log.error("message:{}",ex);
+            return responseObject;
+        }
     }
     @ApiOperation(value = "网约车从业人员查询-定制接口")
     @PostMapping(value = "/onlineCarHailingQuery.do")

src/main/java/info/aspirecn/rdc/iov/sjjh/servicenode/supplier/service/WycChannelService.java

@@ -62,7 +62,7 @@ public interface WycChannelService {
 	 * @return
 	 */
 	ChannelTypeHandleResponseObject vehicleInfoQuery(
-            HttpServletRequest request, String channelId, Integer outTime, String customBody);
+			HttpServletRequest request, String channelId, Integer outTime, String customBody);
 
 	/**
 	 * 网约车信息查询-拼接三传木解密-身份证号姓名解密
@@ -73,7 +73,7 @@ public interface WycChannelService {
 	 * @return
 	 */
 	ChannelTypeHandleResponseObject WycInfoDecodeRequestV2(
-            HttpServletRequest request, String channelId, Integer outTime, String customBody, String encryptType);
+			HttpServletRequest request, String channelId, Integer outTime, String customBody, String encryptType);
 
 	/**
 	 * 从业车辆画像查询-定制版

src/main/java/info/aspirecn/rdc/iov/sjjh/servicenode/supplier/service/impl/WycChannelServiceImpl.java

@@ -46,8 +46,8 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Service
 public class WycChannelServiceImpl implements WycChannelService {
-   @Autowired
-   private ObjectMapper objectMapper;
+    @Autowired
+    private ObjectMapper objectMapper;
     @Autowired
     SupplierProperties supplierProperties;
     @Autowired
@@ -68,7 +68,7 @@ public class WycChannelServiceImpl implements WycChannelService {
 
     @Override
     public ChannelTypeHandleResponseObject WycInfoRequest(HttpServletRequest request,
-                                                                     String channelId, Integer outTime, String customBody) {
+                                                          String channelId, Integer outTime, String customBody) {
         int money = Integer.parseInt(request.getHeader(Constant.ROUTE_PRICE));
         int secondMoney = Integer.parseInt(request.getHeader(Constant.ROUTE_SECOND_PRICE));
 
@@ -85,18 +85,18 @@ public class WycChannelServiceImpl implements WycChannelService {
             log.info("WycInfoRequest---customBody={},outTime={}",customBody,outTime);
             WycInfoRequestObject wycInfoRequestObject = objectMapper.readValue(customBody,
                     WycInfoRequestObject.class);
-             if (StringUtils.isBlank(wycInfoRequestObject.getName()) ||
+            if (StringUtils.isBlank(wycInfoRequestObject.getName()) ||
                     !PatternTools.checkResult(Constant.PATTERN_CN_NAME_REGEX, wycInfoRequestObject.getName())) {
-                 ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
-                 ret.setResultBody(Constant.INVALID_PARAMETER);
-                 ret.setResultDesc(Constant.INVALID_PARAMETER);
-                 return ret;
+                ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+                return ret;
             } else if (StringUtils.isBlank(wycInfoRequestObject.getIdCode())
                     || !PatternTools.checkResult(Constant.PATTERN_ID_NUMBER_REGEX, wycInfoRequestObject.getIdCode())) {
-                 ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
-                 ret.setResultBody(Constant.INVALID_PARAMETER);
-                 ret.setResultDesc(Constant.INVALID_PARAMETER);
-                 return ret;
+                ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
+                ret.setResultBody(Constant.INVALID_PARAMETER);
+                ret.setResultDesc(Constant.INVALID_PARAMETER);
+                return ret;
 
             }
 
@@ -106,23 +106,23 @@ public class WycChannelServiceImpl implements WycChannelService {
             // 创建一个请求 Builder
             Request.Builder builder = new Request.Builder();
             Request okRequest = new Request.Builder()
-                            .get()
-                            .url(supplierProperties.getUrl())
-                            .build();
+                    .get()
+                    .url(supplierProperties.getUrl())
+                    .build();
             HttpUrl.Builder urlBuilder = okRequest.url().newBuilder();
             urlBuilder.addQueryParameter("company_id",supplierProperties.getCompany_id());
             urlBuilder.addQueryParameter("dri_name",wycInfoRequestObject.getName());
             urlBuilder.addQueryParameter("idcard",wycInfoRequestObject.getIdCode());
             builder.url(urlBuilder.build());
 
-                    OkHttpClient client = okHttpClient.newBuilder()
-                            .connectTimeout(outTime, TimeUnit.MILLISECONDS)
-                            .readTimeout(outTime, TimeUnit.MILLISECONDS)
-                            .writeTimeout(outTime, TimeUnit.MILLISECONDS)
+            OkHttpClient client = okHttpClient.newBuilder()
+                    .connectTimeout(outTime, TimeUnit.MILLISECONDS)
+                    .readTimeout(outTime, TimeUnit.MILLISECONDS)
+                    .writeTimeout(outTime, TimeUnit.MILLISECONDS)
 
-                            .build();
-                    Response response = client.newCall(builder.build()).execute();
-                    String responseContext = response.body().string();
+                    .build();
+            Response response = client.newCall(builder.build()).execute();
+            String responseContext = response.body().string();
             //
             log.info("supplier10000036.WycInfoRequest接口responseContext={}",responseContext);
 
@@ -163,8 +163,8 @@ public class WycChannelServiceImpl implements WycChannelService {
                     String resultBody = objectMapper.writeValueAsString(mapResult);
                     resultBody = resultBody.replace("'","");
                     ret.setResultBody(resultBody);
-                     ret.setJfFree(money);
-                   ret.setJflx(3);
+                    ret.setJfFree(money);
+                    ret.setJflx(3);
                     ret.setResultDesc("查询成功，查有结果");
                 }else{//其他
                     ret.setResultCode(Constant.OTHER_ERROR_CODE);
@@ -446,7 +446,7 @@ public class WycChannelServiceImpl implements WycChannelService {
                 }
             }
         } catch(IOException e){
-                log.error("exception:{}", e);
+            log.error("exception:{}", e);
         }
 
     }
@@ -530,7 +530,7 @@ public class WycChannelServiceImpl implements WycChannelService {
     }
 
     private boolean validateEncryptRequestParams(ChannelTypeHandleResponseObject ret, String returnType,
-                                          String customBody) {
+                                                 String customBody) {
         JSONObject requestParamObject = JSONObject.parseObject(customBody);
         if (requestParamObject.get("params") == null) {
             if (Constant.CUSTOMER_RETURN_ZW.equals(returnType)) {
@@ -922,7 +922,7 @@ public class WycChannelServiceImpl implements WycChannelService {
 
     @Override
     public ChannelTypeHandleResponseObject WycInfoDecodeRequestV2(HttpServletRequest request, String channelId,
-                                                                Integer outTime, String customBody, String encryptType) {
+                                                                  Integer outTime, String customBody, String encryptType) {
         int money = Integer.parseInt(request.getHeader(Constant.ROUTE_PRICE));
         int secondMoney = Integer.parseInt(request.getHeader(Constant.ROUTE_SECOND_PRICE));
 
@@ -1105,7 +1105,7 @@ public class WycChannelServiceImpl implements WycChannelService {
             return false;
         } else if (encryptType.equals("MD5")
                 && (wycInfoRequestObject.getIdCode().length() != 32
-                    || wycInfoRequestObject.getName().length() !=32)) {
+                || wycInfoRequestObject.getName().length() !=32)) {
             ret.setResultCode(Constant.INVALID_PARAMETER_CODE);
             ret.setResultBody(Constant.INVALID_PARAMETER);
             ret.setResultDesc(Constant.INVALID_PARAMETER);
@@ -1168,7 +1168,7 @@ public class WycChannelServiceImpl implements WycChannelService {
     }
 
     private boolean validateVehicleInfoRequestParams(ChannelTypeHandleResponseObject ret, String returnType,
-                                          VehicleInfoQueryV2RequestObject jsonResolveObject) {
+                                                     VehicleInfoQueryV2RequestObject jsonResolveObject) {
         if (StringUtils.isBlank(jsonResolveObject.getVin())
                 || StringUtils.isBlank(jsonResolveObject.getBusinessType())
                 || StringUtils.isBlank(jsonResolveObject.getCompanyName())) {

src/main/java/info/aspirecn/rdc/iov/sjjh/servicenode/supplier/utils/DESedeUtil.java

@@ -104,8 +104,4 @@ public class DESedeUtil {
         return (byte) "0123456789ABCDEF".indexOf(c);
     }
 
-    public static void main(String[] args) {
-        String src = "{\"name\":\"宋海平\",\"idCode\":\"310228198302262214\",\"month\":\"1\"}";
-        System.out.println(encryptMode(src, "JK568FG2823"));;
-    }
 }