From a8e2ddb420d125a34171da7860d8d6e1ec4d0327 Mon Sep 17 00:00:00 2001 From: wind Date: Thu, 1 Aug 2024 17:57:51 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=8D=87=E7=BA=A73.3.1=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=94=99=E8=AF=AFPR=E5=AF=BC=E8=87=B4=E7=9A=84yml?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=A0=E8=BD=BD=E5=A4=B1=E8=B4=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 30 +++++++++---------- .../dromara/sms4j/comm/constant/Constant.java | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 3a5dd1cd..93cb24c3 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ - 3.3.1-SNAPSHOT + 3.3.1 UTF-8 UTF-8 @@ -243,20 +243,20 @@ - - - - - - - - - - - - - - + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + verify + + sign + + + + org.apache.maven.plugins diff --git a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java index fd62a17e..2526e7db 100644 --- a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java +++ b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java @@ -11,7 +11,7 @@ public abstract class Constant { /** * 项目版本号 */ - public static final String VERSION = "V 3.2.0"; + public static final String VERSION = "V 3.2.1"; /** * 用于格式化鉴权头域,给"Authorization"参数赋值 From 4fbea6e6a1338557074a4f9b25c47ef00eb9d82f Mon Sep 17 00:00:00 2001 From: wind Date: Thu, 1 Aug 2024 19:26:11 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=8D=87=E7=BA=A73.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dromara/sms4j/comm/constant/Constant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java index 2526e7db..993e3cc2 100644 --- a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java +++ b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java @@ -11,7 +11,7 @@ public abstract class Constant { /** * 项目版本号 */ - public static final String VERSION = "V 3.2.1"; + public static final String VERSION = "V 3.3.1"; /** * 用于格式化鉴权头域,给"Authorization"参数赋值 From 2dec57ad805eb570dbc20765129c3544bbb522ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E5=A6=82=E6=AD=8C?= Date: Fri, 2 Aug 2024 01:21:12 +0000 Subject: [PATCH 03/12] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 风如歌 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 63cd6c04..d11bee1e 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -

sms4j v3.2.0

+

sms4j v3.3.1

sms4j -- 让发送短信变的更简单

- +

From 506acbf90647ae1e49c94c52edc0ef3a469cab31 Mon Sep 17 00:00:00 2001 From: wind Date: Thu, 8 Aug 2024 19:24:07 +0800 Subject: [PATCH 04/12] =?UTF-8?q?3.3.2=20=E4=BF=AE=E5=A4=8D=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E7=9F=AD=E4=BF=A1=E6=8B=A6=E6=88=AA=E5=90=8E=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- pom.xml | 2 +- .../main/java/org/dromara/sms4j/comm/constant/Constant.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d11bee1e..22fd6de3 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -

sms4j v3.3.1

+

sms4j v3.3.2

sms4j -- 让发送短信变的更简单

- +

diff --git a/pom.xml b/pom.xml index 93cb24c3..0f2c3e3a 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ - 3.3.1 + 3.3.2 UTF-8 UTF-8 diff --git a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java index 993e3cc2..e703ab6e 100644 --- a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java +++ b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java @@ -11,7 +11,7 @@ public abstract class Constant { /** * 项目版本号 */ - public static final String VERSION = "V 3.3.1"; + public static final String VERSION = "V 3.3.2"; /** * 用于格式化鉴权头域,给"Authorization"参数赋值 From cf8b977a9ed3cefbced172aba762b7e1fc2fd33c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E5=A6=82=E6=AD=8C?= Date: Wed, 14 Aug 2024 03:13:28 +0000 Subject: [PATCH 05/12] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 风如歌 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 22fd6de3..79deca07 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ 如果我们的项目对你产生了帮助，或者你觉得还算值得鼓励，请用你发财的小手帮助点上一个start [gitee](https://gitee.com/dromara/sms4j) [github](https://github.com/dromara/sms4j) +[gitcode](https://gitcode.com/dromara/SMS4J) #### [官方文档](http://wind.kim) #### [JavaDoc文档](https://apidoc.gitee.com/dromara/sms4j/) From 319a0d2cd17564ce91b907072605e156bbcd75fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E5=A6=82=E6=AD=8C?= Date: Thu, 15 Aug 2024 02:12:31 +0000 Subject: [PATCH 06/12] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 风如歌 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 79deca07..695ce43d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ [github](https://github.com/dromara/sms4j) [gitcode](https://gitcode.com/dromara/SMS4J) -#### [官方文档](http://wind.kim) +#### [官方文档](http://sms4j.com) #### [JavaDoc文档](https://apidoc.gitee.com/dromara/sms4j/) ## 支持厂商一览 From 298e7c48e5c50444a0d626c24e06ae2fe23102eb Mon Sep 17 00:00:00 2001 From: wind Date: Sat, 7 Sep 2024 17:55:58 +0800 Subject: [PATCH 07/12] =?UTF-8?q?3.3.3=E5=8D=87=E7=BA=A7=201.=20https://gi?= =?UTF-8?q?tee.com/dromara/sms4j/issues/IAN87I=202.=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E8=85=BE=E8=AE=AF=E4=BA=91=E5=A4=9A=E5=8F=82=E6=95=B0=E5=8F=91?= =?UTF-8?q?=E9=80=81=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=BC=82=E5=B8=B8=E6=89=A7=E8=A1=8C=E5=99=A8=E5=86=8D?= =?UTF-8?q?=E6=9C=AA=E8=BF=9B=E8=A1=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E4=BC=9A=E5=B0=86=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A0=86=E6=A0=88=E5=90=9E=E6=8E=89=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=203.=20=E5=A4=A9=E7=BF=BC=E4=BA=91eop-date=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=AE=9E=E9=99=85=E7=94=9F=E4=BA=A7=E5=B0=918?= =?UTF-8?q?=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- pom.xml | 2 +- .../main/java/org/dromara/sms4j/comm/constant/Constant.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fdbe5cbc..8ef9386c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -

sms4j v3.3.2

+

sms4j v3.3.3

sms4j -- 让发送短信变的更简单

- +

diff --git a/pom.xml b/pom.xml index 0f2c3e3a..57778c81 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ - 3.3.2 + 3.3.3 UTF-8 UTF-8 diff --git a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java index e703ab6e..9d33c8e8 100644 --- a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java +++ b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java @@ -11,7 +11,7 @@ public abstract class Constant { /** * 项目版本号 */ - public static final String VERSION = "V 3.3.2"; + public static final String VERSION = "V 3.3.3"; /** * 用于格式化鉴权头域,给"Authorization"参数赋值 From 5bc7d0152ef68e234ccda2ab02eb6652e0f92380 Mon Sep 17 00:00:00 2001 From: wind Date: Fri, 7 Mar 2025 20:55:29 +0800 Subject: [PATCH 08/12] =?UTF-8?q?3.3.4=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index b38b4de8..c74b8c4f 100644 --- a/pom.xml +++ b/pom.xml @@ -314,6 +314,19 @@ + + org.sonatype.central + central-publishing-maven-plugin + 0.6.0 + true + + ossrh + + true + + published + + From 6aa173501e11daec12391b8267ea136155ef2571 Mon Sep 17 00:00:00 2001 From: wind Date: Fri, 7 Mar 2025 20:56:01 +0800 Subject: [PATCH 09/12] =?UTF-8?q?3.3.4=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8ef9386c..a4583242 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -

sms4j v3.3.3

+

sms4j v3.3.4

sms4j -- 让发送短信变的更简单

- +

From 7582982d443412d964e69ef85c182087f006ca22 Mon Sep 17 00:00:00 2001 From: wind Date: Fri, 7 Mar 2025 21:36:32 +0800 Subject: [PATCH 10/12] =?UTF-8?q?3.3.4=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index a4583242..94da87d0 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,13 @@ - **[助通短信](https://www.ztinfo.cn/products/sms)** - **[联麓短信](https://console.shlianlu.com/#/document/smsDoc)** - **[鼎众短信](http://demoapi.321sms.com:8201/index.html)** +- **[创蓝短信](https://doc.chuanglan.com/document/HAQYSZKH9HT5Z50L)** +- **[极光短信](https://docs.jiguang.cn/jsms)** +- **[布丁云短信](https://console-docs.apipost.cn/preview/986c24caf79228ed/d3d8a6d5faf6ef51)** +- **[中国移动 云MAS短信](https://mas.10086.cn/)** +- **[螺丝帽短信](https://luosimao.com)** +- **[SUBMAIL短信](https://www.mysubmail.com/)** +- **[单米科技短信](https://www.danmi.com/)** ## 在SpringBoot环境集成 From cedae2696b1f767d9a0a649886a93a593406ac65 Mon Sep 17 00:00:00 2001 From: wind Date: Fri, 7 Mar 2025 21:38:28 +0800 Subject: [PATCH 11/12] =?UTF-8?q?3.3.4=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 94da87d0..adc7ff35 100644 --- a/README.md +++ b/README.md @@ -153,6 +153,7 @@ sms: ## 贡献原则 - 我们原则上欢迎任何人为sms4j添加加瓦贡献代码 - 贡献代码应注释完备，按照javaDoc标准对 类，方法，变量，参数，返回值等信息说明 +- 如新增短信厂商需要同時以MD格式编写厂商的使用文档 - 新增的方法模块不能破坏原有结构和兼容性 - 如果我们关闭了你的issues或者pr请查看回复内容，我们会在回复中做出解释 From 920f9304ea17fb5dadcf23949c251c30261d5c25 Mon Sep 17 00:00:00 2001 From: dusttosky <1987192+dusttosky@user.noreply.gitee.com> Date: Wed, 26 Mar 2025 16:07:18 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E4=BA=91mas=E7=9A=84pa?= =?UTF-8?q?rams=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/sms4j/mas/service/MasSmsImpl.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/mas/service/MasSmsImpl.java b/sms4j-provider/src/main/java/org/dromara/sms4j/mas/service/MasSmsImpl.java index 5e9fb61c..9c0e10c1 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/mas/service/MasSmsImpl.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/mas/service/MasSmsImpl.java @@ -1,9 +1,9 @@ package org.dromara.sms4j.mas.service; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; -import lombok.extern.slf4j.Slf4j; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.concurrent.Executor; + import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.api.utils.SmsRespUtils; import org.dromara.sms4j.comm.constant.SupplierConstant; @@ -14,9 +14,10 @@ import org.dromara.sms4j.mas.config.MasConfig; import org.dromara.sms4j.mas.utils.MasUtils; import org.dromara.sms4j.provider.service.AbstractSmsBlend; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.concurrent.Executor; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import lombok.extern.slf4j.Slf4j; /** *

类名: MasSmsImpl @@ -53,7 +54,8 @@ public class MasSmsImpl extends AbstractSmsBlend { if (CollUtil.isEmpty(messages)){ messages = new LinkedHashMap<>(); } - return getSmsResponse(phone, JSONUtil.toJsonStr(messages), getConfig().getTemplateId()); + + return getSmsResponse(phone, JSONUtil.toJsonStr(messages.values()), getConfig().getTemplateId()); } @Override @@ -61,7 +63,7 @@ public class MasSmsImpl extends AbstractSmsBlend { if (CollUtil.isEmpty(messages)){ messages = new LinkedHashMap<>(); } - String messageStr = JSONUtil.toJsonStr(messages); + String messageStr = JSONUtil.toJsonStr(messages.values()); return getSmsResponse(phone, messageStr, templateId); } @@ -75,7 +77,7 @@ public class MasSmsImpl extends AbstractSmsBlend { if (CollUtil.isEmpty(messages)){ messages = new LinkedHashMap<>(); } - String messageStr = JSONUtil.toJsonStr(messages); + String messageStr = JSONUtil.toJsonStr(messages.values()); return getSmsResponse(SmsUtils.addCodePrefixIfNot(phones), messageStr, templateId); }