询盘发送邮件

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/EnquiryEmailMessageServiceImpl.java

@@ -210,12 +210,8 @@ public class EnquiryEmailMessageServiceImpl extends ServiceImpl<EnquiryEmailMess
         AdwebEnquiryForm adwebEnquiryForm = adwebEnquiryFormService.getByEnquiryId(enquiryId);
 
         List<EnquiryFormItem> formItems = new ArrayList<>();
-        //wpforms
-        if("wpforms".equals(adwebEnquiryForm.getPluginName())){
-            formItems = dealWpformEnquiryForm(adwebEnquiryForm);
-        }else{
-            formItems = dealElementerEnquiryForm(adwebEnquiryForm);
-        }
+
+        formItems = dealWpformEnquiryForm(adwebEnquiryForm);
 
         for (int i = 0; i < formItems.size(); i++) {
             EnquiryFormItem enquiryFormItem = formItems.get(i);
@@ -355,50 +351,6 @@ public class EnquiryEmailMessageServiceImpl extends ServiceImpl<EnquiryEmailMess
         formItems.sort(Comparator.comparingInt(EnquiryFormItem::getSort));
         return formItems;
     }
-
-    /**
-     * 处理询盘发送信息
-     * elementer
-     */
-    private List<EnquiryFormItem> dealElementerEnquiryForm(AdwebEnquiryForm adwebEnquiryForm){
-        String form = adwebEnquiryForm.getForm();
-        Map<String, String> formMap = FastJsonUtil.parseObject(form, Map.class);
-        List<EnquiryFormItem> formItems = new ArrayList<>();
-        for (String key : formMap.keySet()) {
-            String value = formMap.get(key);
-            EnquiryFormItem enquiryFormItem = new EnquiryFormItem();
-            if(key.contains("phone") || key.contains("Phone")){
-                enquiryFormItem.setSort(1);
-            }else if (key.contains("email") || key.contains("Email")){
-                enquiryFormItem.setSort(2);
-            }else if (key.contains("ip") || key.contains("Ip")){
-                enquiryFormItem.setSort(3);
-            }else if (key.contains("message") || key.contains("Message")){
-                enquiryFormItem.setSort(4);
-            }else if (key.contains("page") || key.contains("Page")){
-                enquiryFormItem.setSort(5);
-            }else if (key.contains("name") || key.contains("Name")){
-                enquiryFormItem.setSort(6);
-            }else if (key.contains("company") || key.contains("Company")){
-                enquiryFormItem.setSort(7);
-            }else {
-                enquiryFormItem.setSort(9);
-            }
-            enquiryFormItem.setName(key);
-            enquiryFormItem.setValue(value);
-            formItems.add(enquiryFormItem);
-        }
-
-        //国家信息
-        EnquiryFormItem countryForm = new EnquiryFormItem();
-        countryForm.setSort(8);
-        countryForm.setName("Country");
-        countryForm.setValue(adwebEnquiryForm.getCountry());
-        formItems.add(countryForm);
-
-        formItems.sort(Comparator.comparingInt(EnquiryFormItem::getSort));
-        return formItems;
-    }
 }
 
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/system/controller/SystemAdwebController.java

@@ -2,11 +2,14 @@ package org.jeecg.modules.adweb.system.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.adweb.common.Jedis.ObjectUtil;
+import org.jeecg.modules.adweb.common.util.JedisUtil;
 import org.jeecg.modules.adweb.enquiry.constant.EnquiryConstants;
 import org.jeecg.modules.adweb.enquiry.service.EnquiryRedisService;
 import org.jeecg.modules.adweb.enquiry.service.IEnquiryEmailMessageService;
@@ -21,16 +24,17 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * @Description: 网站营销方案套餐表
+ * @Description: adweb 系统api
  * @Author: jeecg-boot
  * @Date: 2024-09-27
  * @Version: V1.0
  */
-@Tag(name = "网站营销方案套餐表")
+@Tag(name = "adweb 系统api")
 @RestController
 @RequestMapping("/adweb/system")
 @Slf4j
@@ -95,12 +99,15 @@ public class SystemAdwebController {
      * @return
      */
     @GetMapping("/testSendEmail")
-    public Result<?> testSendEmail() throws JsonProcessingException {
-//        ObjectMapper objectMapper = new ObjectMapper();
-//        JedisUtil.lpush(redisKey, objectMapper.writeValueAsBytes(1311742895508602880L));
-//        JedisUtil.publishMsg(EnquiryConstants.ENQUIRY_EMAIL_CHANNEL, EnquiryConstants.ENQUIRY_EMAIL);
+    public Result<?> testSendEmail() {
+        try {
+            JedisUtil.lpush(redisKey, ObjectUtil.object2Bytes(1311742895508602880L));
+            JedisUtil.publishMsg(EnquiryConstants.ENQUIRY_EMAIL_CHANNEL, EnquiryConstants.ENQUIRY_EMAIL);
+        } catch (IOException e) {
+           log.info("测试发送监听发送邮件的消息失败");
+        }
 
-        enquiryEmailMessageService.sendEnquiryEmail(1311742895508602880L);
+//        enquiryEmailMessageService.sendEnquiryEmail(1311742895508602880L);
 
         return Result.OK("");
     }

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -53,9 +53,9 @@ spring:
       max-file-size: 10MB
       max-request-size: 10MB
   mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
+    host: smtp.feishu.cn
+    username: notification@advich.com
+    password: tc6Web2Djn3ZsVdo
     properties:
       mail:
         smtp:
@@ -63,6 +63,7 @@ spring:
           starttls:
             enable: true
             required: true
+    port: 587
   ## quartz定时任务,采用数据库方式
   quartz:
     job-store-type: jdbc

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -53,9 +53,9 @@ spring:
       max-file-size: 10MB
       max-request-size: 10MB
   mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
+    host: smtp.feishu.cn
+    username: notification@advich.com
+    password: tc6Web2Djn3ZsVdo
     properties:
       mail:
         smtp:
@@ -63,6 +63,7 @@ spring:
           starttls:
             enable: true
             required: true
+    port: 587
   ## quartz定时任务,采用数据库方式
   quartz:
     job-store-type: jdbc