From 208be5ebd341674f5763bbfedf0e908df6a15d5b Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 7 Nov 2022 15:33:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8F=90=E9=86=92=E6=8E=92?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/kafka/KafkaConsumer.java              | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/kafka/KafkaConsumer.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/kafka/KafkaConsumer.java
index 7482ded..ace1872 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/kafka/KafkaConsumer.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/kafka/KafkaConsumer.java
@@ -21,6 +21,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.support.Acknowledgment;
 import org.springframework.kafka.support.KafkaHeaders;
@@ -32,6 +34,7 @@ import java.time.LocalTime;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Properties;
 
 @Component
 @Slf4j
@@ -123,9 +126,21 @@ public class KafkaConsumer {
                 messageListService.saveOrUpdateDto(messageListDto);
                 // 3、极光推送
                 // JPushServer.sendPushAlias("联系客户", MessageFormat.format("请联系 {0} 客户", vo.getName()), MessageTypeEnum.CUSTOMER.getMsgTypeSid(), "客户", id);
-                JPushServer.sendPushAlias(kafkaMessage.getMsgTitle(),
+                /*JPushServer.sendPushAlias(kafkaMessage.getMsgTitle(),
                         StringUtils.isBlank(vo.getRemind_remark()) ? kafkaMessage.getMsgContent() : kafkaMessage.getMsgContent(),
-                        MessageTypeEnum.CUSTOMER.getMsgTypeSid(), "客户", id);
+                        MessageTypeEnum.CUSTOMER.getMsgTypeSid(), "客户", id);*/
+                YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean();
+                factoryBean.setResources(new ClassPathResource("application.yml"));
+                Properties properties = factoryBean.getObject();
+                if ("pro".equals(properties.get("spring.profiles.active"))) {
+                    JPushServer.sendPushAlias(kafkaMessage.getMsgTitle(),
+                            StringUtils.isBlank(vo.getRemind_remark()) ? kafkaMessage.getMsgContent() : kafkaMessage.getMsgContent(),
+                            MessageTypeEnum.CUSTOMER.getMsgTypeSid(), "客户", id);
+                }else{
+                    JPushServer.sendPushAlias(kafkaMessage.getMsgTitle(),
+                            StringUtils.isBlank(vo.getRemind_remark()) ? kafkaMessage.getMsgContent() : kafkaMessage.getMsgContent(),
+                            MessageTypeEnum.CUSTOMER.getMsgTypeSid(), "客户", "T"+id);
+                }
             }
         }
     }