Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java

@@ -68,4 +68,33 @@ public class MQConst {
             return desc;
         }
     }
+
+
+    public enum SweetQueue {
+        artists_watch("sweet:stream:rk.artists.watch", "group.artists.watch", "艺人-想看"),
+        artists_signature("sweet:stream:rk.artists.signature", "group.artists.signature", "艺人-签售通知"),
+        ;
+
+        private final String key;
+        private final String group;
+        private final String desc;
+
+        SweetQueue(String key, String group, String desc) {
+            this.key = key;
+            this.group = group;
+            this.desc = desc;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public String getGroup() {
+            return group;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+    }
 }

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

@@ -47,8 +47,6 @@ liquidnet:
         pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
         callback: http://devadam.zhengzai.tv/adam/member/order/callback
-      url-service:
-        url: http://devservice.zhengzai.tv
     kylin:
       url-pay:
         pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay

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

@@ -47,8 +47,6 @@ liquidnet:
         pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
         callback: http://testadam.zhengzai.tv/adam/member/order/callback
-      url-service:
-        url: http://testservice.zhengzai.tv
     kylin:
       url-pay:
         pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml

@@ -21,8 +21,6 @@ liquidnet:
     pay: ${liquidnet.service.adam.url-pay.pay}
     check: ${liquidnet.service.adam.url-pay.check}
     callback: ${liquidnet.service.adam.url-pay.callback}
-  url-service:
-    url: ${liquidnet.service.adam.url-service.url}
   reviewer:
     app-login:
       mobile: 13724286255

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -21,8 +21,6 @@ liquidnet:
     pay: ${liquidnet.service.adam.url-pay.pay}
     check: ${liquidnet.service.adam.url-pay.check}
     callback: ${liquidnet.service.adam.url-pay.callback}
-  url-service:
-    url: ${liquidnet.service.adam.url-service.url}
   reviewer:
     app-login:
       mobile: 13724286255

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java

@@ -21,6 +21,7 @@ import com.liquidnet.service.platform.utils.PerformanceVoTask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.util.DigestUtils;
 
 import java.math.BigDecimal;
 import java.sql.Connection;
@@ -868,7 +869,7 @@ public class DataImpl {
                 checkUserVo.setMerchantId(checkUser.getMerchantId());
                 checkUserVo.setMobile(checkUser.getMobile());
                 checkUserVo.setName(checkUser.getName());
-                checkUserVo.setPwd(checkUser.getMobile());
+                checkUserVo.setPwd(DigestUtils.md5DigestAsHex(StringUtil.right(checkUser.getMobile(), 8).getBytes()));
                 checkUserVo.setStatus("1");
 
                 checkUserList.add(checkUser);

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/ServiceSweetApplication.java

-package com.liquidnet.service.sweet;
+package com.liquidnet.service;
 
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -5,11 +5,14 @@ package com.liquidnet.service.sweet.constant;
  */
 public class SweetConstant {
 
-    public final static String REDIS_KEY_SWEET_MANUAL_PUSH_LIST="sweet:manual:pushList";
-    public final static String REDIS_KEY_SWEET_MANUAL_TIME_LIST="sweet:manual:timeList:manual:";
-    public final static String REDIS_KEY_SWEET_MANUAL_NOTIFY_LIST="sweet:manual:notify:manual:";
-    public final static String REDIS_KEY_SWEET_MANUAL_RICH_TEXT="sweet:manual:richText:manual:";
-    public final static String REDIS_KEY_SWEET_MANUAL_SORT="sweet:manual:sort:manual:";
+    public final static String REDIS_KEY_SWEET_MANUAL_PUSH_LIST = "sweet:manual:pushList";
+    public final static String REDIS_KEY_SWEET_MANUAL_TIME_LIST = "sweet:manual:timeList:manual:";
+    public final static String REDIS_KEY_SWEET_MANUAL_NOTIFY_LIST = "sweet:manual:notify:manual:";
+    public final static String REDIS_KEY_SWEET_MANUAL_RICH_TEXT = "sweet:manual:richText:manual:";
+    public final static String REDIS_KEY_SWEET_MANUAL_SORT = "sweet:manual:sort:manual:";
+
+    public final static String REDIS_KEY_SWEET_ARTISTS_WATCH = "sweet:artists:watch:uid:";
+    public final static String REDIS_KEY_SWEET_ARTISTS_SIGN = "sweet:artists:sign:uid:";
 
     public enum ManualPosition {
         POSITION_1("艺人"),

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/QueueUtils.java

+package com.liquidnet.service.sweet.utils;
+
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.stream.StreamRecords;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+
+@Component
+public class QueueUtils {
+
+//    @Autowired
+//    private RabbitTemplate rabbitTemplate;
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+
+//    /**
+//     * 发送消息 - RABBIT
+//     *
+//     * @param exchange 交换机
+//     * @param routeKey 路径
+//     * @param jsonMsg  Json字符串
+//     */
+//    public void sendMsgByRabbit(String exchange, String routeKey, String jsonMsg) {
+//        rabbitTemplate.convertAndSend(exchange, routeKey, jsonMsg);
+//    }
+
+    /**
+     * 发送消息 - REDIS
+     *
+     * @param streamKey Redis消费Key
+     * @param jsonMsg   Json字符串
+     */
+    public void sendMsgByRedis(String streamKey, String jsonMsg) {
+        HashMap<String, String> map = CollectionUtil.mapStringString();
+        map.put("message", jsonMsg);
+        stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -13,6 +13,8 @@ import com.liquidnet.service.sweet.entity.SweetManualNotify;
 import com.liquidnet.service.sweet.entity.SweetManualSort;
 import com.liquidnet.service.sweet.entity.SweetRichtext;
 import com.liquidnet.service.sweet.mapper.*;
+import com.liquidnet.service.sweet.vo.SweetArtistsSignVo;
+import com.liquidnet.service.sweet.vo.SweetArtistsWatchVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -75,7 +77,7 @@ public class RedisDataUtils {
         return returnData;
     }
 
-    public SweetManualArtistList2Dto setTimeList(String manualId,String content) {
+    public SweetManualArtistList2Dto setTimeList(String manualId, String content) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_TIME_LIST.concat(manualId);
         HashMap<String, Object> map = CollectionUtil.mapStringObject();
         map.put("manualId", manualId);
@@ -107,18 +109,18 @@ public class RedisDataUtils {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_TIME_LIST.concat(manualId);
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
-            return setTimeList(manualId,null);
+            return setTimeList(manualId, null);
         } else {
             return (SweetManualArtistList2Dto) obj;
         }
     }
 
-    public SweetRichtext setRichTextRedisData(String manualId, String type,SweetRichtext content) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_RICH_TEXT.concat(manualId).concat(":type:"+type);
+    public SweetRichtext setRichTextRedisData(String manualId, String type, SweetRichtext content) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_RICH_TEXT.concat(manualId).concat(":type:" + type);
         SweetRichtext sweetRichtext;
-        if(content!=null){
+        if (content != null) {
             sweetRichtext = content;
-        }else{
+        } else {
             sweetRichtext = sweetRichtextMapper.selectOne(Wrappers.lambdaQuery(SweetRichtext.class).eq(SweetRichtext::getManualId, manualId).eq(SweetRichtext::getType, type));
         }
         redisUtil.set(redisKey, sweetRichtext);
@@ -127,10 +129,10 @@ public class RedisDataUtils {
 
     //获取富文本详情
     public SweetRichtext getRichTextRedisData(String manualId, String type) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_RICH_TEXT.concat(manualId).concat(":type:"+type);
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_RICH_TEXT.concat(manualId).concat(":type:" + type);
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
-            return setRichTextRedisData(manualId, type,null);
+            return setRichTextRedisData(manualId, type, null);
         } else {
             return (SweetRichtext) obj;
         }
@@ -193,4 +195,42 @@ public class RedisDataUtils {
     public void deleteSortRedisData(String manualId) {
         redisUtil.del(SweetConstant.REDIS_KEY_SWEET_MANUAL_SORT.concat(manualId));//列表
     }
+
+    public void setArtistsWatchRedisVo(String uid, String artistsId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_WATCH.concat(uid);
+        SweetArtistsWatchVo vo = getArtistsWatchRedisVo(uid);
+        vo.setUid(uid);
+        vo.getArtistsIdList().add(artistsId);
+        redisUtil.set(redisKey, vo);
+    }
+
+    //获取想看
+    public SweetArtistsWatchVo getArtistsWatchRedisVo(String uid) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_WATCH.concat(uid);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return SweetArtistsWatchVo.getNew();
+        } else {
+            return (SweetArtistsWatchVo) obj;
+        }
+    }
+
+    public void setArtistsSignRedisVo(String uid, String artistsId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_SIGN.concat(uid);
+        SweetArtistsSignVo vo = getArtistsSignRedisVo(uid);
+        vo.setUid(uid);
+        vo.getArtistsIdList().add(artistsId);
+        redisUtil.set(redisKey, vo);
+    }
+
+    //获取 签售
+    public SweetArtistsSignVo getArtistsSignRedisVo(String uid) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_SIGN.concat(uid);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return SweetArtistsSignVo.getNew();
+        } else {
+            return (SweetArtistsSignVo) obj;
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/vo/SweetArtistsSignVo.java

+package com.liquidnet.service.sweet.vo;
+
+import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
+import lombok.Data;
+
+import java.util.ArrayList;
+
+@Data
+public class SweetArtistsSignVo implements Cloneable{
+    private String uid;
+    private ArrayList<String> artistsIdList;
+
+    private static final SweetArtistsSignVo obj = new SweetArtistsSignVo();
+    public static SweetArtistsSignVo getNew() {
+        try {
+            return (SweetArtistsSignVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetArtistsSignVo();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/vo/SweetArtistsWatchVo.java

+package com.liquidnet.service.sweet.vo;
+
+import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
+import lombok.Data;
+
+import java.util.ArrayList;
+
+@Data
+public class SweetArtistsWatchVo implements Cloneable {
+    private String uid;
+    private ArrayList<String> artistsIdList;
+
+    private static final SweetArtistsWatchVo obj = new SweetArtistsWatchVo();
+    public static SweetArtistsWatchVo getNew() {
+        try {
+            return (SweetArtistsWatchVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetArtistsWatchVo();
+        }
+    }
+}