From c0df22962313ea3cdbdd86201ae5a838f08f06b8 Mon Sep 17 00:00:00 2001 From: yanglin Date: Thu, 13 Feb 2025 16:57:12 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanopart/ess/server/ess/EssClient.java | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java index 46ff6584..f0299533 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java @@ -73,7 +73,7 @@ import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static cn.axzo.nanopart.ess.server.ess.EssClient.Invocation.invocation; +import static cn.axzo.nanopart.ess.server.ess.EssClient.Invocation.func; import static java.util.function.Function.identity; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; @@ -112,14 +112,14 @@ public class EssClient implements InitializingBean { request.setProxyOperatorName(personProfile.getRealName()); request.setProxyOperatorMobile(personProfile.getPhone()); } - CreateConsoleLoginUrlResponse response = exec(invocation() + CreateConsoleLoginUrlResponse response = exec(func() .context("CreateConsoleLoginUrl") .subject(IdBuilder.builder() .append(person.getOuId()) .append(person.getPersonId()) .build()) .request(request) - .func(() -> manage.CreateConsoleLoginUrl(request))); + .command(() -> manage.CreateConsoleLoginUrl(request))); return response.getConsoleUrl(); } @@ -131,11 +131,11 @@ public class EssClient implements InitializingBean { request.setBusinessId(businessId); request.setEmbedType(embedType.getEssCode()); request.setHiddenComponents(true); - ChannelCreateEmbedWebUrlResponse response = exec(invocation() + ChannelCreateEmbedWebUrlResponse response = exec(func() .context("ChannelCreateEmbedWebUrl") .subject(businessId == null ? embedType.name() : businessId) .request(request) - .func(() -> manage.ChannelCreateEmbedWebUrl(request))); + .command(() -> manage.ChannelCreateEmbedWebUrl(request))); return response.getWebUrl(); } @@ -146,14 +146,14 @@ public class EssClient implements InitializingBean { request.setUserIds(new String[]{ PersonOpenId.create(sealPerson.getOuId(), sealPerson.getPersonId()).toOpenId() }); - exec(invocation() + exec(func() .context("ChannelCreateSealPolicy") .subject(IdBuilder.builder() .append(seal.getEssSealId()) .append(sealPerson.getPersonId()) .build()) .request(request) - .func(() -> manage.ChannelCreateSealPolicy(request))); + .command(() -> manage.ChannelCreateSealPolicy(request))); } public void removeSealAuthorization(EssPerson superAdmin, EssSeal seal, EssSealPerson sealPerson) { @@ -163,14 +163,14 @@ public class EssClient implements InitializingBean { request.setUserIds(new String[]{ PersonOpenId.create(sealPerson.getOuId(), sealPerson.getPersonId()).toOpenId() }); - exec(invocation() + exec(func() .context("ChannelDeleteSealPolicies") .subject(IdBuilder.builder() .append(seal.getEssSealId()) .append(sealPerson.getPersonId()) .build()) .request(request) - .func(() -> manage.ChannelDeleteSealPolicies(request))); + .command(() -> manage.ChannelDeleteSealPolicies(request))); } List uploadFile(EssPerson superAdmin, @@ -186,12 +186,12 @@ public class EssClient implements InitializingBean { request.setAgent(agent(superAdmin)); request.setFileInfos(files.toArray(new UploadFile[0])); request.setBusinessType(businessType.name()); - UploadFilesResponse response = call(Invocation.invocation() + UploadFilesResponse response = call(Invocation.func() .context("UploadFiles") .subject("") .subject2(r -> r.getFileIds()[0]) .request(request) - .func(() -> file.UploadFiles(request))); + .command(() -> file.UploadFiles(request))); return Arrays.asList(response.getFileIds()); } @@ -242,12 +242,12 @@ public class EssClient implements InitializingBean { request.setFlowApprovers(approvers.toArray(new FlowApproverInfo[0])); request.setUnordered(!contractInfo.isSignOrdered()); request.setCustomerData(customerData); - ChannelCreateFlowByFilesResponse response = call(Invocation.invocation() + ChannelCreateFlowByFilesResponse response = call(Invocation.func() .context("ChannelCreateFlowByFiles") .subject(contractInfo.getContractName()) .subject2(ChannelCreateFlowByFilesResponse::getFlowId) .request(request) - .func(() -> manage.ChannelCreateFlowByFiles(request))); + .command(() -> manage.ChannelCreateFlowByFiles(request))); return response.getFlowId(); } @@ -255,11 +255,11 @@ public class EssClient implements InitializingBean { DescribeResourceUrlsByFlowsRequest request = new DescribeResourceUrlsByFlowsRequest(); request.setAgent(agent(superAdmin)); request.setFlowIds(new String[]{essContractId}); - DescribeResourceUrlsByFlowsResponse response = exec(invocation() + DescribeResourceUrlsByFlowsResponse response = exec(func() .context("DescribeResourceUrlsByFlows") .subject(essContractId) .request(request) - .func(() -> manage.DescribeResourceUrlsByFlows(request))); + .command(() -> manage.DescribeResourceUrlsByFlows(request))); return response.getFlowResourceUrlInfos()[0].getResourceUrlInfos()[0].getUrl(); } @@ -268,11 +268,11 @@ public class EssClient implements InitializingBean { request.setAgent(agent(signPerson)); request.setFlowIds(new String[]{essContractId}); request.setOpenId(PersonOpenId.create(signPerson.getOuId(), signPerson.getPersonId()).toOpenId()); - ChannelCreateOrganizationBatchSignUrlResponse response = exec(invocation() + ChannelCreateOrganizationBatchSignUrlResponse response = exec(func() .context("ChannelCreateOrganizationBatchSignUrl") .subject(essContractId) .request(request) - .func(() -> manage.ChannelCreateOrganizationBatchSignUrl(request))); + .command(() -> manage.ChannelCreateOrganizationBatchSignUrl(request))); return response.getSignUrl(); } @@ -281,11 +281,11 @@ public class EssClient implements InitializingBean { request.setAgent(agent(signPerson)); request.setFlowIds(new String[]{essContractId}); request.setOpenId(PersonOpenId.create(signPerson.getOuId(), signPerson.getPersonId()).toOpenId()); - CreateSignUrlsResponse response = exec(invocation() + CreateSignUrlsResponse response = exec(func() .context("CreateSignUrls") .subject(essContractId) .request(request) - .func(() -> manage.CreateSignUrls(request))); + .command(() -> manage.CreateSignUrls(request))); return response.getSignUrlInfos()[0].getSignUrl(); } @@ -294,11 +294,11 @@ public class EssClient implements InitializingBean { request.setAgent(agent(superAdmin)); request.setOffset(offset); request.setLimit(20L); - return exec(invocation() + return exec(func() .context("ChannelDescribeEmployees") .subject(org.getOuId() + "") .request(request) - .func(() -> manage.ChannelDescribeEmployees(request))); + .command(() -> manage.ChannelDescribeEmployees(request))); } private Agent agent(EssPerson person) { @@ -349,7 +349,7 @@ public class EssClient implements InitializingBean { TencentCloudSDKException exception = null; try { //noinspection unchecked - response = (T) invocation.func.exec(); + response = (T) invocation.command.exec(); essLog.addLogContent("essResponse", response); if (invocation.subject2 != null) { String newSubject = invocation.subject2.apply(response); @@ -387,11 +387,11 @@ public class EssClient implements InitializingBean { request.setAgent(agent(creator)); request.setFlowId(essContractId); request.setCancelMessage(reason); - exec(invocation() + exec(func() .context("ChannelCancelFlow") .subject(essContractId) .request(request) - .func(() -> manage.ChannelCancelFlow(request))); + .command(() -> manage.ChannelCancelFlow(request))); } public enum UploadFileBusinessType { @@ -404,9 +404,9 @@ public class EssClient implements InitializingBean { final String subject; final Function subject2; final Object request; - final TencentCloudFunc func; + final TencentCloudFunc command; - public static InvocationBuilder invocation() { + public static InvocationBuilder func() { return Invocation.builder(); }