From fc3774515406f1c42176e1c1e831944fbbcdea65 Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Tue, 30 Jul 2024 10:11:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../target/classes/META-INF/build-info.properties              |  5 -----
 .../com/hnac/hzims/alarm/monitor/listener/AlarmListener.java   | 10 +++++-----
 target/classes/META-INF/build-info.properties                  |  5 -----
 3 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 hzims-service-api/target/classes/META-INF/build-info.properties
 delete mode 100644 target/classes/META-INF/build-info.properties

diff --git a/hzims-service-api/target/classes/META-INF/build-info.properties b/hzims-service-api/target/classes/META-INF/build-info.properties
deleted file mode 100644
index 8fd2af4..0000000
--- a/hzims-service-api/target/classes/META-INF/build-info.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-build.artifact=hzims-service-api
-build.group=com.hnac.hzims
-build.name=hzims-service-api
-build.time=2024-07-22T06\:45\:56.469Z
-build.version=4.0.0-SNAPSHOT
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java
index cff87ff..f69399e 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java
@@ -39,14 +39,14 @@ public class AlarmListener implements IQueueConsume {
             messageService.webAppMessage(alarm);
         }
 
-        // 步骤3.短信推送
-        if(ObjectUtil.isNotEmpty(alarm.getIsShortMessage()) && alarm.getIsShortMessage() == 0){
-            messageService.shortMessage(alarm);
-        }
-
         // 步骤4.微信公众号发送
         if(ObjectUtil.isNotEmpty(alarm.getIsWxMessage()) && alarm.getIsWxMessage() == 0){
             messageService.weChatMessage(alarm);
         }
+
+        // 步骤3.短信推送
+        if(ObjectUtil.isNotEmpty(alarm.getIsShortMessage()) && alarm.getIsShortMessage() == 0){
+            messageService.shortMessage(alarm);
+        }
     }
 }
\ No newline at end of file
diff --git a/target/classes/META-INF/build-info.properties b/target/classes/META-INF/build-info.properties
deleted file mode 100644
index 92baf95..0000000
--- a/target/classes/META-INF/build-info.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-build.artifact=hzims-back
-build.group=com.hnac.hzims
-build.name=hzims-back
-build.time=2024-07-22T06\:45\:56.469Z
-build.version=4.0.0-SNAPSHOT