Skip to content

Commit 965951e

Browse files
committed
Move "api-boot-plugin-sms" to "api-boot"
1 parent 457e64a commit 965951e

File tree

16 files changed

+50
-87
lines changed

16 files changed

+50
-87
lines changed

api-boot-project/api-boot-autoconfigure/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,6 @@
9595
<artifactId>aliyun-sdk-oss</artifactId>
9696
<optional>true</optional>
9797
</dependency>
98-
<!--ApiBoot Sms Plugin-->
99-
<dependency>
100-
<groupId>${project.groupId}</groupId>
101-
<artifactId>api-boot-plugin-alibaba-sms</artifactId>
102-
<optional>true</optional>
103-
</dependency>
10498

10599
<!--ApiBoot Security Plugin-->
106100
<dependency>
@@ -198,17 +192,23 @@
198192
<optional>true</optional>
199193
</dependency>
200194

201-
<!--ApiBoot Mail-->
195+
<!--Aliyun-->
202196
<dependency>
203197
<groupId>com.aliyun</groupId>
204198
<artifactId>aliyun-java-sdk-core</artifactId>
205199
<optional>true</optional>
206200
</dependency>
201+
<dependency>
202+
<groupId>com.aliyun</groupId>
203+
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
204+
<optional>true</optional>
205+
</dependency>
207206
<dependency>
208207
<groupId>com.aliyun</groupId>
209208
<artifactId>aliyun-java-sdk-dm</artifactId>
210209
<optional>true</optional>
211210
</dependency>
211+
212212
<!--MinBox Logging-->
213213
<dependency>
214214
<groupId>${project.groupId}</groupId>

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/sms/ApiBootSmsAutoConfiguration.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.minbox.framework.api.boot.autoconfigure.sms;
22

33
import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
4-
import org.minbox.framework.api.boot.plugin.sms.ApiBootAliYunSmsService;
4+
import org.minbox.framework.api.boot.sms.ApiBootAliYunSmsService;
55
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
66
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
77
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -14,13 +14,7 @@
1414
/**
1515
* ApiBoot 短信服务自动化配置
1616
*
17-
* @author:恒宇少年 - 于起宇
18-
* <p>
19-
* DateTime:2019-03-22 10:53
20-
* Blog:http://blog.yuqiyu.com
21-
* WebSite:http://www.jianshu.com/u/092df3f77bca
22-
* Gitee:https://gitee.com/hengboy
23-
* GitHub:https://github.com/hengboy
17+
* @author 恒宇少年
2418
*/
2519
@Configuration
2620
@ConditionalOnClass(SendSmsRequest.class)

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/sms/ApiBootSmsProperties.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,7 @@
99
/**
1010
* ApiBoot 集成 阿里云国际短信服务配置类
1111
*
12-
* @author:恒宇少年 - 于起宇
13-
* <p>
14-
* DateTime:2019-03-22 10:53
15-
* Blog:http://blog.yuqiyu.com
16-
* WebSite:http://www.jianshu.com/u/092df3f77bca
17-
* Gitee:https://gitee.com/hengboy
18-
* GitHub:https://github.com/hengboy
12+
* @author 恒宇少年
1913
*/
2014
@Data
2115
@Configuration

api-boot-project/api-boot-dependencies/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,6 @@
239239
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
240240
<version>${aliyun.sdk.dysmsapi.version}</version>
241241
</dependency>
242-
<dependency>
243-
<groupId>org.minbox.framework</groupId>
244-
<artifactId>api-boot-plugin-alibaba-sms</artifactId>
245-
<version>${project.version}</version>
246-
</dependency>
247242
<dependency>
248243
<groupId>org.minbox.framework</groupId>
249244
<artifactId>api-boot-starter-alibaba-sms</artifactId>

api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-sms/pom.xml

Lines changed: 0 additions & 39 deletions
This file was deleted.

api-boot-project/api-boot-plugins/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
</properties>
2020
<modules>
2121
<module>api-boot-plugin</module>
22-
<module>api-boot-plugin-alibaba-sms</module>
2322
<module>api-boot-plugin-security</module>
2423
<module>api-boot-plugin-oauth</module>
2524
<module>api-boot-plugin-quartz</module>

api-boot-project/api-boot-starters/api-boot-starter-alibaba-sms/pom.xml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,19 @@
3333
<groupId>org.minbox.framework</groupId>
3434
<artifactId>api-boot-starter</artifactId>
3535
</dependency>
36-
<!--ApiBoot Sms Plugin-->
36+
<!--aliyun java jdk-->
3737
<dependency>
38-
<groupId>org.minbox.framework</groupId>
39-
<artifactId>api-boot-plugin-alibaba-sms</artifactId>
38+
<groupId>com.aliyun</groupId>
39+
<artifactId>aliyun-java-sdk-core</artifactId>
40+
</dependency>
41+
<dependency>
42+
<groupId>com.aliyun</groupId>
43+
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
44+
</dependency>
45+
<!--See: https://github.com/minbox-projects/api-boot/pull/18 -->
46+
<dependency>
47+
<groupId>javax.annotation</groupId>
48+
<artifactId>javax.annotation-api</artifactId>
4049
</dependency>
4150
</dependencies>
4251
</project>

api-boot-project/api-boot-starters/api-boot-starter/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,21 @@
1414
<main.basedir>${basedir}/../../..</main.basedir>
1515
</properties>
1616
<dependencies>
17-
<!--自动化配置-->
1817
<dependency>
1918
<groupId>org.minbox.framework</groupId>
2019
<artifactId>api-boot-autoconfigure</artifactId>
2120
</dependency>
22-
<!--ApiBoot Common-->
2321
<dependency>
2422
<groupId>org.minbox.framework</groupId>
2523
<artifactId>api-boot-common</artifactId>
2624
</dependency>
27-
<!--ApiBoot-->
2825
<dependency>
2926
<groupId>org.minbox.framework</groupId>
3027
<artifactId>api-boot</artifactId>
3128
</dependency>
29+
<dependency>
30+
<groupId>com.alibaba</groupId>
31+
<artifactId>fastjson</artifactId>
32+
</dependency>
3233
</dependencies>
3334
</project>

api-boot-project/api-boot/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,22 @@
4242
<artifactId>aliyun-java-sdk-dm</artifactId>
4343
<optional>true</optional>
4444
</dependency>
45+
<dependency>
46+
<groupId>com.aliyun</groupId>
47+
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
48+
<optional>true</optional>
49+
</dependency>
4550
<dependency>
4651
<groupId>org.projectlombok</groupId>
4752
<artifactId>lombok</artifactId>
4853
<scope>compile</scope>
4954
<optional>true</optional>
5055
</dependency>
56+
<dependency>
57+
<groupId>com.alibaba</groupId>
58+
<artifactId>fastjson</artifactId>
59+
<optional>true</optional>
60+
</dependency>
5161
</dependencies>
5262

5363
</project>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.minbox.framework.api.boot.plugin.sms;
1+
package org.minbox.framework.api.boot.sms;
22

33
import com.aliyuncs.DefaultAcsClient;
44
import com.aliyuncs.IAcsClient;
@@ -8,8 +8,8 @@
88
import com.aliyuncs.profile.IClientProfile;
99
import lombok.AllArgsConstructor;
1010
import org.minbox.framework.api.boot.common.exception.ApiBootException;
11-
import org.minbox.framework.api.boot.plugin.sms.request.ApiBootSmsRequest;
12-
import org.minbox.framework.api.boot.plugin.sms.response.ApiBootSmsResponse;
11+
import org.minbox.framework.api.boot.sms.request.ApiBootSmsRequest;
12+
import org.minbox.framework.api.boot.sms.response.ApiBootSmsResponse;
1313

1414
import javax.annotation.PostConstruct;
1515

0 commit comments

Comments
 (0)