1

src/main/java/com/fdkankan/ucenter/config/UcenterConfig.java

@@ -7,8 +7,11 @@ import org.springframework.context.annotation.Configuration;
 @Data
 @Configuration
 public class UcenterConfig {
+
     @Value("${4dkk.laserService.basePath}")
     private String basePath;
     @Value("${spring.profiles.active}")
     private String active;
+    @Value("${ucenter.contactUs.callBackUrl}")
+    private String contactUsCallBackUrl;
 }

src/main/java/com/fdkankan/ucenter/service/IMailTemplateService.java

@@ -54,5 +54,5 @@ public interface IMailTemplateService extends IService<MailTemplate> {
 
     void sendSubcriptionCancelledMail(String email,String memberLevels);
 
-    Boolean sendContactUs(String email,String redirectUrl);
+    Boolean sendContactUs(String email,String callBackUrl);
 }

src/main/java/com/fdkankan/ucenter/service/impl/ContactUsServiceImpl.java

@@ -6,6 +6,7 @@ import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.common.RedisKeyUtil;
 import com.fdkankan.ucenter.common.constants.ResultCode;
+import com.fdkankan.ucenter.config.UcenterConfig;
 import com.fdkankan.ucenter.entity.ContactUs;
 import com.fdkankan.ucenter.entity.ContactUsPoint;
 import com.fdkankan.ucenter.entity.MailTemplate;
@@ -55,6 +56,8 @@ public class ContactUsServiceImpl extends ServiceImpl<IContactUsMapper, ContactU
     LoginService loginService;
     @Autowired
     IContactUsPointService contactUsPointService;
+    @Autowired
+    UcenterConfig ucenterConfig;
 
     @Override
     public void submit(ContactUs contactUs) {
@@ -73,7 +76,8 @@ public class ContactUsServiceImpl extends ServiceImpl<IContactUsMapper, ContactU
         if(user !=null){
            return;
         }
-        Boolean b = mailTemplateService.sendContactUs(contactUs.getEmail(),contactUs.getRedirectUrl());
+        String callBackUrl = ucenterConfig.getContactUsCallBackUrl()+contactUs.getEmail();
+        Boolean b = mailTemplateService.sendContactUs(contactUs.getEmail(),callBackUrl);
 
         if(!b){
             throw new BusinessException(ResultCode.email_submit_error);

src/main/java/com/fdkankan/ucenter/service/impl/MailTemplateServiceImpl.java

@@ -56,7 +56,12 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
         wrapper.eq(MailTemplate::getLang,lang);
         return this.getOne(wrapper);
     }
-
+    public MailTemplate getTemplateEn(Integer type) {
+        LambdaQueryWrapper<MailTemplate> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MailTemplate::getType,type);
+        wrapper.eq(MailTemplate::getLang,"en");
+        return this.getOne(wrapper);
+    }
 
     @Override
     public Boolean sendCodeMail(String email, String code,String lang) {
@@ -246,12 +251,12 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
     }
 
     @Override
-    public Boolean sendContactUs(String email,String redirectUrl) {
-        MailTemplate mailTemplate = this.getTemplate(12,"en");
+    public Boolean sendContactUs(String email,String callBackUrl) {
+        MailTemplate mailTemplate = this.getTemplateEn(12);
         if(mailTemplate != null){
             String msg = mailTemplate.getMsg();
-            if(StringUtils.isNotBlank(redirectUrl)){
-                msg = msg.replace("{redirectUrl}",redirectUrl);
+            if(StringUtils.isNotBlank(callBackUrl)){
+                msg = msg.replace("{callBackUrl}",callBackUrl);
             }
             mailTemplate.setMsg(msg);
         }