feat: 适配新版v2ray

Author: master-coder-ll

proxy/src/main/java/com/jhl/V2rayProxyApplication.java

@@ -1,19 +1,32 @@
 package com.jhl;
 
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import sun.security.action.GetPropertyAction;
 
+import java.io.*;
+import java.security.AccessController;
 import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 
 @SpringBootApplication
-
+@Slf4j
 public class V2rayProxyApplication {
+    private final static String V2RAY_RESTART_COMMAND = "systemctl restart v2ray";
 
     public static void main(String[] args) {
         TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
+        try {
+            Runtime.getRuntime().exec(V2RAY_RESTART_COMMAND).waitFor(5,TimeUnit.SECONDS);
+            log.info("执行重启v2ray：{}", V2RAY_RESTART_COMMAND);
+        } catch (Exception e) {
+            log.error(" 重启v2ray失败,如果科学不了，一般都是启动先后次序导致，请手动重启v2ray", e);
+        }
+
         //需要接受args，如果不加载不了自定义配置
-        SpringApplication.run(V2rayProxyApplication.class,args);
+        SpringApplication.run(V2rayProxyApplication.class, args);
     }
 
 

proxy/src/main/java/com/jhl/common/constant/InternalConstant.java

@@ -9,8 +9,12 @@
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
+import sun.security.action.GetPropertyAction;
 
 import javax.annotation.PostConstruct;
+import java.io.*;
+import java.security.AccessController;
+import java.util.concurrent.TimeUnit;
 
 @Component
 @PropertySource("internal.properties")
@@ -24,10 +28,14 @@ public class InternalConstant {
     RestTemplate restTemplate;
     @Value("${app.githubURL}")
     String githubURL;
+   private final  static String V2RAY_RESTART_COMMAND = "systemctl restart v2ray";
     @PostConstruct
     public void init()   {
-
         new Thread(()->{
+
+            // 修复新版v2ray 安全特性更新导致科学不了的问题
+            fixAid();
+
             JSONObject gitHubJson = restTemplate.getForObject(githubURL, JSONObject.class);
             if (gitHubJson ==null) return;
             String tagName = gitHubJson.getString("tag_name");
@@ -39,5 +47,71 @@ public void init()   {
             log.info("===========================================");
         }).start();
 
+
+    }
+
+    private  void fixAid() {
+        String aeadEnv = "Environment=\"V2RAY_VMESS_AEAD_FORCED=false\"".trim();
+        File file = new File("/etc/systemd/system/v2ray.service".trim());
+        if (file.exists() && file.canRead() && file.canWrite()) {
+            boolean existAeadEnv = isExistAeadEnv(aeadEnv, file);
+            if (!existAeadEnv) {
+                writeEev(aeadEnv, file);
+                log.info("写入v2ray兼容旧版环境变量：{}",aeadEnv);
+                try {
+                    Runtime.getRuntime().exec("systemctl daemon-reload").waitFor(2, TimeUnit.SECONDS);
+                    Runtime.getRuntime().exec(V2RAY_RESTART_COMMAND).waitFor(2, TimeUnit.SECONDS);
+                    log.info("执行重启v2ray：{}",V2RAY_RESTART_COMMAND);
+                } catch (Exception e) {
+                    log.error("兼容旧版v2ray重启失败，请手动重启v2ray" ,e);
+                }
+            }
+        }
+
+    }
+
+    private  void writeEev(String AeadEnv, File file) {
+
+        String lineSeparator = AccessController.doPrivileged(
+                new GetPropertyAction("line.separator"));
+        StringBuilder sb = new StringBuilder();
+        try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
+            String tempString;
+            // 判断是否已经存在非强制实用新版AEAD加密的环境变量
+            while ((tempString = reader.readLine()) != null) {
+                sb.append(tempString).append(lineSeparator);
+                if ("[Service]".trim().equalsIgnoreCase(tempString)){
+                    sb.append(AeadEnv).append(lineSeparator);
+                }
+            }
+        } catch (IOException e) {
+            log.error("读取文件失败", e);
+        }
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(file, false))) {
+            writer.write(sb.toString());
+        } catch (IOException e) {
+            log.error("写入环境兼容旧版环境变量失败", e);
+        }
+
+    }
+
+    private  boolean isExistAeadEnv(String AeadEnv, File file) {
+        boolean existAeadEnv = false;
+        try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
+            String tempString;
+            // 判断是否已经存在非强制实用新版AEAD加密的环境变量
+            while ((tempString = reader.readLine()) != null) {
+                if (AeadEnv.equalsIgnoreCase(tempString)) {
+                    existAeadEnv = true;
+                    break;
+                }
+            }
+        } catch (IOException e) {
+            log.error("读取环境兼容旧版环境变量失败", e);
+        }
+        return existAeadEnv;
     }
+
 }
+
+

vpn-admin/src/main/java/com/jhl/admin/VO/ServerVO.java

@@ -52,6 +52,8 @@ public class ServerVO extends BaseEntityVO implements Serializable {
     //ws路径
     private String wsPath ="/ws/%s/";
 
+    private Integer  alterId=64;
+
 
 }
 

vpn-admin/src/main/java/com/jhl/admin/model/Server.java

@@ -4,6 +4,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -49,15 +50,15 @@ public class Server extends BaseEntity implements Serializable {
     /**
      * 服务器等级
      */
-    @Column(  columnDefinition="smallint default 0")
+    @Column(  columnDefinition="smallint default 0" )
     private  Short level;
 
 
     //ws路径
     private String wsPath ="/ws/%s/";
     //默认0
+    @Column(columnDefinition="smallint default 64" )
     private Integer alterId=0;
 
-
 }