修复流量统计

springboot-backend/src/main/java/com/admin/common/dto/UserUpdateDto.java

@@ -12,9 +12,6 @@ public class UserUpdateDto {
     @NotNull(message = "用户ID不能为空")
     private Long id;
 
-    @NotBlank(message = "姓名不能为空")
-    private String name;
-
     @NotBlank(message = "用户名不能为空")
     private String user;
 

springboot-backend/src/main/java/com/admin/common/task/CheckGostConfigAsync.java

@@ -2,6 +2,7 @@ package com.admin.common.task;
 
 import com.admin.common.dto.ConfigItem;
 import com.admin.common.dto.GostConfigDto;
+import com.admin.common.dto.GostDto;
 import com.admin.common.utils.GostUtil;
 import com.admin.entity.Forward;
 import com.admin.entity.Node;
@@ -74,7 +75,8 @@ public class CheckGostConfigAsync {
                         Forward forward = forwardService.getById(forwardId);
                         if (forward == null) {
                             log.warn("删除孤立的服务: {} (节点: {})", service.getName(), node.getId());
-                            GostUtil.DeleteService(node.getId(), forwardId+"_"+userId+"_"+userTunnelId);
+                            GostDto gostDto = GostUtil.DeleteService(node.getId(), forwardId + "_" + userId + "_" + userTunnelId);
+                            System.out.println(gostDto);
                         }
                     }
                     if (Objects.equals(type, "tls")) {

springboot-backend/src/main/java/com/admin/common/utils/WebSocketServer.java

@@ -30,9 +30,6 @@ public class WebSocketServer extends TextWebSocketHandler {
     @Resource
     NodeService nodeService;
 
-    @Resource
-    CheckGostConfigAsync checkGostConfigAsync;
-
     // 存储所有活跃的 WebSocket 连接（
     private static final CopyOnWriteArraySet<WebSocketSession> activeSessions = new CopyOnWriteArraySet<>();
     
@@ -57,13 +54,7 @@ public class WebSocketServer extends TextWebSocketHandler {
                 if (message.getPayload().contains("memory_usage")){
                     // 先发送确认消息
                     sendToUser(session, "{\"type\":\"call\"}");
-                } else if (message.getPayload().contains("config_report")) {
-                    log.info("收到消息: {}", message.getPayload());
-                    JSONObject jsonObject = JSONObject.parseObject(message.getPayload());
-                    String string = jsonObject.getString("data");
-                    GostConfigDto gostConfigDto = JSONObject.parseObject(string, GostConfigDto.class);
-                    checkGostConfigAsync.cleanNodeConfigs(id, gostConfigDto);
-                } else if (message.getPayload().contains("requestId")) {
+                }else if (message.getPayload().contains("requestId")) {
                     log.info("收到消息: {}", message.getPayload());
                     // 处理命令响应消息
                     try {

springboot-backend/src/main/java/com/admin/config/WebSocketConfig.java

@@ -23,17 +23,6 @@ public class WebSocketConfig implements WebSocketConfigurer {
     @Resource
     private WebSocketInterceptor webSocketInterceptor;
 
-    @Bean
-    public ServletContextInitializer websocketBufferConfig() {
-        return new ServletContextInitializer() {
-            @Override
-            public void onStartup(ServletContext servletContext) throws ServletException {
-                servletContext.setInitParameter("org.apache.tomcat.websocket.textBufferSize", String.valueOf(10 * 1024 * 1024));
-                servletContext.setInitParameter("org.apache.tomcat.websocket.binaryBufferSize", String.valueOf(10 * 1024 * 1024));
-            }
-        };
-    }
-
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry webSocketHandlerRegistry) {
         webSocketHandlerRegistry

springboot-backend/src/main/java/com/admin/controller/FlowController.java

@@ -2,16 +2,16 @@ package com.admin.controller;
 
 import com.admin.common.aop.LogAnnotation;
 import com.admin.common.dto.FlowDto;
+import com.admin.common.dto.GostConfigDto;
 import com.admin.common.lang.R;
+import com.admin.common.task.CheckGostConfigAsync;
 import com.admin.common.utils.GostUtil;
 import com.admin.entity.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
@@ -56,6 +56,19 @@ public class FlowController extends BaseController {
     private static final ConcurrentHashMap<String, Object> FORWARD_LOCKS = new ConcurrentHashMap<>();
 
 
+    @Resource
+    CheckGostConfigAsync checkGostConfigAsync;
+
+    @PostMapping("/config")
+    @LogAnnotation
+    public String config(@RequestBody GostConfigDto gostConfigDto, String secret) {
+        Node node = nodeService.getOne(new QueryWrapper<Node>().eq("secret", secret));
+        if (node == null) return SUCCESS_RESPONSE;
+        checkGostConfigAsync.cleanNodeConfigs(node.getId().toString(), gostConfigDto);
+        return SUCCESS_RESPONSE;
+    }
+
+
     @RequestMapping("/test")
     @LogAnnotation
     public String test() {

springboot-backend/src/main/java/com/admin/service/impl/NodeServiceImpl.java

@@ -11,10 +11,12 @@ import com.admin.entity.Tunnel;
 import com.admin.mapper.NodeMapper;
 import com.admin.mapper.TunnelMapper;
 import com.admin.service.NodeService;
+import com.admin.service.TunnelService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.BeanUtils;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -58,6 +60,10 @@ public class NodeServiceImpl extends ServiceImpl<NodeMapper, Node> implements No
     @Resource
     private TunnelMapper tunnelMapper;
 
+    @Resource
+    @Lazy
+    private TunnelService tunnelService;
+
     @Value("${server-addr}")
     private String serverAddr;
 
@@ -107,7 +113,25 @@ public class NodeServiceImpl extends ServiceImpl<NodeMapper, Node> implements No
         // 2. 构建更新对象并执行更新
         Node updateNode = buildUpdateNode(nodeUpdateDto);
         boolean result = this.updateById(updateNode);
-        
+
+        // 更新隧道入口ip
+        List<Tunnel> inNodeId = tunnelService.list(new QueryWrapper<Tunnel>().eq("in_node_id", updateNode.getId()));
+        if (!inNodeId.isEmpty()) {
+            for (Tunnel tunnel : inNodeId) {
+                tunnel.setInIp(updateNode.getIp());
+            }
+            tunnelService.updateBatchById(inNodeId);
+        }
+
+        // 更新服务器出口ip
+        List<Tunnel> outNodeId = tunnelService.list(new QueryWrapper<Tunnel>().eq("out_node_id", updateNode.getId()));
+        if (!outNodeId.isEmpty()) {
+            for (Tunnel tunnel : outNodeId) {
+                tunnel.setOutIp(updateNode.getServerIp());
+            }
+            tunnelService.updateBatchById(outNodeId);
+        }
+
         return result ? R.ok(SUCCESS_UPDATE_MSG) : R.err(ERROR_UPDATE_MSG);
     }