Merge branch 'jxl_1209_wenan' into pre

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -34,31 +34,31 @@ liquidnet:
     kylin:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
+      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
       port: 6380
       password: PO@B!Iud32
     dragon:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
+      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
       port: 6380
       password: PO@B!Iud32
     sweet:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
+      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
       port: 6380
       password: PO@B!Iud32
     adam:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
+      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
       port: 6380
       password: PO@B!Iud32
     candy:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
+      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
       port: 6380
       password: PO@B!Iud32
   mongodb:

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/TextMsgHandler.java

@@ -49,9 +49,7 @@ public class TextMsgHandler implements WxMpMessageHandler {
         if (StringUtil.trim(content).equals("白日梦")) {
             redisUtils.setStrawberryPosterClick(wxMessage.getFromUser(), 10 * 60);
 
-            return WxMpXmlOutMessage.TEXT().content("你梦中的草莓音乐节会有怎样的阵容？\n" +
-                            "不如做一次白日梦，挑选你心水的草莓阵容！\n" +
-                            "参与活动之前，请先告诉我你的昵称！（直接在对话框输入即可\uD83D\uDC47，9个字以内）")
+            return WxMpXmlOutMessage.TEXT().content("参与活动之前，请先告诉我你的昵称！（直接在对话框输入即可\uD83D\uDC47，9个字以内）")
                     .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
                     .build();
         } else if (redisUtils.getStrawberryPosterClick(openId)) {