From 626ec17b45a246e30f0ab945b5b4a0af54f9ee97 Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Wed, 27 Sep 2023 13:28:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IdentityAuthenticationController.java | 10 ++++ .../src/main/resources/application.yml | 3 +- ruoyi-common/pom.xml | 4 +- .../wisdomarbitrate/domain/CaseAffiliate.java | 21 +++++++++ .../domain/IdentityAuthentication.java | 32 +++++++++++++ .../IdentityAuthenticationService.java | 2 + .../service/impl/CaseEvidenceServiceImpl.java | 2 +- .../IdentityAuthenticationServiceImpl.java | 46 +++++++++++++++++-- 8 files changed, 111 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java index 51fafe0..1824d89 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java @@ -18,6 +18,16 @@ public class IdentityAuthenticationController extends BaseController { @Autowired private IdentityAuthenticationService identityAuthenticationService; + /** + * 查询身份认证EIDtoken + */ + @PostMapping("/selectIdentityAuthenticaEIDtoken") + public AjaxResult selectIdentityAuthenticaEIDtoken() + { + IdentityAuthentication ientityAuthentication = identityAuthenticationService.selectIdentityAuthenticaEIDtoken(); + return success(ientityAuthentication); + } + diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 06fa6f1..f6f6226 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -148,4 +148,5 @@ elegent: cycle: 10 identityAuthentication: credentialSecretId: 123 - credentialSecretKey: 367 \ No newline at end of file + credentialSecretKey: 367 + merchantId: 356 \ No newline at end of file diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 5307193..6d9d0a9 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -141,8 +141,8 @@ com.tencentcloudapi - tencentcloud-sdk-java-ocr - 3.1.701 + tencentcloud-sdk-java-faceid + 3.1.871 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java index 719b699..e7721e9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java @@ -44,6 +44,27 @@ public class CaseAffiliate extends BaseEntity { @Excel(name = "代理人联系地址") private String contactAddressAgent; + /** 送达电子邮件 */ + private String sendEmail; + /** 快递单号 */ + private String trackNum; + + public String getSendEmail() { + return sendEmail; + } + + public void setSendEmail(String sendEmail) { + this.sendEmail = sendEmail; + } + + public String getTrackNum() { + return trackNum; + } + + public void setTrackNum(String trackNum) { + this.trackNum = trackNum; + } + public String getNameAgent() { return nameAgent; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/IdentityAuthentication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/IdentityAuthentication.java index 12a3f85..ce47855 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/IdentityAuthentication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/IdentityAuthentication.java @@ -45,6 +45,38 @@ public class IdentityAuthentication extends BaseEntity { /** 用户账号 */ private String userName; + /** EID商户id */ + private String merchantId; + + /** EidToken */ + private String eidToken; + /** 请求 ID */ + private String requestId; + + public String getMerchantId() { + return merchantId; + } + + public void setMerchantId(String merchantId) { + this.merchantId = merchantId; + } + + public String getEidToken() { + return eidToken; + } + + public void setEidToken(String eidToken) { + this.eidToken = eidToken; + } + + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + public Long getUserId() { return userId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IdentityAuthenticationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IdentityAuthenticationService.java index 06d9b57..9b362a2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IdentityAuthenticationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IdentityAuthenticationService.java @@ -1,6 +1,7 @@ package com.ruoyi.wisdomarbitrate.service; import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; +import com.tencentcloudapi.common.exception.TencentCloudSDKException; public interface IdentityAuthenticationService { @@ -8,4 +9,5 @@ public interface IdentityAuthenticationService { IdentityAuthentication selectIdentityAuthentication(IdentityAuthentication identityAuthentication); + IdentityAuthentication selectIdentityAuthenticaEIDtoken(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java index d9e07a3..546993c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java @@ -109,7 +109,7 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService { caseAttachselect.setAnnexId(caseAttach.getAnnexId()); caseAttachselect.setAnnexName(caseAttach.getAnnexName()); caseAttachselect.setAnnexType(caseAttach.getAnnexType()); - return AjaxResult.success("上传成功",caseAttach); + return AjaxResult.success("上传成功",caseAttachselect); } } catch (IOException e) { e.printStackTrace(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java index 18c508a..5a594e9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java @@ -1,7 +1,9 @@ package com.ruoyi.wisdomarbitrate.service.impl; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; + + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; import com.ruoyi.wisdomarbitrate.mapper.IdentityAuthenticationMapper; @@ -11,9 +13,9 @@ import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.exception.TencentCloudSDKException; import com.tencentcloudapi.common.profile.ClientProfile; import com.tencentcloudapi.common.profile.HttpProfile; -import com.tencentcloudapi.ocr.v20181119.OcrClient; -import com.tencentcloudapi.ocr.v20181119.models.RecognizeTableAccurateOCRRequest; -import com.tencentcloudapi.ocr.v20181119.models.RecognizeTableAccurateOCRResponse; +import com.tencentcloudapi.faceid.v20180301.FaceidClient; +import com.tencentcloudapi.faceid.v20180301.models.GetEidTokenRequest; +import com.tencentcloudapi.faceid.v20180301.models.GetEidTokenResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +34,11 @@ public class IdentityAuthenticationServiceImpl implements IdentityAuthenticatio private String credentialSecretId; @Value("${identityAuthentication.credentialSecretKey}") private String credentialSecretKey; + @Value("${identityAuthentication.merchantId}") + private String merchantId; + +// private static final String SECRET_ID = "AKIDeEf2A8uX1HSainvvnXAc3X9ZlhtyvkMp"; +// private static final String SECRET_KEY = "QjphKo8zkHZigT8j9PVtFPJyfIvO3d6V"; @Autowired private IdentityAuthenticationMapper identityAuthenticationMapper; @@ -53,6 +60,35 @@ public class IdentityAuthenticationServiceImpl implements IdentityAuthenticatio } + @Override + public IdentityAuthentication selectIdentityAuthenticaEIDtoken() { + IdentityAuthentication identityAuthentication = new IdentityAuthentication(); + try{ + // Credential credIdenAuth = new Credential(SECRET_ID, SECRET_KEY); + Credential credIdenAuth = new Credential(credentialSecretId, credentialSecretKey); + HttpProfile httpProfileIdenAuth = new HttpProfile(); + httpProfileIdenAuth.setEndpoint("faceid.tencentcloudapi.com"); + ClientProfile clientProfileIdenAuth = new ClientProfile(); + clientProfileIdenAuth.setHttpProfile(httpProfileIdenAuth); + FaceidClient clientIdenAuth = new FaceidClient(credIdenAuth, "", clientProfileIdenAuth); + // 实例化一个请求对象 + GetEidTokenRequest reqIdenAuth = new GetEidTokenRequest(); + //设置请求参数 + reqIdenAuth.setMerchantId(merchantId); + GetEidTokenResponse respIdenAuth = clientIdenAuth.GetEidToken(reqIdenAuth); + String respJSON = GetEidTokenResponse.toJsonString(respIdenAuth); + JSONObject objJSON = JSON.parseObject(respJSON); + JSONObject objJSONRes = (JSONObject) objJSON.get("Response"); + String eidToken = objJSONRes.getString("EidToken"); + String requestId = objJSONRes.getString("RequestId"); + identityAuthentication.setEidToken(eidToken); + }catch (TencentCloudSDKException e) { + System.out.println(e.toString()); + } + + return identityAuthentication; + + } } -- 2.54.0 From c484a45822ac1e4f0780b1957339e8c09672f1ba Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Wed, 27 Sep 2023 15:17:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AB=8B=E6=A1=88?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IdentityAuthenticationServiceImpl.java | 14 +++++++------- .../mapper/wisdomarbitrate/CaseAttachMapper.xml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java index 5a594e9..08ca024 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/IdentityAuthenticationServiceImpl.java @@ -65,17 +65,17 @@ public class IdentityAuthenticationServiceImpl implements IdentityAuthenticatio IdentityAuthentication identityAuthentication = new IdentityAuthentication(); try{ // Credential credIdenAuth = new Credential(SECRET_ID, SECRET_KEY); - Credential credIdenAuth = new Credential(credentialSecretId, credentialSecretKey); + Credential authenti = new Credential(credentialSecretId, credentialSecretKey); HttpProfile httpProfileIdenAuth = new HttpProfile(); httpProfileIdenAuth.setEndpoint("faceid.tencentcloudapi.com"); - ClientProfile clientProfileIdenAuth = new ClientProfile(); - clientProfileIdenAuth.setHttpProfile(httpProfileIdenAuth); - FaceidClient clientIdenAuth = new FaceidClient(credIdenAuth, "", clientProfileIdenAuth); + ClientProfile clientInv= new ClientProfile(); + clientInv.setHttpProfile(httpProfileIdenAuth); + FaceidClient clientIdenAuth = new FaceidClient(authenti, "", clientInv); // 实例化一个请求对象 - GetEidTokenRequest reqIdenAuth = new GetEidTokenRequest(); + GetEidTokenRequest reqest = new GetEidTokenRequest(); //设置请求参数 - reqIdenAuth.setMerchantId(merchantId); - GetEidTokenResponse respIdenAuth = clientIdenAuth.GetEidToken(reqIdenAuth); + reqest.setMerchantId(merchantId); + GetEidTokenResponse respIdenAuth = clientIdenAuth.GetEidToken(reqest); String respJSON = GetEidTokenResponse.toJsonString(respIdenAuth); JSONObject objJSON = JSON.parseObject(respJSON); JSONObject objJSONRes = (JSONObject) objJSON.get("Response"); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAttachMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAttachMapper.xml index b3e38a0..5b9b821 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAttachMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAttachMapper.xml @@ -46,7 +46,7 @@ update case_attach set case_appli_id= #{caseAppliId} - where annexId = #{annex_id} + where annex_id = #{annexId} -- 2.54.0