Merge branch 'pre' into 'master'

猫登天空上线修改

See merge request !128

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatMaoDengController.java

@@ -34,7 +34,7 @@ public class SweetWechatMaoDengController {
     @GetMapping("/backData")
     @ApiOperation("返回文字图片")
     public ResponseDto<SweetMaoDengVo> backDatas(String userId, String maoId) {
-        SweetWechatUsersVo wechatUsers = redisUtils.getSweetWechatUsersOfUnionId(userId, 1);
+        SweetWechatUsersVo wechatUsers = redisUtils.getSweetWechatUsersOfUnionId(userId, 2);
         if (null == wechatUsers) {
             return ResponseDto.failure("获取信息失败");
         }

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

@@ -109,9 +109,9 @@ public class MaoDengImageHandler implements WxMpMessageHandler {
             WxMpKefuMessage message = WxMpKefuMessage.MINIPROGRAMPAGE()
                     .appId(maConfigure.getWxMaAppid(4))
                     .pagePath("pages/webview?query=catActivity&maoId=" + maoId) //小程序路径
-                    .thumbMediaId("ov08q51In7bXX6tXv7Few-ud2-J-hyXnDC5NCNSfc_4") // 正在
+//                    .thumbMediaId("ov08q51In7bXX6tXv7Few-ud2-J-hyXnDC5NCNSfc_4") // 正在
 //                    .thumbMediaId("ttUDFdcsOTnGFPBt5xp-vaYe_hS9Jae5C_YUboXmb4c") //test
-//                    .thumbMediaId("OFjnPjluDGoHH1KOAdxQ_iMyWpBe_c48V40LlN6VmAQ") //图片地址
+                    .thumbMediaId("OFjnPjluDGoHH1KOAdxQ_iMyWpBe_c48V40LlN6VmAQ") //图片地址
                     .title("在猫登天空，每一只猫咪都有自己的隐藏音乐技能！")
                     .toUser(wxMessage.getFromUser())
                     .build();

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatMaoDengServiceImpl.java

@@ -33,7 +33,7 @@ public class SweetWechatMaoDengServiceImpl {
     public ResponseDto addBuilderImg(String userId, String imgUrl, String maoId) {
         LocalDateTime localDateTime = LocalDateTime.now(); //生成创建时间
         try {
-            SweetWechatUsersVo wechatUsers = redisUtils.getSweetWechatUsersOfUnionId(userId, 1);
+            SweetWechatUsersVo wechatUsers = redisUtils.getSweetWechatUsersOfUnionId(userId, 2);
             if (null == wechatUsers) {
                 return ResponseDto.failure("请求失败");
             }