Skip to content

Commit 457e64a

Browse files
hengboyhengboy
committed
Move "api-boot-plugin-mail" to "api-boot"
1 parent 50502e1 commit 457e64a

File tree

17 files changed

+58
-83
lines changed

17 files changed

+58
-83
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,15 @@
200200

201201
<!--ApiBoot Mail-->
202202
<dependency>
203-
<groupId>${project.groupId}</groupId>
204-
<artifactId>api-boot-plugin-mail</artifactId>
203+
<groupId>com.aliyun</groupId>
204+
<artifactId>aliyun-java-sdk-core</artifactId>
205+
<optional>true</optional>
206+
</dependency>
207+
<dependency>
208+
<groupId>com.aliyun</groupId>
209+
<artifactId>aliyun-java-sdk-dm</artifactId>
205210
<optional>true</optional>
206211
</dependency>
207-
208212
<!--MinBox Logging-->
209213
<dependency>
210214
<groupId>${project.groupId}</groupId>

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/mail/ApiBootMailAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import com.aliyuncs.IAcsClient;
2222
import com.aliyuncs.profile.DefaultProfile;
2323
import com.aliyuncs.profile.IClientProfile;
24-
import org.minbox.framework.api.boot.plugin.mail.ApiBootAliYunMailService;
25-
import org.minbox.framework.api.boot.plugin.mail.ApiBootMailService;
24+
import org.minbox.framework.api.boot.mail.ApiBootAliYunMailService;
25+
import org.minbox.framework.api.boot.mail.ApiBootMailService;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/mail/ApiBootMailProperties.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.minbox.framework.api.boot.autoconfigure.mail;
1919

2020
import lombok.Data;
21-
import org.minbox.framework.api.boot.plugin.mail.MailRegion;
21+
import org.minbox.framework.api.boot.mail.MailRegion;
2222
import org.springframework.boot.context.properties.ConfigurationProperties;
2323
import org.springframework.context.annotation.Configuration;
2424

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -371,11 +371,6 @@
371371
</dependency>
372372

373373
<!--ApiBoot Mail-->
374-
<dependency>
375-
<groupId>org.minbox.framework</groupId>
376-
<artifactId>api-boot-plugin-mail</artifactId>
377-
<version>${project.version}</version>
378-
</dependency>
379374
<dependency>
380375
<groupId>org.minbox.framework</groupId>
381376
<artifactId>api-boot-starter-mail</artifactId>

‎api-boot-project/api-boot-plugins/api-boot-plugin-mail/pom.xml‎

Lines changed: 0 additions & 52 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
@@ -28,7 +28,6 @@
2828
<module>api-boot-plugin-http-converter</module>
2929
<module>api-boot-plugin-message-push</module>
3030
<module>api-boot-plugin-rate-limiter</module>
31-
<module>api-boot-plugin-mail</module>
3231
<module>api-boot-plugin-sequence</module>
3332
</modules>
3433
</project>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,13 @@
5252
<groupId>org.minbox.framework</groupId>
5353
<artifactId>api-boot-starter</artifactId>
5454
</dependency>
55-
<!--ApiBoot Mail Plugin-->
5655
<dependency>
57-
<groupId>org.minbox.framework</groupId>
58-
<artifactId>api-boot-plugin-mail</artifactId>
56+
<groupId>com.aliyun</groupId>
57+
<artifactId>aliyun-java-sdk-core</artifactId>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.aliyun</groupId>
61+
<artifactId>aliyun-java-sdk-dm</artifactId>
5962
</dependency>
6063
</dependencies>
6164

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
<groupId>org.minbox.framework</groupId>
2020
<artifactId>api-boot-autoconfigure</artifactId>
2121
</dependency>
22+
<!--ApiBoot Common-->
23+
<dependency>
24+
<groupId>org.minbox.framework</groupId>
25+
<artifactId>api-boot-common</artifactId>
26+
</dependency>
2227
<!--ApiBoot-->
2328
<dependency>
2429
<groupId>org.minbox.framework</groupId>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,33 @@
1515
<name>ApiBoot</name>
1616
<artifactId>api-boot</artifactId>
1717
<dependencies>
18+
<dependency>
19+
<groupId>org.minbox.framework</groupId>
20+
<artifactId>api-boot-common</artifactId>
21+
<optional>true</optional>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.springframework</groupId>
25+
<artifactId>spring-core</artifactId>
26+
<optional>true</optional>
27+
</dependency>
1828
<!--alibaba oss-->
1929
<dependency>
2030
<groupId>com.aliyun.oss</groupId>
2131
<artifactId>aliyun-sdk-oss</artifactId>
2232
<optional>true</optional>
2333
</dependency>
34+
<!--Aliyun mail-->
35+
<dependency>
36+
<groupId>com.aliyun</groupId>
37+
<artifactId>aliyun-java-sdk-core</artifactId>
38+
<optional>true</optional>
39+
</dependency>
40+
<dependency>
41+
<groupId>com.aliyun</groupId>
42+
<artifactId>aliyun-java-sdk-dm</artifactId>
43+
<optional>true</optional>
44+
</dependency>
2445
<dependency>
2546
<groupId>org.projectlombok</groupId>
2647
<artifactId>lombok</artifactId>

‎api-boot-project/api-boot-plugins/api-boot-plugin-mail/src/main/java/org/minbox/framework/api/boot/plugin/mail/ApiBootAliYunMailService.java‎ renamed to ‎api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/mail/ApiBootAliYunMailService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
*
1616
*/
1717

18-
package org.minbox.framework.api.boot.plugin.mail;
18+
package org.minbox.framework.api.boot.mail;
1919

2020
import com.aliyuncs.IAcsClient;
2121
import com.aliyuncs.dm.model.v20151123.SingleSendMailRequest;
2222
import com.aliyuncs.dm.model.v20151123.SingleSendMailResponse;
2323
import lombok.AllArgsConstructor;
2424
import org.minbox.framework.api.boot.common.exception.ApiBootException;
25-
import org.minbox.framework.api.boot.plugin.mail.request.ApiBootMailRequest;
26-
import org.minbox.framework.api.boot.plugin.mail.response.ApiBootMailResponse;
25+
import org.minbox.framework.api.boot.mail.request.ApiBootMailRequest;
26+
import org.minbox.framework.api.boot.mail.response.ApiBootMailResponse;
2727
import org.springframework.util.ObjectUtils;
2828
import org.springframework.util.StringUtils;
2929

0 commit comments

Comments
 (0)