From 00b256f4f7c0a292ebd2e27fed88fb456119d743 Mon Sep 17 00:00:00 2001 From: lyf <1357764963@qq> Date: Tue, 31 Jan 2023 14:56:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pluss-api-page/pom.xml | 1 + .../resources/config/application-common.yml | 4 +- .../classes/config/application-common.yml | 4 +- .../converter/BankCardConverterImpl.java | 2 +- .../platform/converter/ConverterImpl.java | 2 +- .../platform/converter/ImgConverterImpl.java | 2 +- .../MerchantBaseInfoConverterImpl.java | 2 +- .../MerchantCashPlaceConverterImpl.java | 2 +- .../converter/MerchantStaffConverterImpl.java | 2 +- .../converter/UserAppConverterImpl.java | 2 +- pluss-service-bundle/pom.xml | 6 + .../pluss/platform/common/AliyunService.java | 9 ++ .../common/impl/AliyunServiceImpl.java | 106 +++++++++++++++++- .../impl/account/AccountServiceImpl.java | 9 +- .../impl/BaiduFaceDetectServiceImpl.class | Bin 8906 -> 8906 bytes 15 files changed, 134 insertions(+), 19 deletions(-) diff --git a/pluss-api-page/pom.xml b/pluss-api-page/pom.xml index 53e9929..41a443a 100644 --- a/pluss-api-page/pom.xml +++ b/pluss-api-page/pom.xml @@ -101,6 +101,7 @@ swagger-bootstrap-ui 1.9.6 + diff --git a/pluss-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml index fe24dd0..3af5680 100644 --- a/pluss-common-bundle/src/main/resources/config/application-common.yml +++ b/pluss-common-bundle/src/main/resources/config/application-common.yml @@ -20,8 +20,10 @@ aliyun: bucketname: czg-oss callback: ${parameter.domain}/manage/upload/ossCallback bankcard: + #旧地址 https://aliyun-bankcard4-verify.apistore.cn/bank4 bank-url: https://aliyun-bankcard4-verify.apistore.cn/bank4 - app-code: 11cb746de2704f5482a40fd36ed8a1f1 + app-code: 11cb746de2704f5482a40fd36ed2sg6u + SceneId: 3931001 #阿里MQTT参数配置 mqtt: diff --git a/pluss-common-bundle/target/classes/config/application-common.yml b/pluss-common-bundle/target/classes/config/application-common.yml index fe24dd0..3af5680 100644 --- a/pluss-common-bundle/target/classes/config/application-common.yml +++ b/pluss-common-bundle/target/classes/config/application-common.yml @@ -20,8 +20,10 @@ aliyun: bucketname: czg-oss callback: ${parameter.domain}/manage/upload/ossCallback bankcard: + #旧地址 https://aliyun-bankcard4-verify.apistore.cn/bank4 bank-url: https://aliyun-bankcard4-verify.apistore.cn/bank4 - app-code: 11cb746de2704f5482a40fd36ed8a1f1 + app-code: 11cb746de2704f5482a40fd36ed2sg6u + SceneId: 3931001 #阿里MQTT参数配置 mqtt: diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java index e940cd7..fc34447 100644 --- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java +++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java @@ -6,7 +6,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-01-29T10:16:06+0800", + date = "2023-01-30T11:00:04+0800", comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)" ) public class BankCardConverterImpl implements BankCardConverter { diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java index ccdeeba..32b9524 100644 --- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java +++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java @@ -48,7 +48,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-01-29T10:16:06+0800", + date = "2023-01-30T11:00:03+0800", comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)" ) public class ConverterImpl implements Converter { diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java index 92d493e..5237bbf 100644 --- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java +++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java @@ -5,7 +5,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-01-29T10:16:06+0800", + date = "2023-01-30T11:00:03+0800", comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)" ) public class ImgConverterImpl implements ImgConverter { diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java index d024a30..4b2f3cd 100644 --- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java +++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java @@ -11,7 +11,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-01-29T10:16:06+0800", + date = "2023-01-30T11:00:03+0800", comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)" ) public class MerchantBaseInfoConverterImpl implements MerchantBaseInfoConverter { diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java index 96538dd..bf8b200 100644 --- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java +++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java @@ -6,7 +6,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-01-29T10:16:06+0800", + date = "2023-01-30T11:00:04+0800", comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)" ) public class MerchantCashPlaceConverterImpl implements MerchantCashPlaceConverter { diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java index 20f9896..bfcda51 100644 --- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java +++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java @@ -6,7 +6,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-01-29T10:16:06+0800", + date = "2023-01-30T11:00:03+0800", comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)" ) public class MerchantStaffConverterImpl implements MerchantStaffConverter { diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java index 6e15f9b..c3af087 100644 --- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java +++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java @@ -9,7 +9,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-01-29T10:16:06+0800", + date = "2023-01-30T11:00:03+0800", comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)" ) public class UserAppConverterImpl implements UserAppConverter { diff --git a/pluss-service-bundle/pom.xml b/pluss-service-bundle/pom.xml index 458ecdf..14b4f1c 100644 --- a/pluss-service-bundle/pom.xml +++ b/pluss-service-bundle/pom.xml @@ -68,6 +68,12 @@ 1.1.2.RELEASE + + com.aliyun + cloudauth20200618 + 2.0.3 + + \ No newline at end of file diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/AliyunService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/AliyunService.java index 44b1a9e..83130ed 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/AliyunService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/AliyunService.java @@ -18,6 +18,15 @@ public interface AliyunService extends IpLocationService { * @return 校验结果 */ void checkBankCorrect(String phone, String bankCardNo, String certNo, String realName); + /** + * 银行卡四要素（新） + * @param phone 手机号 + * @param bankCardNo 银行卡号 + * @param certNo 身份证号 + * @param realName 姓名 + * @return 校验结果 + */ + void checkBankCorrectNow(String phone, String bankCardNo, String certNo, String realName); /** * 银行卡四要素 diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java index 456ca0b..1f4d51b 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java @@ -10,6 +10,7 @@ import cn.pluss.platform.util.HttpResult; import cn.pluss.platform.util.HttpUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.aliyun.cloudauth20200618.models.VerifyBankElementResponse; import com.aliyuncs.DefaultAcsClient; import com.aliyuncs.IAcsClient; import com.aliyuncs.auth.sts.AssumeRoleRequest; @@ -29,6 +30,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; +import com.aliyun.tea.*; +import com.aliyun.cloudauth20200618.Client; import java.util.*; @@ -49,6 +52,21 @@ public class AliyunServiceImpl implements AliyunService { @Value("${aliyun.bankcard.bank-url}") private String bankCheckUrl; + /** + *场景id + */ + @Value("${aliyun.bankcard.SceneId}") + private Long SceneId; + /** + * 阿里云key + */ + @Value("${aliyun.keyid}") + private String ACCESSKEYID; + /** + * 阿里云secret + */ + @Value("${aliyun.keysecret}") + private String ACCESSKEYSECRET; /** * 不好用 @@ -104,15 +122,23 @@ public class AliyunServiceImpl implements AliyunService { // 调用阿里云银行卡认证接口 Map headers = new HashMap<>(); - headers.put("Authorization", "APPCODE " + appCode); + // headers.put("Authorization", "APPCODE " + appCode); Map querys = new HashMap<>(); querys.put("Mobile", phone); - querys.put("bankcard", bankCardNo); - querys.put("cardNo", certNo); - querys.put("realName", realName); +// querys.put("bankcard", BankCardNo); + //querys.put("cardNo", certNo); +// querys.put("realName", realName); + querys.put("Mode", "VERIFY_BANK_CARD"); + querys.put("OuterOrderNo", appCode); + querys.put("BankCardNo", bankCardNo); + querys.put("IdName", realName); + querys.put("IdNo", certNo); + querys.put("SceneId", SceneId); + HttpResult response = null; try { - response = HttpUtil.doGet(bankCheckUrl, headers, querys); + // response = HttpUtil.doGet(bankCheckUrl, querys); + response = HttpUtil.doGet(bankCheckUrl, headers, querys); log.info(response.toString()); } catch (Exception e) { e.printStackTrace(); @@ -135,7 +161,6 @@ public class AliyunServiceImpl implements AliyunService { log.error("银行卡四要素检查：" + jsonObject.getString("reason")); bank4Cache.setRemark(jsonObject.getString("reason")); bank4Cache.setStatus(Bank4Cache.STATUS_FAIL); - bank4CacheService.save(bank4Cache); throw new MsgException("身份证、银行卡或预留手机号信息不正确"); } else { bank4Cache.setStatus(Bank4Cache.STATUS_PASS); @@ -143,6 +168,8 @@ public class AliyunServiceImpl implements AliyunService { } } + + @Override public void checkBankCorrect(String phone, String bankCardNo, String certNo, String realName, String errorMsg) { try { @@ -194,4 +221,71 @@ public class AliyunServiceImpl implements AliyunService { throw new MsgException("无法获取oss上传凭证"); } } + + public static com.aliyun.cloudauth20200618.Client createClient(String accessKeyId, String accessKeySecret) throws Exception{ + com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config() + // 必填，您的 AccessKey ID + .setAccessKeyId(accessKeyId) + // 必填，您的 AccessKey Secret + .setAccessKeySecret(accessKeySecret); + // 访问的域名 + config.endpoint = "cloudauth.aliyuncs.com"; + return new com.aliyun.cloudauth20200618.Client(config); + } + + @Override + public void checkBankCorrectNow(String phone, String bankCardNo, String certNo, String realName) { + // java.util.List args = java.util.Arrays.asList(args_); + + //com.aliyun.cloudauth20200618.Client client = Sample.createClient("accessKeyId", "accessKeySecret"); + Client client = null; + try { + client = createClient(ACCESSKEYID,ACCESSKEYSECRET); + } catch (Exception e) { + e.printStackTrace(); + } + com.aliyun.cloudauth20200618.models.VerifyBankElementRequest verifyBankElementRequest = new com.aliyun.cloudauth20200618.models.VerifyBankElementRequest() + .setMode("VERIFY_BANK_CARD") + .setBankCardNo(bankCardNo) + .setIdNo(certNo) + .setIdName(realName) + .setMobile(phone) + .setSceneId(SceneId) + .setOuterOrderNo(appCode); + + com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions(); + + try { + // 复制代码运行请自行打印 API 的返回值 + assert client != null; + VerifyBankElementResponse verifyBankElementResponse = client.verifyBankElementWithOptions(verifyBankElementRequest, runtime); + } catch (TeaException error) { + // 如有需要，请打印 error + com.aliyun.teautil.Common.assertAsString(error.message); + throw new MsgException("银行卡认证失败"); + } catch (Exception _error) { + TeaException error = new TeaException(_error.getMessage(), _error); + // 如有需要，请打印 error + com.aliyun.teautil.Common.assertAsString(error.message); + throw new MsgException("银行卡认证失败"); + } + + +// if (200 != response.getCode()) { +// if (403 == response.getCode()) { +// throw new MsgException("银行卡认证接口已欠费，请联系平台"); +// } else { +// throw new MsgException("银行卡认证失败"); +// } +// } +// if (!"0".equalsIgnoreCase(jsonObject.getString("error_code"))) { +// log.error("银行卡四要素检查：" + jsonObject.getString("reason")); +// bank4Cache.setRemark(jsonObject.getString("reason")); +// bank4Cache.setStatus(Bank4Cache.STATUS_FAIL); +// throw new MsgException("身份证、银行卡或预留手机号信息不正确"); +// } else { +// bank4Cache.setStatus(Bank4Cache.STATUS_PASS); +// bank4CacheService.save(bank4Cache); +// } + } } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java index ec44c26..7e9c166 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java @@ -1251,8 +1251,9 @@ public class AccountServiceImpl extends ServiceImpl impl } Notice notice = new Notice(1, 5, userApp); + //TODO 银行卡认证先绕过四要素检测 try { - aliyunService.checkBankCorrect(bankInfoDTO.getPhone(), bankInfoDTO.getBankCardNo(), idCard.getCertNo(), idCard.getCertName()); + aliyunService.checkBankCorrectNow(bankInfoDTO.getPhone(), bankInfoDTO.getBankCardNo(), idCard.getCertNo(), idCard.getCertName()); } catch (MsgException e) { notice = new Notice(1, 5, userApp); notice.setConrtent("很遗憾你的银行卡认证未通过，请您核对信息后重新提交审核！"); @@ -1303,9 +1304,9 @@ public class AccountServiceImpl extends ServiceImpl impl uaService.updateById(userApp); // 调用极光通知推送 - List alias = new ArrayList<>(); - alias.add(userApp.getUserId().toString()); - generalPushUtil.sendAllPlatByAlias(alias, "银行卡认证通知", "审核通过", "1"); +// List alias = new ArrayList<>(); +// alias.add(userApp.getUserId().toString()); +// generalPushUtil.sendAllPlatByAlias(alias, "银行卡认证通知", "审核通过", "1"); } @Override diff --git a/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class b/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class index 71671e7f0634dc96bc30e4c4624462fcca7b190b..203ccb3c68b689bc8921f8248af47a52dd9958b6 100644 GIT binary patch delta 42 ycmX@*ddhW!p}g!21~-OT489C=7{VClG9)m}W5{5b&rraykfDZQ(PlsS8fE|&<_u#1 delta 42 ycmX@*ddhW!p}g#L1~-P8489Dr8NwLmFeEU{WyoNd$56nqfT4zA;buSi8fE|&Mhsg3