From 97c0213731ccf77f1a568af5f436f28fb3288c34 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 20 Apr 2023 23:50:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E5=85=AC=E5=85=B1=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E5=BC=8F=E6=8E=A5=E5=8F=A3=E5=B9=B6=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=8F=98=E9=87=8F=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sms4j/cloopen/service/CloopenSmsImpl.java | 6 +++--- .../sms4j/cloopen/util/CloopenHelper.java | 17 +++++++++-------- .../sms4j/comm/utils/RestApiFunction.java | 6 +++--- 3 files changed, 15 insertions(+), 14 deletions(-) rename sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/util/CloopenRestApiFunction.java => sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/RestApiFunction.java (55%) diff --git a/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java b/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java index a9899bc0..85e9190e 100644 --- a/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java +++ b/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java @@ -25,7 +25,7 @@ import java.util.concurrent.Executor; @Slf4j public class CloopenSmsImpl implements SmsBlend { - private final CloopenRestApi cloopenRestApi; + private final CloopenRestApi restApi; private final CloopenConfig config; @@ -37,7 +37,7 @@ public class CloopenSmsImpl implements SmsBlend { this.config = config; this.pool = pool; this.delayed = delayed; - cloopenRestApi = Forest.client(CloopenRestApi.class); + restApi = Forest.client(CloopenRestApi.class); } @Override @@ -69,7 +69,7 @@ public class CloopenSmsImpl implements SmsBlend { paramMap.put("appId", config.getAppId()); paramMap.put("templateId", templateId); paramMap.put("datas", messages.keySet().stream().map(messages::get).toArray(String[]::new)); - return helper.request(cloopenRestApi::sendSms, paramMap); + return helper.request(restApi::sendSms, paramMap); } @Override diff --git a/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/util/CloopenHelper.java b/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/util/CloopenHelper.java index 4677681f..f6f9926d 100644 --- a/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/util/CloopenHelper.java +++ b/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/util/CloopenHelper.java @@ -11,6 +11,7 @@ import com.dtflys.forest.config.ForestConfiguration; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.cloopen.config.CloopenConfig; import org.dromara.sms4j.comm.exception.SmsBlendException; +import org.dromara.sms4j.comm.utils.RestApiFunction; import java.util.Collections; import java.util.Date; @@ -25,10 +26,10 @@ import java.util.Optional; */ public class CloopenHelper { - private final CloopenConfig cloopenConfig; + private final CloopenConfig config; - public CloopenHelper(CloopenConfig cloopenConfig) { - this.cloopenConfig = cloopenConfig; + public CloopenHelper(CloopenConfig config) { + this.config = config; } /** @@ -39,16 +40,16 @@ public class CloopenHelper { * @param 响应类型 * @return 响应信息 */ - public SmsResponse request(CloopenRestApiFunction, R> restApiFunction, Map paramMap) { + public SmsResponse request(RestApiFunction, R> restApiFunction, Map paramMap) { SmsResponse smsResponse = new SmsResponse(); try { String timestamp = DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN); // 设置全局变量 ForestConfiguration forestConfiguration = Forest.config(); - forestConfiguration.setVariableValue("baseUrl", (method) -> cloopenConfig.getBaseUrl()); - forestConfiguration.setVariableValue("accessKeyId", (method) -> cloopenConfig.getAccessKeyId()); - forestConfiguration.setVariableValue("sign", this.generateSign(cloopenConfig.getAccessKeyId(), cloopenConfig.getAccessKeySecret(), timestamp)); - forestConfiguration.setVariableValue("authorization", this.generateAuthorization(cloopenConfig.getAccessKeyId(), timestamp)); + forestConfiguration.setVariableValue("baseUrl", (method) -> config.getBaseUrl()); + forestConfiguration.setVariableValue("accessKeyId", (method) -> config.getAccessKeyId()); + forestConfiguration.setVariableValue("sign", this.generateSign(config.getAccessKeyId(), config.getAccessKeySecret(), timestamp)); + forestConfiguration.setVariableValue("authorization", this.generateAuthorization(config.getAccessKeyId(), timestamp)); // 调用请求 R response = restApiFunction.apply(paramMap); diff --git a/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/util/CloopenRestApiFunction.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/RestApiFunction.java similarity index 55% rename from sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/util/CloopenRestApiFunction.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/RestApiFunction.java index 6a0366de..8062d842 100644 --- a/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/util/CloopenRestApiFunction.java +++ b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/RestApiFunction.java @@ -1,9 +1,9 @@ -package org.dromara.sms4j.cloopen.util; +package org.dromara.sms4j.comm.utils; import java.io.Serializable; /** - * 容联云 REST API 函数式接口 + * REST API 函数式接口 * * @param

请求参数 * @param 响应 @@ -11,6 +11,6 @@ import java.io.Serializable; * @since 2023/4/17 20:57 */ @FunctionalInterface -public interface CloopenRestApiFunction extends Serializable { +public interface RestApiFunction extends Serializable { R apply(P param); }