From aa6fd3986a72524dea1547f2b1cce85ea71228bd Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 19 Oct 2023 17:16:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-pwd/src/main/java/cn/gistack/pwd/feign/PwdClient.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-pwd/src/main/java/cn/gistack/pwd/feign/PwdClient.java b/skjcmanager/skjcmanager-service/skjcmanager-pwd/src/main/java/cn/gistack/pwd/feign/PwdClient.java
index b848287..2758cae 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-pwd/src/main/java/cn/gistack/pwd/feign/PwdClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-pwd/src/main/java/cn/gistack/pwd/feign/PwdClient.java
@@ -2,8 +2,10 @@
import cn.gistack.pwd.dto.CBCResultDTO;
import cn.gistack.pwd.dto.ResultDTO;
+import cn.gistack.pwd.entity.VerifyOutput;
import cn.gistack.pwd.fegin.IPwdClient;
import cn.gistack.pwd.service.IPwdSendService;
+import cn.gistack.pwd.service.IVerifyOutputService;
import lombok.AllArgsConstructor;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
@@ -24,10 +26,16 @@
public class PwdClient implements IPwdClient {
private final IPwdSendService pwdSendService;
+ private final IVerifyOutputService verifyOutputService;
@Override
public R<CBCResultDTO> getCBCMacEncipher(String message) {
return R.data(pwdSendService.getCBCMacEncipher(message));
+ }
+
+ @Override
+ public R<CBCResultDTO> getCBCMacEncipherVerify(String sm4Iv, String keyIndex, String message) {
+ return R.data(pwdSendService.getCBCMacEncipher(sm4Iv, keyIndex, message));
}
@Override
@@ -41,4 +49,10 @@
public R<ResultDTO> getDecrypt(String sm4Iv, String keyIndex, String message) {
return R.data(pwdSendService.getDecrypt(sm4Iv,keyIndex,message));
}
+
+ @Override
+ @PostMapping(VERIFY)
+ public R verify(String maced, String sm4Iv, String keyIndex, String message, String dataId, String source) {
+ return R.data(verifyOutputService.verifyMaced(maced,sm4Iv,keyIndex,dataId,source,message));
+ }
}
--
Gitblit v1.9.3