+ sms4j-emay
+ sms4j-emay
+
- kim.wind
- sms-aggregation-comm
+ org.dromara.sms4j
+ sms4j-comm
+
- kim.wind
- sms-aggregation-api
+ org.dromara.sms4j
+ sms4j-api
-
-
diff --git a/sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmayConfig.java b/sms4j-emay/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java
similarity index 84%
rename from sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmayConfig.java
rename to sms4j-emay/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java
index a2b27ed4..513daf53 100644
--- a/sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmayConfig.java
+++ b/sms4j-emay/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java
@@ -1,17 +1,17 @@
-package kim.wind.emay.config;
-
-import lombok.Data;
-
-/**
- * @author Richard
- * @date 2023-04-11 12:00
- */
-@Data
-public class EmayConfig {
- /** appKey*/
- private String appId ;
- /** appSecret */
- private String secretKey ;
- /** APP接入地址*/
- private String requestUrl;
-}
+package org.dromara.sms4j.emay.config;
+
+import lombok.Data;
+
+/**
+ * @author Richard
+ * @date 2023-04-11 12:00
+ */
+@Data
+public class EmayConfig {
+ /** appKey*/
+ private String appId ;
+ /** appSecret */
+ private String secretKey ;
+ /** APP接入地址*/
+ private String requestUrl;
+}
diff --git a/sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmaySmsConfig.java b/sms4j-emay/src/main/java/org/dromara/sms4j/emay/config/EmaySmsConfig.java
similarity index 85%
rename from sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmaySmsConfig.java
rename to sms4j-emay/src/main/java/org/dromara/sms4j/emay/config/EmaySmsConfig.java
index 5e3b065f..d9c7db2e 100644
--- a/sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmaySmsConfig.java
+++ b/sms4j-emay/src/main/java/org/dromara/sms4j/emay/config/EmaySmsConfig.java
@@ -1,40 +1,40 @@
-package kim.wind.emay.config;
-
-import kim.wind.emay.service.EmaySmsImpl;
-import org.dromara.sms.comm.factory.BeanFactory;
-
-/**
- * EmaySmsConfig
- * Emay短信对象建造
- *
- * @author Richard
- * @date 2023/04/11 12:00
- * */
-public class EmaySmsConfig {
- private static EmaySmsImpl emaySms;
- private static EmaySmsConfig emaySmsConfig;
-
- private EmaySmsConfig() {
- }
-
- /** 建造一个亿美软通短信实现*/
- public static EmaySmsImpl createEmaySms(EmayConfig emayConfig) {
- if (emaySmsConfig == null){
- emaySmsConfig = new EmaySmsConfig();
- }
- if (emaySms == null){
- emaySms = new EmaySmsImpl(emayConfig, BeanFactory.getExecutor(),BeanFactory.getDelayedTime());
- }
- return emaySms;
- }
-
- /** 刷新对象*/
- public static EmaySmsImpl refresh(EmayConfig emayConfig){
- if (emaySmsConfig == null){
- emaySmsConfig = new EmaySmsConfig();
- }
- emaySms = new EmaySmsImpl(emayConfig, BeanFactory.getExecutor(),BeanFactory.getDelayedTime());
- return emaySms;
- }
-
-}
+package org.dromara.sms4j.emay.config;
+
+import org.dromara.sms4j.emay.service.EmaySmsImpl;
+import org.dromara.sms4j.comm.factory.BeanFactory;
+
+/**
+ * EmaySmsConfig
+ *
Emay短信对象建造
+ *
+ * @author Richard
+ * @date 2023/04/11 12:00
+ * */
+public class EmaySmsConfig {
+ private static EmaySmsImpl emaySms;
+ private static EmaySmsConfig emaySmsConfig;
+
+ private EmaySmsConfig() {
+ }
+
+ /** 建造一个亿美软通短信实现*/
+ public static EmaySmsImpl createEmaySms(EmayConfig emayConfig) {
+ if (emaySmsConfig == null){
+ emaySmsConfig = new EmaySmsConfig();
+ }
+ if (emaySms == null){
+ emaySms = new EmaySmsImpl(emayConfig, BeanFactory.getExecutor(),BeanFactory.getDelayedTime());
+ }
+ return emaySms;
+ }
+
+ /** 刷新对象*/
+ public static EmaySmsImpl refresh(EmayConfig emayConfig){
+ if (emaySmsConfig == null){
+ emaySmsConfig = new EmaySmsConfig();
+ }
+ emaySms = new EmaySmsImpl(emayConfig, BeanFactory.getExecutor(),BeanFactory.getDelayedTime());
+ return emaySms;
+ }
+
+}
diff --git a/sms-aggregation-emay/src/main/java/kim/wind/emay/service/EmaySmsImpl.java b/sms4j-emay/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java
similarity index 89%
rename from sms-aggregation-emay/src/main/java/kim/wind/emay/service/EmaySmsImpl.java
rename to sms4j-emay/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java
index d925233e..920d4a73 100644
--- a/sms-aggregation-emay/src/main/java/kim/wind/emay/service/EmaySmsImpl.java
+++ b/sms4j-emay/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java
@@ -1,193 +1,193 @@
-package kim.wind.emay.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.dtflys.forest.config.ForestConfiguration;
-import kim.wind.emay.config.EmayConfig;
-import kim.wind.emay.util.EmayBuilder;
-import lombok.extern.slf4j.Slf4j;
-import org.dromara.sms.api.SmsBlend;
-import org.dromara.sms.api.callback.CallBack;
-import org.dromara.sms.api.entity.SmsResponse;
-import org.dromara.sms.comm.annotation.Restricted;
-import org.dromara.sms.comm.delayedTime.DelayedTime;
-import org.dromara.sms.comm.exception.SmsBlendException;
-import org.dromara.sms.comm.factory.BeanFactory;
-
-import java.util.*;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.dromara.sms.comm.utils.SmsUtil.listToString;
-
-/**
- * @author Richard
- * @date 2023-04-11 12:00
- */
-@Slf4j
-public class EmaySmsImpl implements SmsBlend {
- public EmaySmsImpl(EmayConfig config, Executor pool, DelayedTime delayed) {
- this.config = config;
- this.pool = pool;
- this.delayed = delayed;
- }
-
- private EmayConfig config;
-
- private Executor pool;
-
- private DelayedTime delayed;
-
- private final ForestConfiguration http = BeanFactory.getForestConfiguration();
-
- @Override
- @Restricted
- public SmsResponse sendMessage(String phone, String message) {
- String url = config.getRequestUrl();
- Map params;
- try {
- params = EmayBuilder.buildRequestBody(config.getAppId(), config.getSecretKey(), phone, message);
- } catch (SmsBlendException e) {
- SmsResponse smsResponse = new SmsResponse();
- smsResponse.setErrMessage(e.getMessage());
- return smsResponse;
- }
- return getSendResponse(params, url);
- }
-
- @Override
- @Restricted
- public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) {
- List list = new ArrayList<>();
- for (Map.Entry entry : messages.entrySet()) {
- list.add(entry.getValue());
- }
- return sendMessage(phone, EmayBuilder.listToString(list));
- }
-
- @Override
- @Restricted
- public SmsResponse massTexting(List phones, String message) {
- if (phones.size() > 500) {
- throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500");
- }
- return sendMessage(listToString(phones), message);
- }
-
- @Override
- @Restricted
- public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) {
- if (phones.size() > 500) {
- throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500");
- }
- List list = new ArrayList<>();
- for (Map.Entry entry : messages.entrySet()) {
- list.add(entry.getValue());
- }
- return sendMessage(listToString(phones), EmayBuilder.listToString(list));
- }
-
- @Override
- @Restricted
- public void sendMessageAsync(String phone, String message, CallBack callBack) {
- pool.execute(() -> {
- SmsResponse smsResponse = sendMessage(phone, message);
- callBack.callBack(smsResponse);
- });
- }
-
- @Override
- @Restricted
- public void sendMessageAsync(String phone, String message) {
- pool.execute(() -> sendMessage(phone, message));
- }
-
- @Override
- @Restricted
- public void sendMessageAsync(String phone, String templateId, LinkedHashMap messages, CallBack callBack) {
- pool.execute(() -> {
- SmsResponse smsResponse = sendMessage(phone, templateId, messages);
- callBack.callBack(smsResponse);
- });
- }
-
- @Override
- @Restricted
- public void sendMessageAsync(String phone, String templateId, LinkedHashMap messages) {
- pool.execute(() -> sendMessage(phone, templateId, messages));
- }
-
- @Override
- @Restricted
- public void delayedMessage(String phone, String message, Long delayedTime) {
- this.delayed.schedule(new TimerTask() {
- @Override
- public void run() {
- sendMessage(phone, message);
- }
- }, delayedTime);
- }
-
- @Override
- @Restricted
- public void delayedMessage(String phone, String templateId, LinkedHashMap messages, Long delayedTime) {
- this.delayed.schedule(new TimerTask() {
- @Override
- public void run() {
- sendMessage(phone, templateId, messages);
- }
- }, delayedTime);
- }
-
- @Override
- @Restricted
- public void delayMassTexting(List phones, String message, Long delayedTime) {
- this.delayed.schedule(new TimerTask() {
- @Override
- public void run() {
- massTexting(phones, message);
- }
- }, delayedTime);
- }
-
- @Override
- @Restricted
- public void delayMassTexting(List phones, String templateId, LinkedHashMap messages, Long delayedTime) {
- this.delayed.schedule(new TimerTask() {
- @Override
- public void run() {
- massTexting(phones, templateId, messages);
- }
- }, delayedTime);
- }
-
- private SmsResponse getSendResponse(Map body, String requestUrl) {
- AtomicReference smsResponse = new AtomicReference<>();
- http.post(requestUrl)
- .addBody(body)
- .onSuccess(((data, req, res) -> {
- JSONObject jsonBody = res.get(JSONObject.class);
- smsResponse.set(getSmsResponse(jsonBody));
- }))
- .onError((ex, req, res) -> {
- JSONObject jsonBody = res.get(JSONObject.class);
- smsResponse.set(getSmsResponse(jsonBody));
- })
- .execute();
-
- return smsResponse.get();
- }
-
-
- private static SmsResponse getSmsResponse(JSONObject execute) {
- SmsResponse smsResponse = new SmsResponse();
- String code = execute.getString("code");
- smsResponse.setCode(code);
- if ("success".equalsIgnoreCase(code)) {
- JSONObject data = execute.getJSONObject("data");
- String smsId = data.getString("smsId");
- smsResponse.setBizId(smsId);
- }
- smsResponse.setData(execute);
- return smsResponse;
- }
-}
+package org.dromara.sms4j.emay.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.dtflys.forest.config.ForestConfiguration;
+import org.dromara.sms4j.emay.config.EmayConfig;
+import org.dromara.sms4j.emay.util.EmayBuilder;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.callback.CallBack;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.comm.annotation.Restricted;
+import org.dromara.sms4j.comm.delayedTime.DelayedTime;
+import org.dromara.sms4j.comm.exception.SmsBlendException;
+import org.dromara.sms4j.comm.factory.BeanFactory;
+
+import java.util.*;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.dromara.sms4j.comm.utils.SmsUtil.listToString;
+
+/**
+ * @author Richard
+ * @date 2023-04-11 12:00
+ */
+@Slf4j
+public class EmaySmsImpl implements SmsBlend {
+ public EmaySmsImpl(EmayConfig config, Executor pool, DelayedTime delayed) {
+ this.config = config;
+ this.pool = pool;
+ this.delayed = delayed;
+ }
+
+ private EmayConfig config;
+
+ private Executor pool;
+
+ private DelayedTime delayed;
+
+ private final ForestConfiguration http = BeanFactory.getForestConfiguration();
+
+ @Override
+ @Restricted
+ public SmsResponse sendMessage(String phone, String message) {
+ String url = config.getRequestUrl();
+ Map params;
+ try {
+ params = EmayBuilder.buildRequestBody(config.getAppId(), config.getSecretKey(), phone, message);
+ } catch (SmsBlendException e) {
+ SmsResponse smsResponse = new SmsResponse();
+ smsResponse.setErrMessage(e.getMessage());
+ return smsResponse;
+ }
+ return getSendResponse(params, url);
+ }
+
+ @Override
+ @Restricted
+ public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) {
+ List list = new ArrayList<>();
+ for (Map.Entry entry : messages.entrySet()) {
+ list.add(entry.getValue());
+ }
+ return sendMessage(phone, EmayBuilder.listToString(list));
+ }
+
+ @Override
+ @Restricted
+ public SmsResponse massTexting(List phones, String message) {
+ if (phones.size() > 500) {
+ throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500");
+ }
+ return sendMessage(listToString(phones), message);
+ }
+
+ @Override
+ @Restricted
+ public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) {
+ if (phones.size() > 500) {
+ throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500");
+ }
+ List list = new ArrayList<>();
+ for (Map.Entry entry : messages.entrySet()) {
+ list.add(entry.getValue());
+ }
+ return sendMessage(listToString(phones), EmayBuilder.listToString(list));
+ }
+
+ @Override
+ @Restricted
+ public void sendMessageAsync(String phone, String message, CallBack callBack) {
+ pool.execute(() -> {
+ SmsResponse smsResponse = sendMessage(phone, message);
+ callBack.callBack(smsResponse);
+ });
+ }
+
+ @Override
+ @Restricted
+ public void sendMessageAsync(String phone, String message) {
+ pool.execute(() -> sendMessage(phone, message));
+ }
+
+ @Override
+ @Restricted
+ public void sendMessageAsync(String phone, String templateId, LinkedHashMap messages, CallBack callBack) {
+ pool.execute(() -> {
+ SmsResponse smsResponse = sendMessage(phone, templateId, messages);
+ callBack.callBack(smsResponse);
+ });
+ }
+
+ @Override
+ @Restricted
+ public void sendMessageAsync(String phone, String templateId, LinkedHashMap messages) {
+ pool.execute(() -> sendMessage(phone, templateId, messages));
+ }
+
+ @Override
+ @Restricted
+ public void delayedMessage(String phone, String message, Long delayedTime) {
+ this.delayed.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ sendMessage(phone, message);
+ }
+ }, delayedTime);
+ }
+
+ @Override
+ @Restricted
+ public void delayedMessage(String phone, String templateId, LinkedHashMap messages, Long delayedTime) {
+ this.delayed.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ sendMessage(phone, templateId, messages);
+ }
+ }, delayedTime);
+ }
+
+ @Override
+ @Restricted
+ public void delayMassTexting(List phones, String message, Long delayedTime) {
+ this.delayed.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ massTexting(phones, message);
+ }
+ }, delayedTime);
+ }
+
+ @Override
+ @Restricted
+ public void delayMassTexting(List phones, String templateId, LinkedHashMap messages, Long delayedTime) {
+ this.delayed.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ massTexting(phones, templateId, messages);
+ }
+ }, delayedTime);
+ }
+
+ private SmsResponse getSendResponse(Map body, String requestUrl) {
+ AtomicReference smsResponse = new AtomicReference<>();
+ http.post(requestUrl)
+ .addBody(body)
+ .onSuccess(((data, req, res) -> {
+ JSONObject jsonBody = res.get(JSONObject.class);
+ smsResponse.set(getSmsResponse(jsonBody));
+ }))
+ .onError((ex, req, res) -> {
+ JSONObject jsonBody = res.get(JSONObject.class);
+ smsResponse.set(getSmsResponse(jsonBody));
+ })
+ .execute();
+
+ return smsResponse.get();
+ }
+
+
+ private static SmsResponse getSmsResponse(JSONObject execute) {
+ SmsResponse smsResponse = new SmsResponse();
+ String code = execute.getString("code");
+ smsResponse.setCode(code);
+ if ("success".equalsIgnoreCase(code)) {
+ JSONObject data = execute.getJSONObject("data");
+ String smsId = data.getString("smsId");
+ smsResponse.setBizId(smsId);
+ }
+ smsResponse.setData(execute);
+ return smsResponse;
+ }
+}
diff --git a/sms-aggregation-emay/src/main/java/kim/wind/emay/util/EmayBuilder.java b/sms4j-emay/src/main/java/org/dromara/sms4j/emay/util/EmayBuilder.java
similarity index 94%
rename from sms-aggregation-emay/src/main/java/kim/wind/emay/util/EmayBuilder.java
rename to sms4j-emay/src/main/java/org/dromara/sms4j/emay/util/EmayBuilder.java
index ae49bb8e..78b342dc 100644
--- a/sms-aggregation-emay/src/main/java/kim/wind/emay/util/EmayBuilder.java
+++ b/sms4j-emay/src/main/java/org/dromara/sms4j/emay/util/EmayBuilder.java
@@ -1,77 +1,77 @@
-package kim.wind.emay.util;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.crypto.SecureUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.dromara.sms.comm.exception.SmsBlendException;
-
-import java.net.URLEncoder;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Richard
- * @version 1.0
- * @date 2023/4/11 15:11
- */
-@Slf4j
-public class EmayBuilder {
-
-
- public static Map buildRequestBody(String appId, String secretKey, String phone,
- String message) throws SmsBlendException {
- return getParamsMap(appId, secretKey, phone, message);
- }
-
-
- /**
- * @param appId 用户Appid(必填)
- * @param secretKey 加密key
- * @param phone
- * @param message
- * @param customSmsId 自定义消息ID(选填) 最长64位
- * @return
- * @throws SmsBlendException
- */
- public static Map buildRequestBody(String appId, String secretKey, String phone,
- String message, String customSmsId) throws SmsBlendException {
- Map params = getParamsMap(appId, secretKey, phone, message);
- params.put("customSmsId", customSmsId);
- return params;
- }
-
- private static Map getParamsMap(String appId, String secretKey, String phone, String message) {
- Map params = new HashMap<>();
- // 时间戳(必填) 格式：yyyyMMddHHmmss
- String timestamp = DateUtil.format(new Date(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
- String sign = SecureUtil.md5(appId + secretKey + timestamp);
- params.put("appId", appId);
- params.put("timestamp", timestamp);
- params.put("sign", sign);
- params.put("mobiles", phone);
- try {
- params.put("content", URLEncoder.encode(message, "utf-8"));
- } catch (Exception e) {
- log.error("EmaySmsImpl urlEncode content error", e);
- throw new SmsBlendException(e.getMessage());
- }
- return params;
- }
-
- public static String listToString(List list) {
- StringBuilder stringBuffer = new StringBuilder();
- stringBuffer.append("[\"");
- for (String s : list) {
- stringBuffer.append(s);
- stringBuffer.append("\"");
- stringBuffer.append(",");
- }
- stringBuffer.deleteCharAt(stringBuffer.length() - 1);
- stringBuffer.append("]");
- return stringBuffer.toString();
- }
-
-}
+package org.dromara.sms4j.emay.util;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.crypto.SecureUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.sms4j.comm.exception.SmsBlendException;
+
+import java.net.URLEncoder;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Richard
+ * @version 1.0
+ * @date 2023/4/11 15:11
+ */
+@Slf4j
+public class EmayBuilder {
+
+
+ public static Map buildRequestBody(String appId, String secretKey, String phone,
+ String message) throws SmsBlendException {
+ return getParamsMap(appId, secretKey, phone, message);
+ }
+
+
+ /**
+ * @param appId 用户Appid(必填)
+ * @param secretKey 加密key
+ * @param phone
+ * @param message
+ * @param customSmsId 自定义消息ID(选填) 最长64位
+ * @return
+ * @throws SmsBlendException
+ */
+ public static Map buildRequestBody(String appId, String secretKey, String phone,
+ String message, String customSmsId) throws SmsBlendException {
+ Map params = getParamsMap(appId, secretKey, phone, message);
+ params.put("customSmsId", customSmsId);
+ return params;
+ }
+
+ private static Map getParamsMap(String appId, String secretKey, String phone, String message) {
+ Map params = new HashMap<>();
+ // 时间戳(必填) 格式：yyyyMMddHHmmss
+ String timestamp = DateUtil.format(new Date(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+ String sign = SecureUtil.md5(appId + secretKey + timestamp);
+ params.put("appId", appId);
+ params.put("timestamp", timestamp);
+ params.put("sign", sign);
+ params.put("mobiles", phone);
+ try {
+ params.put("content", URLEncoder.encode(message, "utf-8"));
+ } catch (Exception e) {
+ log.error("EmaySmsImpl urlEncode content error", e);
+ throw new SmsBlendException(e.getMessage());
+ }
+ return params;
+ }
+
+ public static String listToString(List list) {
+ StringBuilder stringBuffer = new StringBuilder();
+ stringBuffer.append("[\"");
+ for (String s : list) {
+ stringBuffer.append(s);
+ stringBuffer.append("\"");
+ stringBuffer.append(",");
+ }
+ stringBuffer.deleteCharAt(stringBuffer.length() - 1);
+ stringBuffer.append("]");
+ return stringBuffer.toString();
+ }
+
+}
diff --git a/sms-aggregation-emay/src/main/resources/application.properties b/sms4j-emay/src/main/resources/application.properties
similarity index 100%
rename from sms-aggregation-emay/src/main/resources/application.properties
rename to sms4j-emay/src/main/resources/application.properties
diff --git a/sms-aggregation-huawei/.flattened-pom.xml b/sms4j-huawei/.flattened-pom.xml
similarity index 67%
rename from sms-aggregation-huawei/.flattened-pom.xml
rename to sms4j-huawei/.flattened-pom.xml
index 6603f9bb..60e871da 100644
--- a/sms-aggregation-huawei/.flattened-pom.xml
+++ b/sms4j-huawei/.flattened-pom.xml
@@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4.0.0
- kim.wind
+ org.dromara.sms4j
sms_aggregation
1.0.5
- kim.wind
- sms-aggregation-huawei
+ org.dromara.sms4j
+ sms4j-huawei
1.0.5
- sms-aggregation-huawei
- sms-aggregation-huawei
+ sms4j-huawei
+ sms4j-huawei
Apache 2
@@ -22,12 +22,12 @@
- kim.wind
- sms-aggregation-comm
+ org.dromara.sms4j
+ sms4j-comm
- kim.wind
- sms-aggregation-api
+ org.dromara.sms4j
+ sms4j-api
diff --git a/sms-aggregation-huawei/.mvn/wrapper/maven-wrapper.jar b/sms4j-huawei/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from sms-aggregation-huawei/.mvn/wrapper/maven-wrapper.jar
rename to sms4j-huawei/.mvn/wrapper/maven-wrapper.jar
diff --git a/sms-aggregation-huawei/.mvn/wrapper/maven-wrapper.properties b/sms4j-huawei/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from sms-aggregation-huawei/.mvn/wrapper/maven-wrapper.properties
rename to sms4j-huawei/.mvn/wrapper/maven-wrapper.properties
diff --git a/sms-aggregation-emay/pom.xml b/sms4j-huawei/pom.xml
similarity index 64%
rename from sms-aggregation-emay/pom.xml
rename to sms4j-huawei/pom.xml
index 0228d4aa..5b57f8ef 100644
--- a/sms-aggregation-emay/pom.xml
+++ b/sms4j-huawei/pom.xml
@@ -3,35 +3,32 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- kim.wind
+ org.dromara.sms4j
sms_aggregation
${revision}
../pom.xml
- sms-aggregation-emay
+
+ sms4j-huawei
${revision}
- sms-aggregation-emay
- sms-aggregation-emay
+ sms4j-huawei
+ sms4j-huawei
-
-
- kim.wind
- sms-aggregation-comm
+ org.dromara.sms4j
+ sms4j-comm
- kim.wind
- sms-aggregation-api
+ org.dromara.sms4j
+ sms4j-api
-
-
diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiConfig.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java
similarity index 91%
rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiConfig.java
rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java
index 4963e4ea..aaed40a7 100644
--- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiConfig.java
+++ b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java
@@ -1,4 +1,4 @@
-package org.dromara.sms.huawei.config;
+package org.dromara.sms4j.huawei.config;
import lombok.Data;
diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiSmsConfig.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiSmsConfig.java
similarity index 87%
rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiSmsConfig.java
rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiSmsConfig.java
index fb9b1b29..3aed8b40 100644
--- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiSmsConfig.java
+++ b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiSmsConfig.java
@@ -1,6 +1,6 @@
-package org.dromara.sms.huawei.config;
-import org.dromara.sms.comm.factory.BeanFactory;
-import org.dromara.sms.huawei.service.HuaweiSmsImpl;
+package org.dromara.sms4j.huawei.config;
+import org.dromara.sms4j.comm.factory.BeanFactory;
+import org.dromara.sms4j.huawei.service.HuaweiSmsImpl;
/**
* HuaweiSmsConfig
diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiError.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiError.java
similarity index 97%
rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiError.java
rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiError.java
index 135c5cf1..58e12a06 100644
--- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiError.java
+++ b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiError.java
@@ -1,4 +1,4 @@
-package org.dromara.sms.huawei.entity;
+package org.dromara.sms4j.huawei.entity;
/**
* HuaweiError
diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiResponse.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiResponse.java
similarity index 92%
rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiResponse.java
rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiResponse.java
index 9cbed389..d28f54a1 100644
--- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiResponse.java
+++ b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiResponse.java
@@ -1,4 +1,4 @@
-package org.dromara.sms.huawei.entity;
+package org.dromara.sms4j.huawei.entity;
import lombok.Data;
diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/SmsId.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/SmsId.java
similarity index 92%
rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/SmsId.java
rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/SmsId.java
index 16baea41..185611d3 100644
--- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/SmsId.java
+++ b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/SmsId.java
@@ -1,4 +1,4 @@
-package org.dromara.sms.huawei.entity;
+package org.dromara.sms4j.huawei.entity;
import lombok.Data;
diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/service/HuaweiSmsImpl.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java
similarity index 89%
rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/service/HuaweiSmsImpl.java
rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java
index 226aaac9..61db2caa 100644
--- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/service/HuaweiSmsImpl.java
+++ b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java
@@ -1,22 +1,23 @@
-package org.dromara.sms.huawei.service;
+package org.dromara.sms4j.huawei.service;
import com.dtflys.forest.config.ForestConfiguration;
-import org.dromara.sms.api.callback.CallBack;
-import org.dromara.sms.api.entity.SmsResponse;
-import org.dromara.sms.comm.annotation.Restricted;
-import org.dromara.sms.comm.constant.Constant;
-import org.dromara.sms.comm.delayedTime.DelayedTime;
-import org.dromara.sms.comm.factory.BeanFactory;
-import org.dromara.sms.huawei.config.HuaweiConfig;
-import org.dromara.sms.huawei.entity.HuaweiResponse;
-import org.dromara.sms.huawei.utils.HuaweiBuilder;
+import org.dromara.sms4j.api.callback.CallBack;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.comm.annotation.Restricted;
+import org.dromara.sms4j.comm.constant.Constant;
+import org.dromara.sms4j.comm.delayedTime.DelayedTime;
+import org.dromara.sms4j.comm.factory.BeanFactory;
+import org.dromara.sms4j.huawei.config.HuaweiConfig;
+import org.dromara.sms4j.huawei.entity.HuaweiResponse;
+import org.dromara.sms4j.huawei.utils.HuaweiBuilder;
import lombok.extern.slf4j.Slf4j;
-import org.dromara.sms.api.SmsBlend;
+import org.dromara.sms4j.api.SmsBlend;
+
import java.util.*;
import java.util.concurrent.Executor;
-import static org.dromara.sms.huawei.utils.HuaweiBuilder.listToString;
+import static org.dromara.sms4j.huawei.utils.HuaweiBuilder.listToString;
@Slf4j
diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/utils/HuaweiBuilder.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java
similarity index 98%
rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/utils/HuaweiBuilder.java
rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java
index 70ad9651..27a05b14 100644
--- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/utils/HuaweiBuilder.java
+++ b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java
@@ -1,6 +1,6 @@
-package org.dromara.sms.huawei.utils;
+package org.dromara.sms4j.huawei.utils;
-import org.dromara.sms.comm.constant.Constant;
+import org.dromara.sms4j.comm.constant.Constant;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
diff --git a/sms-aggregation-huawei/src/main/resources/application.properties b/sms4j-huawei/src/main/resources/application.properties
similarity index 100%
rename from sms-aggregation-huawei/src/main/resources/application.properties
rename to sms4j-huawei/src/main/resources/application.properties
diff --git a/sms-aggregation-jdcloud/.flattened-pom.xml b/sms4j-jdcloud/.flattened-pom.xml
similarity index 70%
rename from sms-aggregation-jdcloud/.flattened-pom.xml
rename to sms4j-jdcloud/.flattened-pom.xml
index a89983e6..cfa36d16 100644
--- a/sms-aggregation-jdcloud/.flattened-pom.xml
+++ b/sms4j-jdcloud/.flattened-pom.xml
@@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4.0.0
- kim.wind
+ org.dromara.sms4j
sms_aggregation
1.0.5
- kim.wind
- sms-aggregation-jdcloud
+ org.dromara.sms4j
+ sms4j-jdcloud
1.0.5
- sms-aggregation-jdcloud
- sms-aggregation-jdcloud
+ sms4j-jdcloud
+ sms4j-jdcloud
Apache 2
@@ -26,12 +26,12 @@
sms
- kim.wind
- sms-aggregation-comm
+ org.dromara.sms4j
+ sms4j-comm
- kim.wind
- sms-aggregation-api
+ org.dromara.sms4j
+ sms4j-api
diff --git a/sms-aggregation-jdcloud/.mvn/wrapper/maven-wrapper.jar b/sms4j-jdcloud/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from sms-aggregation-jdcloud/.mvn/wrapper/maven-wrapper.jar
rename to sms4j-jdcloud/.mvn/wrapper/maven-wrapper.jar
diff --git a/sms-aggregation-jdcloud/.mvn/wrapper/maven-wrapper.properties b/sms4j-jdcloud/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from sms-aggregation-jdcloud/.mvn/wrapper/maven-wrapper.properties
rename to sms4j-jdcloud/.mvn/wrapper/maven-wrapper.properties
diff --git a/sms-aggregation-jdcloud/pom.xml b/sms4j-jdcloud/pom.xml
similarity index 68%
rename from sms-aggregation-jdcloud/pom.xml
rename to sms4j-jdcloud/pom.xml
index 73c27fac..57ab2a2c 100644
--- a/sms-aggregation-jdcloud/pom.xml
+++ b/sms4j-jdcloud/pom.xml
@@ -4,15 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- kim.wind
+ org.dromara.sms4j
sms_aggregation
${revision}
../pom.xml
- sms-aggregation-jdcloud
- sms-aggregation-jdcloud
- sms-aggregation-jdcloud
+ sms4j-jdcloud
+ sms4j-jdcloud
+ sms4j-jdcloud
${revision}
@@ -23,13 +23,13 @@
- kim.wind
- sms-aggregation-comm
+ org.dromara.sms4j
+ sms4j-comm
- kim.wind
- sms-aggregation-api
+ org.dromara.sms4j
+ sms4j-api
\ No newline at end of file
diff --git a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudConfig.java b/sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java
similarity index 91%
rename from sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudConfig.java
rename to sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java
index 83982ad5..a48e50dc 100644
--- a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudConfig.java
+++ b/sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java
@@ -1,4 +1,4 @@
-package org.dromara.sms.jdcloud.config;
+package org.dromara.sms4j.jdcloud.config;
import lombok.Data;
diff --git a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudSmsConfig.java b/sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudSmsConfig.java
similarity index 93%
rename from sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudSmsConfig.java
rename to sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudSmsConfig.java
index 7b10b746..cf29b5ca 100644
--- a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudSmsConfig.java
+++ b/sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudSmsConfig.java
@@ -1,12 +1,12 @@
-package org.dromara.sms.jdcloud.config;
+package org.dromara.sms4j.jdcloud.config;
import com.jdcloud.sdk.auth.CredentialsProvider;
import com.jdcloud.sdk.auth.StaticCredentialsProvider;
import com.jdcloud.sdk.http.HttpRequestConfig;
import com.jdcloud.sdk.http.Protocol;
import com.jdcloud.sdk.service.sms.client.SmsClient;
-import org.dromara.sms.comm.factory.BeanFactory;
-import org.dromara.sms.jdcloud.service.JdCloudSmsImpl;
+import org.dromara.sms4j.comm.factory.BeanFactory;
+import org.dromara.sms4j.jdcloud.service.JdCloudSmsImpl;
/**
* 京东云短信配置
diff --git a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/service/JdCloudSmsImpl.java b/sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java
similarity index 93%
rename from sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/service/JdCloudSmsImpl.java
rename to sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java
index 2c0836a2..a1bdcee8 100644
--- a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/service/JdCloudSmsImpl.java
+++ b/sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java
@@ -1,17 +1,17 @@
-package org.dromara.sms.jdcloud.service;
+package org.dromara.sms4j.jdcloud.service;
import cn.hutool.core.util.IdUtil;
import com.jdcloud.sdk.service.sms.client.SmsClient;
import com.jdcloud.sdk.service.sms.model.BatchSendRequest;
import com.jdcloud.sdk.service.sms.model.BatchSendResult;
import lombok.extern.slf4j.Slf4j;
-import org.dromara.sms.api.SmsBlend;
-import org.dromara.sms.api.callback.CallBack;
-import org.dromara.sms.api.entity.SmsResponse;
-import org.dromara.sms.comm.annotation.Restricted;
-import org.dromara.sms.comm.delayedTime.DelayedTime;
-import org.dromara.sms.comm.exception.SmsBlendException;
-import org.dromara.sms.jdcloud.config.JdCloudConfig;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.callback.CallBack;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.comm.annotation.Restricted;
+import org.dromara.sms4j.comm.delayedTime.DelayedTime;
+import org.dromara.sms4j.comm.exception.SmsBlendException;
+import org.dromara.sms4j.jdcloud.config.JdCloudConfig;
import java.util.Collections;
import java.util.LinkedHashMap;
diff --git a/sms-aggregation-jdcloud/src/main/resources/application.properties b/sms4j-jdcloud/src/main/resources/application.properties
similarity index 100%
rename from sms-aggregation-jdcloud/src/main/resources/application.properties
rename to sms4j-jdcloud/src/main/resources/application.properties
diff --git a/sms-aggregation-spring-boot-starter/.flattened-pom.xml b/sms4j-spring-boot-starter/.flattened-pom.xml
similarity index 77%
rename from sms-aggregation-spring-boot-starter/.flattened-pom.xml
rename to sms4j-spring-boot-starter/.flattened-pom.xml
index 6208a1f5..ee72ad27 100644
--- a/sms-aggregation-spring-boot-starter/.flattened-pom.xml
+++ b/sms4j-spring-boot-starter/.flattened-pom.xml
@@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4.0.0
- kim.wind
+ org.dromara.sms4j
sms_aggregation
1.0.5
- kim.wind
- sms-aggregation-spring-boot-starter
+ org.dromara.sms4j
+ sms4j-spring-boot-starter
1.0.5
- sms-aggregation-spring-boot-starter
- sms-aggregation-spring-boot-starter
+ sms4j-spring-boot-starter
+ sms4j-spring-boot-starter
Apache 2
@@ -29,8 +29,8 @@
import
- kim.wind
- sms-aggregation-autoimmit
+ org.dromara.sms4j
+ sms4j-autoimmit
org.springframework.boot
diff --git a/sms-aggregation-spring-boot-starter/pom.xml b/sms4j-spring-boot-starter/pom.xml
similarity index 78%
rename from sms-aggregation-spring-boot-starter/pom.xml
rename to sms4j-spring-boot-starter/pom.xml
index 4fa0e523..ef7b84c4 100644
--- a/sms-aggregation-spring-boot-starter/pom.xml
+++ b/sms4j-spring-boot-starter/pom.xml
@@ -3,20 +3,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- kim.wind
+ org.dromara.sms4j
sms_aggregation
${revision}
../pom.xml
- sms-aggregation-spring-boot-starter
- sms-aggregation-spring-boot-starter
- sms-aggregation-spring-boot-starter
+
+ sms4j-spring-boot-starter
+ sms4j-spring-boot-starter
+ sms4j-spring-boot-starter
${revision}
jar
-
+
org.springframework.boot
@@ -27,19 +28,18 @@
- kim.wind
- sms-aggregation-autoimmit
+ org.dromara.sms4j
+ sms4j-autoimmit
org.springframework.boot
spring-boot-starter
-
+
-
diff --git a/sms-aggregation-spring-boot-starter/src/main/java/org/dromara/sms/starter/config/SmsMainConfig.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java
similarity index 82%
rename from sms-aggregation-spring-boot-starter/src/main/java/org/dromara/sms/starter/config/SmsMainConfig.java
rename to sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java
index 7fa23f94..216f81af 100644
--- a/sms-aggregation-spring-boot-starter/src/main/java/org/dromara/sms/starter/config/SmsMainConfig.java
+++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java
@@ -1,8 +1,8 @@
-package org.dromara.sms.starter.config;
+package org.dromara.sms4j.starter.config;
import lombok.Data;
-import org.dromara.sms.autoimmit.config.SmsAutowiredConfig;
-import org.dromara.sms.autoimmit.utils.SpringUtil;
+import org.dromara.sms4j.autoimmit.config.SmsAutowiredConfig;
+import org.dromara.sms4j.autoimmit.utils.SpringUtil;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/sms4j-spring-boot-starter/src/main/resources/META-INF/spring.factories b/sms4j-spring-boot-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..5a6c4d6a
--- /dev/null
+++ b/sms4j-spring-boot-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,4 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+ org.dromara.sms4j.starter.config.SmsMainConfig,\
+ org.dromara.sms4j.autoimmit.config.SmsAutowiredConfig,\
+ org.dromara.sms4j.autoimmit.config.SupplierConfig
diff --git a/sms4j-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sms4j-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..e4020a36
--- /dev/null
+++ b/sms4j-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+org.dromara.sms4j.starter.config.SmsMainConfig
+org.dromara.sms4j.autoimmit.config.SmsAutowiredConfig
+org.dromara.sms4j.autoimmit.config.SupplierConfig
\ No newline at end of file
diff --git a/sms-aggregation-spring-boot-starter/src/main/resources/application.properties b/sms4j-spring-boot-starter/src/main/resources/application.properties
similarity index 100%
rename from sms-aggregation-spring-boot-starter/src/main/resources/application.properties
rename to sms4j-spring-boot-starter/src/main/resources/application.properties
diff --git a/sms-aggregation-tencent/.flattened-pom.xml b/sms4j-tencent/.flattened-pom.xml
similarity index 69%
rename from sms-aggregation-tencent/.flattened-pom.xml
rename to sms4j-tencent/.flattened-pom.xml
index b9e32fba..337929a5 100644
--- a/sms-aggregation-tencent/.flattened-pom.xml
+++ b/sms4j-tencent/.flattened-pom.xml
@@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4.0.0
- kim.wind
+ org.dromara.sms4j
sms_aggregation
1.0.5
- kim.wind
- sms-aggregation-tencent
+ org.dromara.sms4j
+ sms4j-tencent
1.0.5
- sms-aggregation-tencent
- sms-aggregation-tencent
+ sms4j-tencent
+ sms4j-tencent
Apache 2
@@ -20,17 +20,14 @@
A business-friendly OSS license
-
- 1.8
-
- kim.wind
- sms-aggregation-comm
+ org.dromara.sms4j
+ sms4j-comm
- kim.wind
- sms-aggregation-api
+ org.dromara.sms4j
+ sms4j-api
com.tencentcloudapi
diff --git a/sms-aggregation-tencent/pom.xml b/sms4j-tencent/pom.xml
similarity index 69%
rename from sms-aggregation-tencent/pom.xml
rename to sms4j-tencent/pom.xml
index 54228a93..f75d8546 100644
--- a/sms-aggregation-tencent/pom.xml
+++ b/sms4j-tencent/pom.xml
@@ -3,27 +3,28 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- kim.wind
+ org.dromara.sms4j
sms_aggregation
${revision}
../pom.xml
- sms-aggregation-tencent
- sms-aggregation-tencent
- sms-aggregation-tencent
+
+ sms4j-tencent
+ sms4j-tencent
+ sms4j-tencent
${revision}
+
- 1.8
- kim.wind
- sms-aggregation-comm
+ org.dromara.sms4j
+ sms4j-comm
- kim.wind
- sms-aggregation-api
+ org.dromara.sms4j
+ sms4j-api
com.tencentcloudapi
@@ -34,6 +35,4 @@
okhttp
-
-
diff --git a/sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/config/TencentConfig.java b/sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java
similarity index 92%
rename from sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/config/TencentConfig.java
rename to sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java
index f00a6406..1aa3c277 100644
--- a/sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/config/TencentConfig.java
+++ b/sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java
@@ -1,4 +1,4 @@
-package org.dromara.sms.tencent.config;
+package org.dromara.sms4j.tencent.config;
import lombok.Data;
diff --git a/sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/config/TencentSmsConfig.java b/sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentSmsConfig.java
similarity index 93%
rename from sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/config/TencentSmsConfig.java
rename to sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentSmsConfig.java
index f2a3226d..94a798eb 100644
--- a/sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/config/TencentSmsConfig.java
+++ b/sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentSmsConfig.java
@@ -1,11 +1,11 @@
-package org.dromara.sms.tencent.config;
+package org.dromara.sms4j.tencent.config;
import com.tencentcloudapi.common.Credential;
import com.tencentcloudapi.common.profile.ClientProfile;
import com.tencentcloudapi.common.profile.HttpProfile;
import com.tencentcloudapi.sms.v20210111.SmsClient;
-import org.dromara.sms.comm.factory.BeanFactory;
-import org.dromara.sms.tencent.service.TencentSmsImpl;
+import org.dromara.sms4j.comm.factory.BeanFactory;
+import org.dromara.sms4j.tencent.service.TencentSmsImpl;
/**
* TencentSmsConfig
diff --git a/sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/service/TencentSmsImpl.java b/sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java
similarity index 94%
rename from sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/service/TencentSmsImpl.java
rename to sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java
index cb574035..b572297b 100644
--- a/sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/service/TencentSmsImpl.java
+++ b/sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java
@@ -1,4 +1,4 @@
-package org.dromara.sms.tencent.service;
+package org.dromara.sms4j.tencent.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -6,13 +6,13 @@ import com.tencentcloudapi.common.exception.TencentCloudSDKException;
import com.tencentcloudapi.sms.v20210111.SmsClient;
import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest;
import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
-import org.dromara.sms.api.SmsBlend;
-import org.dromara.sms.api.callback.CallBack;
-import org.dromara.sms.api.entity.SmsResponse;
-import org.dromara.sms.comm.annotation.Restricted;
-import org.dromara.sms.comm.delayedTime.DelayedTime;
-import org.dromara.sms.comm.exception.SmsBlendException;
-import org.dromara.sms.tencent.config.TencentConfig;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.callback.CallBack;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.comm.annotation.Restricted;
+import org.dromara.sms4j.comm.delayedTime.DelayedTime;
+import org.dromara.sms4j.comm.exception.SmsBlendException;
+import org.dromara.sms4j.tencent.config.TencentConfig;
import lombok.extern.slf4j.Slf4j;
import java.util.*;
diff --git a/sms-aggregation-tencent/src/main/resources/application.properties b/sms4j-tencent/src/main/resources/application.properties
similarity index 100%
rename from sms-aggregation-tencent/src/main/resources/application.properties
rename to sms4j-tencent/src/main/resources/application.properties
diff --git a/sms-aggregation-unisms/.flattened-pom.xml b/sms4j-unisms/.flattened-pom.xml
similarity index 69%
rename from sms-aggregation-unisms/.flattened-pom.xml
rename to sms4j-unisms/.flattened-pom.xml
index 08416cb6..e6ea72cc 100644
--- a/sms-aggregation-unisms/.flattened-pom.xml
+++ b/sms4j-unisms/.flattened-pom.xml
@@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4.0.0
- kim.wind
+ org.dromara.sms4j
sms_aggregation
1.0.5
- kim.wind
- sms-aggregation-unisms
+ org.dromara.sms4j
+ sms4j-unisms
1.0.5
- sms-aggregation-unisms
- sms-aggregation-unisms
+ sms4j-unisms
+ sms4j-unisms
Apache 2
@@ -20,9 +20,6 @@
A business-friendly OSS license
-
- 1.8
-
com.apistd.uni
@@ -33,12 +30,12 @@
okhttp
- kim.wind
- sms-aggregation-comm
+ org.dromara.sms4j
+ sms4j-comm
- kim.wind
- sms-aggregation-api
+ org.dromara.sms4j
+ sms4j-api
diff --git a/sms-aggregation-unisms/pom.xml b/sms4j-unisms/pom.xml
similarity index 69%
rename from sms-aggregation-unisms/pom.xml
rename to sms4j-unisms/pom.xml
index e190fb34..788d7c53 100644
--- a/sms-aggregation-unisms/pom.xml
+++ b/sms4j-unisms/pom.xml
@@ -3,22 +3,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- kim.wind
+ org.dromara.sms4j
sms_aggregation
${revision}
../pom.xml
- sms-aggregation-unisms
- sms-aggregation-unisms
- sms-aggregation-unisms
+
+ sms4j-unisms
+ sms4j-unisms
+ sms4j-unisms
${revision}
+
- 1.8
-
-
com.apistd.uni
uni-sdk
@@ -30,14 +29,13 @@
- kim.wind
- sms-aggregation-comm
+ org.dromara.sms4j
+ sms4j-comm
- kim.wind
- sms-aggregation-api
+ org.dromara.sms4j
+ sms4j-api
-
diff --git a/sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/config/UniConfig.java b/sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java
similarity index 91%
rename from sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/config/UniConfig.java
rename to sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java
index 7380dc82..ac977936 100644
--- a/sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/config/UniConfig.java
+++ b/sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java
@@ -1,4 +1,4 @@
-package org.dromara.sms.unisms.config;
+package org.dromara.sms4j.unisms.config;
import lombok.Data;
diff --git a/sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/config/UniSmsConfig.java b/sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniSmsConfig.java
similarity index 91%
rename from sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/config/UniSmsConfig.java
rename to sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniSmsConfig.java
index 96b07a3b..c8cb9661 100644
--- a/sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/config/UniSmsConfig.java
+++ b/sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniSmsConfig.java
@@ -1,8 +1,8 @@
-package org.dromara.sms.unisms.config;
+package org.dromara.sms4j.unisms.config;
import com.apistd.uni.Uni;
-import org.dromara.sms.comm.factory.BeanFactory;
-import org.dromara.sms.unisms.service.UniSmsImpl;
+import org.dromara.sms4j.comm.factory.BeanFactory;
+import org.dromara.sms4j.unisms.service.UniSmsImpl;
/**
* UniSmsConfig
diff --git a/sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/service/UniSmsImpl.java b/sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java
similarity index 92%
rename from sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/service/UniSmsImpl.java
rename to sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java
index 663be54f..8314e0c9 100644
--- a/sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/service/UniSmsImpl.java
+++ b/sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java
@@ -1,16 +1,16 @@
-package org.dromara.sms.unisms.service;
+package org.dromara.sms4j.unisms.service;
import com.apistd.uni.UniResponse;
import com.apistd.uni.sms.UniMessage;
import com.apistd.uni.sms.UniSMS;
-import org.dromara.sms.api.SmsBlend;
-import org.dromara.sms.api.callback.CallBack;
-import org.dromara.sms.api.entity.SmsResponse;
-import org.dromara.sms.comm.annotation.Restricted;
-import org.dromara.sms.comm.delayedTime.DelayedTime;
-import org.dromara.sms.comm.exception.SmsBlendException;
-import org.dromara.sms.comm.utils.http.HttpJsonTool;
-import org.dromara.sms.unisms.config.UniConfig;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.callback.CallBack;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.comm.annotation.Restricted;
+import org.dromara.sms4j.comm.delayedTime.DelayedTime;
+import org.dromara.sms4j.comm.exception.SmsBlendException;
+import org.dromara.sms4j.comm.utils.http.HttpJsonTool;
+import org.dromara.sms4j.unisms.config.UniConfig;
import lombok.extern.slf4j.Slf4j;
import java.util.LinkedHashMap;
diff --git a/sms-aggregation-unisms/src/main/resources/application.properties b/sms4j-unisms/src/main/resources/application.properties
similarity index 100%
rename from sms-aggregation-unisms/src/main/resources/application.properties
rename to sms4j-unisms/src/main/resources/application.properties
diff --git a/sms-aggregation-emay/.flattened-pom.xml b/sms4j-yunpian/.flattened-pom.xml
similarity index 65%
rename from sms-aggregation-emay/.flattened-pom.xml
rename to sms4j-yunpian/.flattened-pom.xml
index 06687730..76156058 100644
--- a/sms-aggregation-emay/.flattened-pom.xml
+++ b/sms4j-yunpian/.flattened-pom.xml
@@ -1,34 +1,33 @@
-
-
- 4.0.0
-
- kim.wind
- sms_aggregation
- 1.0.5
-
- kim.wind
- sms-aggregation-emay
- 1.0.5
- sms-aggregation-emay
- sms-aggregation-emay
-
-
- Apache 2
- http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
- A business-friendly OSS license
-
-
-
-
- kim.wind
- sms-aggregation-comm
-
-
- kim.wind
- sms-aggregation-api
-
-
-
-
+
+
+ 4.0.0
+
+ org.dromara.sms4j
+ sms_aggregation
+ 1.0.5
+
+ org.dromara.sms4j
+ sms4j-yunpian
+ 1.0.5
+ sms4j-yunpian
+ sms4j-yunpian
+
+
+ Apache 2
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+ A business-friendly OSS license
+
+
+
+
+ org.dromara.sms4j
+ sms4j-comm
+
+
+ org.dromara.sms4j
+ sms4j-api
+
+
+
diff --git a/sms-aggregation-huawei/pom.xml b/sms4j-yunpian/pom.xml
similarity index 62%
rename from sms-aggregation-huawei/pom.xml
rename to sms4j-yunpian/pom.xml
index bf3bd148..69daa770 100644
--- a/sms-aggregation-huawei/pom.xml
+++ b/sms4j-yunpian/pom.xml
@@ -3,35 +3,28 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- kim.wind
+ org.dromara.sms4j
sms_aggregation
${revision}
../pom.xml
- sms-aggregation-huawei
+
+ sms4j-yunpian
+ sms4j-yunpian
+ sms4j-yunpian
${revision}
- sms-aggregation-huawei
- sms-aggregation-huawei
-
-
- kim.wind
- sms-aggregation-comm
+ org.dromara.sms4j
+ sms4j-comm
-
- kim.wind
- sms-aggregation-api
+ org.dromara.sms4j
+ sms4j-api
-
-
-
-
-
diff --git a/sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/config/YunPianSmsConfig.java b/sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunPianSmsConfig.java
similarity index 76%
rename from sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/config/YunPianSmsConfig.java
rename to sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunPianSmsConfig.java
index 90106ade..e796117e 100644
--- a/sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/config/YunPianSmsConfig.java
+++ b/sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunPianSmsConfig.java
@@ -1,9 +1,9 @@
-package org.dromara.sms.yunpian.config;
+package org.dromara.sms4j.yunpian.config;
import com.dtflys.forest.Forest;
import com.dtflys.forest.config.ForestConfiguration;
-import org.dromara.sms.api.SmsBlend;
-import org.dromara.sms.yunpian.service.YunPianSmsImpl;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.yunpian.service.YunPianSmsImpl;
public class YunPianSmsConfig {
diff --git a/sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/config/YunpianConfig.java b/sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java
similarity index 90%
rename from sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/config/YunpianConfig.java
rename to sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java
index ebf2a407..ee3791ec 100644
--- a/sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/config/YunpianConfig.java
+++ b/sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java
@@ -1,4 +1,4 @@
-package org.dromara.sms.yunpian.config;
+package org.dromara.sms4j.yunpian.config;
import lombok.Data;
diff --git a/sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/service/YunPianSmsImpl.java b/sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java
similarity index 92%
rename from sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/service/YunPianSmsImpl.java
rename to sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java
index dff2fb08..9bcf24c8 100644
--- a/sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/service/YunPianSmsImpl.java
+++ b/sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java
@@ -1,21 +1,21 @@
-package org.dromara.sms.yunpian.service;
+package org.dromara.sms4j.yunpian.service;
import com.alibaba.fastjson.JSONObject;
import com.dtflys.forest.config.ForestConfiguration;
-import org.dromara.sms.api.SmsBlend;
-import org.dromara.sms.api.callback.CallBack;
-import org.dromara.sms.api.entity.SmsResponse;
-import org.dromara.sms.comm.annotation.Restricted;
-import org.dromara.sms.comm.constant.Constant;
-import org.dromara.sms.comm.delayedTime.DelayedTime;
-import org.dromara.sms.comm.exception.SmsBlendException;
-import org.dromara.sms.yunpian.config.YunpianConfig;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.callback.CallBack;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.comm.annotation.Restricted;
+import org.dromara.sms4j.comm.constant.Constant;
+import org.dromara.sms4j.comm.delayedTime.DelayedTime;
+import org.dromara.sms4j.comm.exception.SmsBlendException;
+import org.dromara.sms4j.yunpian.config.YunpianConfig;
import java.util.*;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicReference;
-import static org.dromara.sms.comm.utils.SmsUtil.listToString;
+import static org.dromara.sms4j.comm.utils.SmsUtil.listToString;
public class YunPianSmsImpl implements SmsBlend {
diff --git a/sms-aggregation-yunpian/src/main/resources/application.properties b/sms4j-yunpian/src/main/resources/application.properties
similarity index 100%
rename from sms-aggregation-yunpian/src/main/resources/application.properties
rename to sms4j-yunpian/src/main/resources/application.properties