修改线上配置

@@ -100,7 +100,8 @@ public class GrassUserAttentionListener extends AbstractMqListener<GrassUserAtte
     protected Object checkData(GrassUserAttention sourceObject, String action) {
     protected Object checkData(GrassUserAttention sourceObject, String action) {
         //grass_user_attention.attention_type取0时public_user_attention.target_id取值：
         //grass_user_attention.attention_type取0时public_user_attention.target_id取值：
         //select id from public_topic where relate_id = #{grass_user_attention.topic_id} and src_channel = 1
         //select id from public_topic where relate_id = #{grass_user_attention.topic_id} and src_channel = 1
-        if (ServiceConstant.Grass_User_Attention.ATTENTION_TYPE_TOPIC == sourceObject.getAttentionType()) {
+        if (sourceObject.getAttentionType() != null &&
+                ServiceConstant.Grass_User_Attention.ATTENTION_TYPE_TOPIC == sourceObject.getAttentionType()) {
             return publicTopicService.findTopicIdByRelateIdAndSrcChannel(sourceObject.getTopicId(),
             return publicTopicService.findTopicIdByRelateIdAndSrcChannel(sourceObject.getTopicId(),
                     ServiceConstant.SRCCHANNEL_TYPE.YOHO_GRASS);
                     ServiceConstant.SRCCHANNEL_TYPE.YOHO_GRASS);
         }
         }

 rabbitmq:
 rabbitmq:
   server: yohoops-rabbit-common-service
   server: yohoops-rabbit-common-service
   port: 5672
   port: 5672
-  username: "admin1"
-  password: "123qwe"
+  username: "yhb_mq"
+  password: "yhb_mq"
   exchange: "yoho_datasync"
   exchange: "yoho_datasync"
   virtualHost: "/datasync"
   virtualHost: "/datasync"