mirror of
https://github.com/Sagit-chu/flvx.git
synced 2026-11-13 16:24:24 +08:00
Compare commits
3 Commits
2.0.11
...
2.0.12-beta2
| Author | SHA1 | Date | |
|---|---|---|---|
| c8f0c55fda | |||
| bfdaa47ea5 | |||
| d7b76b4590 |
@@ -66,4 +66,14 @@ curl -L https://raw.githubusercontent.com/Sagit-chu/flux-panel/beta/install.sh -
|
||||
作者对因使用本项目所造成的任何直接或间接损失概不负责,亦不提供任何形式的担保、承诺或技术支持。
|
||||
|
||||
|
||||
请务必在合法、合规、安全的前提下使用本项目。
|
||||
请务必在合法、合规、安全的前提下使用本项目。
|
||||
|
||||
---
|
||||
## ⭐ 喝杯咖啡!(USDT)
|
||||
|
||||
| 网络 | 地址 |
|
||||
|------------|----------------------------------------------------------------------|
|
||||
| BNB(BEP20) | `0xa608708fdc6279a2433fd4b82f0b72b8cbe97ed5` |
|
||||
| TRC20 | `TM8VYdU3s3gSX5PC8swjAJrAzZFCHKqG2k` |
|
||||
| Aptos | `0x49427bfcba1006a346447430689b2307ac156316bb34850d1d3029ff9d118da5` |
|
||||
| polygon | `0xa608708fdc6279a2433fd4b82f0b72b8cbe97ed5` |
|
||||
|
||||
@@ -430,6 +430,15 @@ public class TunnelServiceImpl extends ServiceImpl<TunnelMapper, Tunnel> impleme
|
||||
if (hasNodeChanges && tunnelUpdateDto.getInNodeId() != null) {
|
||||
List<ChainTunnel> backupChains = deepCopyChainTunnels(oldChainTunnels);
|
||||
|
||||
Set<Long> oldEntryNodeIds = oldChainTunnels.stream()
|
||||
.filter(ct -> ct.getChainType() != null && ct.getChainType() == 1)
|
||||
.map(ChainTunnel::getNodeId)
|
||||
.collect(Collectors.toSet());
|
||||
|
||||
Set<Long> newEntryNodeIds = tunnelUpdateDto.getInNodeId().stream()
|
||||
.map(ChainTunnel::getNodeId)
|
||||
.collect(Collectors.toSet());
|
||||
|
||||
List<Long> nodeIds = new ArrayList<>();
|
||||
Map<Long, Node> nodes = new HashMap<>();
|
||||
|
||||
@@ -511,6 +520,8 @@ public class TunnelServiceImpl extends ServiceImpl<TunnelMapper, Tunnel> impleme
|
||||
|
||||
chainTunnelService.saveBatch(newChainTunnels);
|
||||
|
||||
syncForwardsForEntryNodeChanges(existingTunnel.getId(), oldEntryNodeIds, newEntryNodeIds);
|
||||
|
||||
} catch (Exception e) {
|
||||
chainTunnelService.saveBatch(backupChains);
|
||||
rebuildGostConfig(backupChains, existingTunnel);
|
||||
@@ -525,7 +536,8 @@ public class TunnelServiceImpl extends ServiceImpl<TunnelMapper, Tunnel> impleme
|
||||
tunnel.setTrafficRatio(tunnelUpdateDto.getTrafficRatio());
|
||||
tunnel.setInIp(tunnelUpdateDto.getInIp());
|
||||
|
||||
if (StringUtils.isEmpty(tunnel.getInIp())) {
|
||||
boolean forceRegenerateInIp = hasNodeChanges && tunnelUpdateDto.getInNodeId() != null;
|
||||
if (StringUtils.isEmpty(tunnel.getInIp()) || forceRegenerateInIp) {
|
||||
java.util.LinkedHashSet<String> inIps = new java.util.LinkedHashSet<>();
|
||||
List<ChainTunnel> chainTunnels = chainTunnelService.list(
|
||||
new QueryWrapper<ChainTunnel>().eq("tunnel_id", tunnel.getId()).eq("chain_type", 1)
|
||||
@@ -1153,5 +1165,148 @@ public class TunnelServiceImpl extends ServiceImpl<TunnelMapper, Tunnel> impleme
|
||||
}
|
||||
}
|
||||
|
||||
private void syncForwardsForEntryNodeChanges(Long tunnelId, Set<Long> oldEntryNodeIds, Set<Long> newEntryNodeIds) {
|
||||
Set<Long> addedNodeIds = new HashSet<>(newEntryNodeIds);
|
||||
addedNodeIds.removeAll(oldEntryNodeIds);
|
||||
|
||||
Set<Long> removedNodeIds = new HashSet<>(oldEntryNodeIds);
|
||||
removedNodeIds.removeAll(newEntryNodeIds);
|
||||
|
||||
if (addedNodeIds.isEmpty() && removedNodeIds.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
List<Forward> forwards = forwardService.list(
|
||||
new QueryWrapper<Forward>().eq("tunnel_id", tunnelId.intValue())
|
||||
);
|
||||
|
||||
if (forwards.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Tunnel tunnel = this.getById(tunnelId);
|
||||
if (tunnel == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (Forward forward : forwards) {
|
||||
if (forward.getStatus() != 1) {
|
||||
continue;
|
||||
}
|
||||
|
||||
UserTunnel userTunnel = userTunnelService.getOne(
|
||||
new QueryWrapper<UserTunnel>()
|
||||
.eq("user_id", forward.getUserId())
|
||||
.eq("tunnel_id", tunnelId.intValue())
|
||||
);
|
||||
|
||||
for (Long removedNodeId : removedNodeIds) {
|
||||
ForwardPort forwardPort = forwardPortService.getOne(
|
||||
new QueryWrapper<ForwardPort>()
|
||||
.eq("forward_id", forward.getId())
|
||||
.eq("node_id", removedNodeId)
|
||||
);
|
||||
|
||||
if (forwardPort != null) {
|
||||
String serviceName = buildForwardServiceName(forward.getId(), forward.getUserId(), userTunnel);
|
||||
JSONArray services = new JSONArray();
|
||||
services.add(serviceName + "_tcp");
|
||||
services.add(serviceName + "_udp");
|
||||
GostUtil.DeleteService(removedNodeId, services);
|
||||
|
||||
forwardPortService.removeById(forwardPort.getId());
|
||||
}
|
||||
}
|
||||
|
||||
for (Long addedNodeId : addedNodeIds) {
|
||||
ForwardPort existingPort = forwardPortService.getOne(
|
||||
new QueryWrapper<ForwardPort>()
|
||||
.eq("forward_id", forward.getId())
|
||||
.eq("node_id", addedNodeId)
|
||||
);
|
||||
|
||||
if (existingPort != null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
List<ForwardPort> existingPorts = forwardPortService.list(
|
||||
new QueryWrapper<ForwardPort>().eq("forward_id", forward.getId())
|
||||
);
|
||||
|
||||
Integer targetPort = null;
|
||||
if (!existingPorts.isEmpty()) {
|
||||
targetPort = existingPorts.get(0).getPort();
|
||||
}
|
||||
|
||||
Integer allocatedPort = allocatePortForNode(addedNodeId, targetPort, forward.getId());
|
||||
if (allocatedPort == null) {
|
||||
System.err.println("Failed to allocate port on node " + addedNodeId + " for forward " + forward.getId());
|
||||
continue;
|
||||
}
|
||||
|
||||
ForwardPort newForwardPort = new ForwardPort();
|
||||
newForwardPort.setForwardId(forward.getId());
|
||||
newForwardPort.setNodeId(addedNodeId);
|
||||
newForwardPort.setPort(allocatedPort);
|
||||
forwardPortService.save(newForwardPort);
|
||||
|
||||
Node node = nodeService.getById(addedNodeId);
|
||||
if (node != null) {
|
||||
String serviceName = buildForwardServiceName(forward.getId(), forward.getUserId(), userTunnel);
|
||||
Integer limiter = (userTunnel != null && userTunnel.getSpeedId() != null) ? userTunnel.getSpeedId() : null;
|
||||
GostUtil.AddAndUpdateService(serviceName, limiter, node, forward, newForwardPort, tunnel, "AddService");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private Integer allocatePortForNode(Long nodeId, Integer preferredPort, Long forwardId) {
|
||||
Node node = nodeService.getById(nodeId);
|
||||
if (node == null || node.getPort() == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Set<Integer> usedPorts = new HashSet<>();
|
||||
|
||||
List<ChainTunnel> chainTunnels = chainTunnelService.list(
|
||||
new QueryWrapper<ChainTunnel>().eq("node_id", nodeId)
|
||||
);
|
||||
for (ChainTunnel ct : chainTunnels) {
|
||||
if (ct.getPort() != null) {
|
||||
usedPorts.add(ct.getPort());
|
||||
}
|
||||
}
|
||||
|
||||
List<ForwardPort> forwardPorts = forwardPortService.list(
|
||||
new QueryWrapper<ForwardPort>()
|
||||
.eq("node_id", nodeId)
|
||||
.ne("forward_id", forwardId)
|
||||
);
|
||||
for (ForwardPort fp : forwardPorts) {
|
||||
if (fp.getPort() != null) {
|
||||
usedPorts.add(fp.getPort());
|
||||
}
|
||||
}
|
||||
|
||||
List<Integer> availablePorts = parsePorts(node.getPort());
|
||||
|
||||
if (preferredPort != null && availablePorts.contains(preferredPort) && !usedPorts.contains(preferredPort)) {
|
||||
return preferredPort;
|
||||
}
|
||||
|
||||
for (Integer port : availablePorts) {
|
||||
if (!usedPorts.contains(port)) {
|
||||
return port;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private String buildForwardServiceName(Long forwardId, Integer userId, UserTunnel userTunnel) {
|
||||
int userTunnelId = (userTunnel != null) ? userTunnel.getId() : 0;
|
||||
return forwardId + "_" + userId + "_" + userTunnelId;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user