feat commit

网关负载功能

zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/service/RedisService.java

@@ -406,6 +406,12 @@ public class RedisService {
         setOperations.remove(key, value);
     }
 
+
+    public <T> void deleteCacheZsetValue(final String key, final T value) {
+        ZSetOperations zSetOperations = redisTemplate.opsForZSet();
+        zSetOperations.remove(key, value);
+    }
+
     /**
      * @description: 根据下标获取List中value
      * @author: LiYuan

zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/Timer/LoadObserver.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Component;
  * @Author: LiYuan
  * @CreateTime: 2024-04-17  21:53
  * @Description: 收集节点监视者
+ * @Option: 监视节点负载量来决定是否需要扩容
  * @Version: 1.0
  */
 @Component

zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/consumer/DeadQueueConsumer.java

@@ -1,8 +1,13 @@
 package com.zhilian.online.consumer;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.google.gson.JsonObject;
 import com.zhilian.common.core.constant.Constants;
 import com.zhilian.common.redis.service.RedisService;
 import com.zhilian.online.constans.OnlineConstants;
+import com.zhilian.online.domain.model.GatewayNodeInfo;
+import com.zhilian.online.load.cache.GatewayNodeInfoCache;
+import com.zhilian.online.load.cache.GatewayNodeWeightCache;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -28,6 +33,12 @@ public class DeadQueueConsumer {
     @Autowired
     private RedisService redisService;
 
+    @Autowired
+    private GatewayNodeInfoCache gatewayNodeInfoCache;
+
+    @Autowired
+    private GatewayNodeWeightCache gatewayNodeWeightCache;
+
 
     /**
      * 消费死信队列中的消息,确保车辆上线成功
@@ -36,10 +47,12 @@ public class DeadQueueConsumer {
 //    @RabbitListener(queues = RabbitConfig.DEAD_QUEUE_NAME)
     public void SecureOnline(String gatherMsg) {
         log.info("开始检查节点{}的上线状态......", gatherMsg);
+        GatewayNodeInfo gatewayNodeInfo = JSONObject.parseObject(gatherMsg, GatewayNodeInfo.class);
+
         String ipAddress = "";
         HttpURLConnection connection = null;
         try {
-            ipAddress = "http://" + ipAddress;
+            ipAddress = OnlineConstants.HTTP_PREFIX + ipAddress + OnlineConstants.FLUXMQ_INFO_URL;
             URL url = new URL(ipAddress);
             connection = (HttpURLConnection)url.openConnection();
             connection.setRequestMethod("GET");
@@ -50,10 +63,10 @@ public class DeadQueueConsumer {
             }
             if (Constants.FAIL == responseCode){
                 log.error("节点{}上线失败",gatherMsg);
+                //删除节点数据
+                gatewayNodeInfoCache.remove(gatewayNodeInfo.getNodeId());
                 //上线失败需要将该节点的负载均衡缓存删除
-                if (redisService.hasKey(OnlineConstants.NODE_TOKEN_PREFIX + "")){
+                gatewayNodeWeightCache.remove(gatewayNodeInfo);
-                    redisService.removeCacheZsetBatch(OnlineConstants.NODE_TOKEN_PREFIX + "");
-                }
             }
         } catch (Exception e) {
             log.error("节点上线失败{}",e.getMessage());

zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/domain/ApifoxModel.java

@@ -53,6 +53,16 @@ public class ApifoxModel {
      */
     private String websocketUrl;
 
+    /**
+     * 公网地址
+     */
+    private String publicIpAddress;
+
+    /**
+     * 内网地址
+     */
+    private String privateIpAddress;
+
     /**
      * 申请令牌
      */

zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/domain/EcsInstance.java

@@ -240,12 +240,12 @@ public class EcsInstance {
     /**
      * 公网IP地址
      */
-    private List<String> publicIpAddress;
+    private String publicIpAddress;
 
     /**
      * 内网IP地址
      */
-    private List<String> privateIpAddress;
+    private String privateIpAddress;
 
     /**
      * 专有网络ID

zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/load/cache/GatewayNodeWeightCache.java

@@ -45,18 +45,34 @@ public class GatewayNodeWeightCache extends GatewayCacheAbs<String > {
         return redisService.getCacheZsetScore(encode(gatewayNodeLoadKey),gatewayNodeInfo);
     }
 
-
+    /**
+     * @description:
+     * @author: LiYuan
+     * @param:
+     * @return:
+     **/
     public void put(GatewayNodeInfo gatewayNodeInfo){
         redisService.setCacheZsetValue(encode(gatewayNodeLoadKey),gatewayNodeInfo,0.0);
     }
 
+    /**
+     * @description:
+     * @author: LiYuan
+     * @param:
+     * @return:
+     **/
     public void increment(GatewayNodeInfo gatewayNodeInfo,Double score){
         redisService.incrementScore(encode(gatewayNodeLoadKey),gatewayNodeInfo,score);
     }
 
 
-
+    /**
-
+     * @description:
-
+     * @author: LiYuan
-
+     * @param:
+     * @return:
+     **/
+    public void remove(GatewayNodeInfo gatewayNodeInfo) {
+        redisService.deleteCacheZsetValue(encode(gatewayNodeLoadKey),gatewayNodeInfo);
+    }
 }

zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/service/impl/OnlineLoadCenterServiceImpl.java

@@ -7,9 +7,13 @@ import com.zhilian.common.redis.service.RedisService;
 import com.zhilian.online.config.RabbitConfig;
 import com.zhilian.online.constans.OnlineConstants;
 import com.zhilian.online.domain.ApifoxModel;
+import com.zhilian.online.domain.EcsInstance;
+import com.zhilian.online.domain.model.GatewayNodeInfo;
 import com.zhilian.online.load.cache.GatewayNodeInfoCache;
+import com.zhilian.online.load.cache.GatewayNodeWeightCache;
 import com.zhilian.online.mapper.OnlineLoadCenterMapper;
 import com.zhilian.online.service.OnlineLoadCenterService;
+import com.zhilian.online.uitls.AliyunOpenAPIUtils;
 import com.zhilian.online.uitls.MqttUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -17,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -49,6 +54,9 @@ public class OnlineLoadCenterServiceImpl implements OnlineLoadCenterService{
     @Autowired
     private RabbitTemplate rabbitTemplate;
 
+    @Autowired
+    private AliyunOpenAPIUtils aliyunOpenAPIUtils;
+
     /**
      * MQTT服务
      */
@@ -58,6 +66,9 @@ public class OnlineLoadCenterServiceImpl implements OnlineLoadCenterService{
     @Autowired
     private GatewayNodeInfoCache gatewayNodeInfoCache;
 
+    @Autowired
+    private GatewayNodeWeightCache gatewayNodeWeightCache;
+
 
     /**
      * @description: 申请注解令牌接口, 仅限内网访问
@@ -79,7 +90,6 @@ public class OnlineLoadCenterServiceImpl implements OnlineLoadCenterService{
     }
 
 
-
     /**
      * @description: 节点上线
      * @author: LiYuan
@@ -97,21 +107,26 @@ public class OnlineLoadCenterServiceImpl implements OnlineLoadCenterService{
             return Result.error("令牌错误");
         }
 
-        //为该节点创建Zset负载均衡缓存,将该节点加入List在线节点缓存
+        GatewayNodeInfo gatewayNodeInfo = generateGatewayNodeInfo(apifoxModel);
-        redisService.setCacheZsetValue(OnlineConstants.GATHER_LOAD_PREFIX, apifoxModel.getClusterId(), 0.0);
 
+        //添加节点数据缓存
+        gatewayNodeInfoCache.put(gatewayNodeInfo);
+
+        //为该节点创建Zset负载均衡缓存,将该节点加入List在线节点缓存
+        gatewayNodeWeightCache.put(gatewayNodeInfo);
 
         //向RabbitMQ||RocketMQ发送30s延迟消息,确保后续节点上线
         rabbitTemplate.convertAndSend(RabbitConfig.DELAY_EXCHANGE_NAME, RabbitConfig.DELAY_ROUTING_KEY, JSON.toJSONString(apifoxModel));
 
-        return Result.success("节点上线");
+        return Result.success(gatewayNodeInfo,"节点上线");
     }
 
     /**
      * 车辆申请上线收集节点
+     *
+     * @return gather
      * @author: LiYuan
      * @param: vin
-     * @return gather
      */
     @Override
     public void applyForConnectToGather(String vin) {
@@ -135,9 +150,6 @@ public class OnlineLoadCenterServiceImpl implements OnlineLoadCenterService{
     }
 
 
-
-
-
     /**
      * @description:车辆下线接口
      * @author: LiYuan
@@ -150,4 +162,19 @@ public class OnlineLoadCenterServiceImpl implements OnlineLoadCenterService{
     }
 
 
+    public GatewayNodeInfo generateGatewayNodeInfo(ApifoxModel apifoxModel) {
+
+        EcsInstance ecsInstance = aliyunOpenAPIUtils.queryEcsInstances(new ArrayList<String>() {{
+            add(apifoxModel.getPrivateIpAddress());
+        }}).get(0);
+
+
+        return GatewayNodeInfo.builder()
+                .nodeId(apifoxModel.getClusterId())
+                .privateIpAddress(ecsInstance.getPrivateIpAddress())
+                .publicIpAddress(ecsInstance.getPublicIpAddress())
+                .build();
+    }
+
+
 }