feat："优化忘记密码邮件发送失败问题"

pom.xml

@@ -250,11 +250,11 @@
         <!--			<artifactId>spring-boot-starter-web</artifactId>-->
         <!--		</dependency>-->
 
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.squareup.okhttp3</groupId>-->
+<!--            <artifactId>okhttp</artifactId>-->
+<!--            <version>4.9.3</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -296,6 +296,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <version>2.10.1</version>
         </dependency>
 
         <!-- amazon ses -->

src/main/java/com/szwl/controller/TAdminController.java

@@ -1444,6 +1444,7 @@ public class TAdminController {
     @PostMapping("/sentForgetCode")
     public ResponseModel<?> sentForgetCode(@RequestBody LoginParam param) {
         String phoneOrEmail = param.getPhoneOrEmail();
+        String hostName = param.getHostName();
         // 定义国内手机号和邮箱的正则表达式
         String phoneReg = "^1[3-9]\\d{9}$";
         String emailReg = "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$";
@@ -1471,7 +1472,7 @@ public class TAdminController {
                 return R.fail(ResponseCodesEnum.R0011);
             }
             // 发邮件
-            String result = tMessageCodeService.sentEmail("1", phoneOrEmail, admin.getId());
+            String result = tMessageCodeService.sentEmail("1", phoneOrEmail, admin.getId(), hostName);
             return R.ok(result);
         }
         return R.fail(ResponseCodesEnum.R0004);

src/main/java/com/szwl/service/TMessageCodeService.java

@@ -33,7 +33,7 @@ public interface TMessageCodeService extends MyIService<TMessageCode> {
     /*
      * 发送忘记密码邮箱验证码
      * */
-    String sentEmail(String type, String email, Long adminId);
+    String sentEmail(String type, String email, Long adminId, String hostName);
 
     String sendEmailAbroad(String type, String email);
 

src/main/java/com/szwl/service/impl/TMessageCodeServiceImpl.java

@@ -115,12 +115,17 @@ public class TMessageCodeServiceImpl extends ServiceImpl<TMessageCodeMapper, TMe
     }
 
     @Override
-    public String sentEmail(String type, String email, Long adminId) {
+    public String sentEmail(String type, String email, Long adminId, String hostName) {
         String code = addCode();
         String subject = getSubject(type);
-        String contnet = "";
-        contnet = getContent(type, code);
-        new MailUtil().send(email, subject, contnet);
+        String content = "";
+        content = getContent(type, code);
+        String AETI = "Portalmcc";
+        if (StringUtils.isNotEmpty(hostName) && AETI.equals(hostName)) {
+            new SampleMail().sendAuthCodePortalmcc(email, content);
+        } else {
+            new SampleMail().sendAuthCode(email, content);
+        }
         TMessageCode tMessageCode = new TMessageCode();
         tMessageCode.setType(type);
         tMessageCode.setCode(code);