From 15ddab3aa49483932cd2fde6e43724a2c51d5df8 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 20 Oct 2022 17:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=B8=AD=E5=BF=83=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/message/MessageService.java           | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
index 31d3369..5c1441d 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
@@ -23,6 +23,8 @@ import com.yxt.messagecenter.biz.messagelist.MessageListService;
 import com.yxt.messagecenter.biz.messagetype.MessageTypeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -264,13 +266,27 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
         }
         executor.shutdown();
         //标题、内容、消息类别key、消息类别名称、
-        for (int i = 0; i < receiveIdList.size(); i++) {
-            /**
-             * msgTitle:排产申请
-             * content:xxx的排产申请
-             */
-            JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "审批中心", receiveIdList.get(i));
+        YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean();
+        factoryBean.setResources(new ClassPathResource("application.yml"));
+        Properties properties = factoryBean.getObject();
+        if ("pro".equals(properties.get("spring.profiles.active"))) {
+            for (int i = 0; i < receiveIdList.size(); i++) {
+                /**
+                 * msgTitle:排产申请
+                 * content:xxx的排产申请
+                 */
+                JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "审批中心", receiveIdList.get(i));
+            }
+        } else {
+            for (int i = 0; i < receiveIdList.size(); i++) {
+                /**
+                 * msgTitle:排产申请
+                 * content:xxx的排产申请
+                 */
+                JPushServer.sendPushAlias(msgTitle, msgContent, msgTypeSid, "审批中心", "T" + receiveIdList.get(i));
+            }
         }
+
         return rb.success().setData(msgSid);
     }
 
@@ -324,4 +340,17 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
         String msgSid = stringResultBean.getData();
         return rb.success().setMsg(msgSid);
     }
+
+    public static void main(String[] arg0) {
+        YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean();
+        factoryBean.setResources(new ClassPathResource("application.yml"));
+        Properties properties = factoryBean.getObject();
+        if ("pro".equals(properties.get("spring.profiles.active"))) {
+            System.out.println("====pro");
+        } else {
+            System.out.println("====devv");
+        }
+//        properties.keySet().forEach(key -> System.out.println(key + "=====" + properties.get(key)));
+
+    }
 }
\ No newline at end of file