1

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

@@ -22,4 +22,6 @@ public class UcenterConfig {
     @Value("${ucenter.contactUs.dfPassword}")
     private String contactUsDfPassword;
 
+    @Value("${ucenter.contactUs.emailExTime}")
+    private Long emailExTime;
 }

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

@@ -55,4 +55,6 @@ public interface IMailTemplateService extends IService<MailTemplate> {
     void sendSubcriptionCancelledMail(String email,String memberLevels);
 
     Boolean sendContactUs(String email,String callBackUrl);
+
+    void sendContactUs2(String email);
 }

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

@@ -70,19 +70,20 @@ public class ContactUsServiceImpl extends ServiceImpl<IContactUsMapper, ContactU
         String redisKey2 = String.format(RedisKeyUtil.CONTACT_US_KEY,uuid);
 
         User user = userService.getByUserName(contactUs.getEmail());
+        contactUs.setCountry(IPUtils.getCountry(contactUs.getIpAddress()));
         if(user !=null){
-           return;
+            mailTemplateService.sendContactUs2(contactUs.getEmail());
+            this.save(contactUs);
+            return;
         }
         String callBackUrl = ucenterConfig.getContactUsCallBackUrl() + uuid;
         Boolean b = mailTemplateService.sendContactUs(contactUs.getEmail(),callBackUrl);
-
         if(!b){
             throw new BusinessException(ResultCode.email_submit_error);
         }
-        contactUs.setCountry(IPUtils.getCountry(contactUs.getIpAddress()));
         this.save(contactUs);
-        redisUtil.set(redisKey, uuid,7* 24 * 60 * 60);
-        redisUtil.set(redisKey2, JSONObject.toJSONString(contactUs),7* 24 * 60 * 60);
+        redisUtil.set(redisKey, uuid,ucenterConfig.getEmailExTime());
+        redisUtil.set(redisKey2, JSONObject.toJSONString(contactUs),ucenterConfig.getEmailExTime());
     }
 
     @Override

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

@@ -253,6 +253,7 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
     @Override
     public Boolean sendContactUs(String email,String callBackUrl) {
         MailTemplate mailTemplate = this.getTemplateEn(12);
+        //<a href="{callBackUrl}" target="_blank" rel="noopener">{callBackUrl}</a>
         if(mailTemplate != null){
             String msg = mailTemplate.getMsg();
             if(StringUtils.isNotBlank(callBackUrl)){
@@ -263,6 +264,12 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
        return sendMail(email,mailTemplate,null);
     }
 
+    @Override
+    public void sendContactUs2(String email) {
+        MailTemplate mailTemplate = this.getTemplateEn(13);
+        sendMail(email,mailTemplate,null);
+    }
+
     public  String getMemberLeversMsg(String memberLevels){
         switch (memberLevels){
             case "PR" :return "PREMIUM";