Ver código fonte

原始代码 2022/10/8

lrj 5 meses atrás
pai
commit
a3fd2ee8f9

+ 4 - 0
pom.xml

@@ -75,6 +75,10 @@
             <artifactId>commons-compress</artifactId>
             <version>1.21</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

+ 4 - 1
src/main/java/com/example/common/Service/EmailService.java

@@ -5,7 +5,10 @@ import com.alibaba.fastjson.JSON;
 import com.example.common.Util.MailUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -22,7 +25,7 @@ public class EmailService {
     private final MailUtils mailUtils;
 
     @RabbitListener(queues = "${queueName}")
-    public void sendEmailMessage(Map<String,Object> map ){
+    public void sendEmailMessage( Map<String, Object> map ){
         System.out.println(map.get("email"));
         mailUtils.sendEmailMessage(map);
     }

+ 8 - 1
src/main/java/com/example/common/common/RabbitMQConfig.java

@@ -3,11 +3,14 @@ package com.example.common.common;
 
 
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.*;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
@@ -61,7 +64,6 @@ public class RabbitMQConfig {
         return rabbitTemplate;
     }
 
-
     @Bean
     public Queue queue(){
         return new Queue(MailConstants.MAIL_QUEUE_NAME);
@@ -74,4 +76,9 @@ public class RabbitMQConfig {
     public Binding binding(){
         return BindingBuilder.bind(queue()).to(directExchange()).with(MailConstants.MAIL_ROUTING_KEY_NAME);
     }
+
+    @Bean
+    public Jackson2JsonMessageConverter messageConverter() {
+        return new Jackson2JsonMessageConverter();
+    }
 }

+ 3 - 1
src/main/resources/application-dev.yml

@@ -10,4 +10,6 @@ spring: # rabbitmq
         acknowledge-mode: none
 queueName: emailProd.queue
 
-shortMessageQueue: shortMessage.queue
+shortMessageQueue: shortMessage.queue
+authorUrl: http://192.168.0.56:8880
+FMSUrl: http://192.168.2.24:8803

+ 3 - 1
src/main/resources/application-prodNetIn.yml

@@ -7,4 +7,6 @@ spring: # rabbitmq
     listener:
       simple:
         acknowledge-mode: none
-queueName: emailProd.queue
+queueName: emailProd.queue
+authorUrl: http://192.168.0.56:8880
+FMSUrl: http://localhost:8803

+ 1 - 2
src/main/resources/application.yml

@@ -31,6 +31,5 @@ spring:
   # 设置手动确认(ack) Queue -> C
 #  rabbitmq.listener.simple.acknowledge-mode: manual
 #  rabbitmq.listener.simple.prefetch: 100
-authorUrl: http://192.168.0.56:8880
-FMSUrl: http://192.168.2.24:8803
+
 

+ 53 - 0
src/main/resources/mail/common.html

@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="description" content="email code">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>邮件</title>
+</head>
+<!--邮箱验证码模板-->
+<body>
+<div style="background-color:#ECECEC; padding: 35px;">
+    <table style="width: 800px;height: 100%; margin: 0 auto; text-align: left; position: relative; border-radius: 5px;font-size: 14px; font-family:微软雅黑, 黑体,serif; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0 0 5px; border-collapse: collapse; background: #fff initial initial initial initial;">
+        <tbody>
+        <tr>
+            <th style="height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: RGB(148,0,211); background-color: RGB(148,0,211); border-radius: 5px 5px 0 0;">
+                <img src="cid:logo" alt="logo" style="width: 110px; height: 35px;">
+            </th>
+        </tr>
+        <tr>
+            <td style="word-break:break-all">
+                <div style="padding:25px 35px 40px; background-color:#fff;opacity:0.8;">
+                    <h2 style="margin: 5px 0; ">
+                        <span style="line-height: 20px;  color: #333333; ">
+                            <span style="line-height: 22px; font-size: medium; ">
+
+                            </span>
+                        </span>
+                    </h2>
+                    <!-- 中文 -->
+                    <p>{0}</p>
+                    </p>
+                    <br>
+                  
+    
+                    <div style="width:100%;margin:0 auto;">
+                        <div style="padding:10px 10px 0;border-top:1px solid #ccc;color:#747474;margin-bottom:20px;line-height:1.3em;font-size:12px;">
+                            <p>威世博团队</p>
+                            <p>如果您有其他使用上的问题,请联系我们:********</p>
+                            <br>
+                            <p>此为系统邮件,请勿回复<br>Please do not reply to this system email
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+</div>
+</body>
+</html>
+

+ 43 - 0
src/main/resources/mail/sendMatchCasePerson.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="description" content="email code">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>邮件</title>
+</head>
+<!--上传文件发送客户邮件模板-->
+<body>
+<div style="border-radius: 5px;width: 800px;margin: 0 auto;text-align: left; font-size: 14px; font-family:微软雅黑, 黑体,serif; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0 0 5px; border-collapse: collapse; background: #fff initial initial initial initial;">
+    <div style="background-color: #316192;height: 35px; line-height: 35px; padding: 15px 35px;">
+        <img style="width:70px;height: 35px;"  src="cid:logo" alt="logo" srcset="">
+    </div>
+    <div style="padding:25px 35px 40px;background-color:#fff;opacity:0.8;">
+        <div class="body">
+            <div style="line-height: 22px; font-size: medium;color: #333333;font-weight: bold;">Dear {0}:</div>
+            <div style="font-size: 14px;margin-top: 15px;text-indent: 2em">
+                您好!
+            </div>
+            <div style="font-size: 14px;margin-top: 15px;text-indent: 2em">
+                案件{1}已分配给您,请您尽快处理。
+            </div>
+            <div style="font-size: 14px;margin-top: 15px;text-indent: 2em">
+                详情可登陆小世系统查看<a style="color: #ff8c00;" href="{2}" target="_blank">{1}</a>报告。
+            </div>
+        </div>
+        <div style="margin-top:20px;padding: 10px;padding-left: 0;border-top: 1px solid #ccc;color:#747474;font-size: 12px; line-height: 25px;">
+            <div>如果您有系统相关问题请联系 <span style="color: #551A8B;">朱鎏(电话:18856669949 邮箱:zhuliu@china-wispro.com)</span></div>
+            <div>如果您有数据相关问题请联系 <span style="color: #551A8B;">国海秀(电话:18124613361 邮箱:guohaixiu@china-wispro.com)</span></div>
+            <div style="margin-top: 30px;line-height: 1.3em;">
+                <div>此为系统邮件,请勿回复</div>
+                <div>Please do not reply to this system email</div>
+            </div>
+        </div>
+    </div>
+    
+</div>
+</body>
+<style>
+</style>
+</html>

+ 1 - 1
src/main/resources/mail/sysCycleStart.html

@@ -28,7 +28,7 @@
                         </span>
                     </h2>
                     <!-- 中文 -->
-                    <p>系统定时任务开始执行</p>
+                    <p>{0}</p>
                     </p>
                     <br>