From 25a45ac94f880a7fa57115378e4b08870e6e6088 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 23 Jun 2020 22:01:10 +0800
Subject: [PATCH] =?UTF-8?q?message=E5=8D=87=E7=BA=A7=EF=BC=9Aadd=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=89=8B=E6=9C=BA=E5=8F=B7=E3=80=81=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-message-server/deploy/docker-compose-dev.yml |  2 +-
 .../epmet-message/epmet-message-server/pom.xml         |  2 +-
 .../src/main/java/com/epmet/sms/QcloudSmsService.java  | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
index 247bcb1da8..adc35709b2 100644
--- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-message-server:
     container_name: epmet-message-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.20
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.21
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml
index af934e124c..01a6bc6f5f 100644
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.20</version>
+    <version>0.3.21</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-message</artifactId>
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/QcloudSmsService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/QcloudSmsService.java
index 7c16e641dd..a3e33d6557 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/QcloudSmsService.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/QcloudSmsService.java
@@ -17,6 +17,7 @@ import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.enums.PlatformEnum;
 import com.epmet.exception.ModuleErrorCode;
 import com.epmet.service.SysSmsService;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -67,4 +68,13 @@ public class QcloudSmsService extends AbstractSmsService {
             throw new RenException(ModuleErrorCode.SEND_SMS_ERROR, result.errMsg);
         }
     }
+
+    @Override
+    public void sendSmsByAliyunTemplateCode(String mobile, LinkedHashMap<String, String> params,String aliyunTemplateCode) {
+        if(StringUtils.isNotBlank(aliyunTemplateCode)){
+            this.sendSms(mobile, params, config.getAliyunSignName(), aliyunTemplateCode);
+            return;
+        }
+        this.sendSms(mobile, params, config.getAliyunSignName(), config.getAliyunTemplateCode());
+    }
 }