补全接口

升级hazelcast

pom.xml

@@ -61,8 +61,8 @@
         </dependency>
         <dependency>
             <groupId>com.hazelcast</groupId>
-            <artifactId>hazelcast-all</artifactId>
+            <artifactId>hazelcast</artifactId>
-            <version>4.2.2</version>
+            <version>5.3.8</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

src/main/java/com/upchina/common/config/cache/HazelcastConfiguration.java

@@ -92,8 +92,9 @@ public class HazelcastConfiguration {
         config.getNetworkConfig().setPort(serverPort);
         // 如果目标缓存端口被占用，禁止重试其他端口
         config.getNetworkConfig().setPortAutoIncrement(false);
-        config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false);
+        config.getNetworkConfig().getJoin().getAutoDetectionConfig().setEnabled(false);
         config.getNetworkConfig().getJoin().getTcpIpConfig().setEnabled(true).setMembers(memberList);
+        config.getJetConfig().setEnabled(true);
         String clusterName = "hazelcast-cluster";
         String instanceName = clusterName + "." + "localIP";
         config.setInstanceName(instanceName);
@@ -102,7 +103,7 @@ public class HazelcastConfiguration {
             config.addMapConfig(new MapConfig()
                             .setName(entry.getKey())
                             .setEvictionConfig(new EvictionConfig()
-                                    .setEvictionPolicy(EvictionPolicy.LFU)
+                                    .setEvictionPolicy(EvictionPolicy.LRU)
                                     .setSize(entry.getValue().maxSize)
                                     .setMaxSizePolicy(MaxSizePolicy.PER_NODE))
                             .setTimeToLiveSeconds(entry.getValue().liveSeconds)

src/main/java/com/upchina/group/mapper/GroupMessageMapper.java

@@ -2,10 +2,8 @@ package com.upchina.group.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.upchina.group.entity.GroupMessage;
-import com.upchina.group.entity.GroupMessageRead;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/com/upchina/group/query/info/SetNoticeQuery.java

@@ -1,13 +1,11 @@
 package com.upchina.group.query.info;
 
-import java.time.LocalDateTime;
+import com.upchina.group.entity.GroupInfo;
+import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-
+import java.time.LocalDateTime;
-import com.upchina.group.entity.GroupInfo;
-
-import io.swagger.annotations.ApiModelProperty;
 
 public class SetNoticeQuery {
 

src/main/java/com/upchina/group/query/message/GroupMessageRecommendQuery.java

@@ -1,14 +1,12 @@
 package com.upchina.group.query.message;
 
-import java.time.LocalDateTime;
+import com.upchina.group.entity.GroupMessage;
+import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-
+import java.time.LocalDateTime;
-import com.upchina.group.entity.GroupMessage;
-
-import io.swagger.annotations.ApiModelProperty;
 
 public class GroupMessageRecommendQuery {
 

src/main/java/com/upchina/group/query/message/ListGroupMessageQuery.java

@@ -1,11 +1,11 @@
 package com.upchina.group.query.message;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
-import io.swagger.annotations.ApiModelProperty;
-
 public class ListGroupMessageQuery {
 
     @ApiModelProperty(value = "交易圈ID", required = true)

src/main/java/com/upchina/group/service/common/GroupCacheService.java

@@ -15,7 +15,6 @@ import com.upchina.group.constant.QueryGroupMessageType;
 import com.upchina.group.entity.GroupMessage;
 import com.upchina.group.entity.GroupMessageRead;
 import com.upchina.group.entity.GroupUserFlow;
-import com.upchina.group.mapper.GroupInfoMapper;
 import com.upchina.group.mapper.GroupMessageMapper;
 import com.upchina.group.mapper.GroupMessageReadMapper;
 import com.upchina.group.mapper.GroupUserFlowMapper;
@@ -56,6 +55,7 @@ public class GroupCacheService {
             LambdaQueryWrapper<GroupMessage> wrapper = Wrappers.<GroupMessage>lambdaQuery()
                     .select(GroupMessage::getId)
                     .eq(GroupMessage::getGroupId, groupId)
+                    .eq(!QueryGroupMessageType.PRIVATE.equals(type), GroupMessage::getInteractiveType, GroupInteractiveType.GROUP.value)
                     .in(QueryGroupMessageType.ADVISOR.equals(type), GroupMessage::getUserType, GroupMessageUserType.ADVISOR.value, GroupMessageUserType.ASSISTANT.value)
                     .eq(QueryGroupMessageType.CUSTOMER.equals(type), GroupMessage::getUserType, GroupMessageUserType.CUSTOMER.value)
                     .eq(QueryGroupMessageType.SELECTED.equals(type), GroupMessage::getIsRecommend, IsOrNot.IS.value)

src/main/java/com/upchina/group/service/common/GroupCommonService.java

@@ -18,7 +18,6 @@ import com.upchina.group.mapper.*;
 import com.upchina.group.vo.GroupVO;
 import com.upchina.group.vo.message.GroupMessageReadVO;
 import com.upchina.group.vo.message.GroupMessageVO;
-import com.upchina.video.schedule.CollectTask;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;