fix bug

Author: master-coder-ll

common/src/main/java/com/ljh/common/model/ProxyAccount.java

@@ -30,6 +30,8 @@ public class ProxyAccount implements Serializable {
     private String id;
     /**
      * "alterId": 32
+     * 兼用新版 alterId 0
+     * alterID 是 v2ray 的一个安全特性，用于防止被识别和干扰。但是在最新的 v2ray 版本中，已经引入了更先进的安全机制，所以不再需要 alterID 了。
      */
     private Integer alterId = 64;
     /**

vpn-admin/src/main/java/com/jhl/admin/controller/UserController.java

@@ -270,8 +270,7 @@ public Result deleteUser(@CookieValue(COOKIE_NAME) String auth, @PathVariable In
 
 
         userRepository.deleteById(id);
-        if (accounts != null)
-            accountRepository.deleteAll(accounts);
+        accountRepository.deleteAll(accounts);
 
         return Result.doSuccess();
     }

vpn-admin/src/main/java/com/jhl/admin/entity/V2rayAccount.java

@@ -16,7 +16,7 @@ public class V2rayAccount {
      * "add": "",
      * "port": "443",
      * "id": "976fdcba-fb53-44a1-d7e2-74e4c3de0020",
-     * "aid": "64",
+     * "aid": "0",
      * "net": "ws",
      * "type": "none",
      * "host": "",
@@ -31,7 +31,7 @@ public class V2rayAccount {
     private String add;
     private String port;
     private String id;
-    private String aid = "64";
+    private String aid = "0";
     private String net = "ws";
     private String type = "none";
      private String host ="";

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

@@ -55,6 +55,8 @@ public class Server extends BaseEntity implements Serializable {
 
     //ws路径
     private String wsPath ="/ws/%s/";
+    //默认0
+    private Integer alterId=0;
 
 
 }

vpn-admin/src/main/java/com/jhl/admin/service/StatService.java

@@ -26,18 +26,22 @@ public Stat createOrGetStat(Account account){
         Date today = new Date();
         Stat stat = statRepository.findByAccountIdAndFromDateBeforeAndToDateAfter(account.getId(), today,today);
             if (stat == null){
-                Date fromDate =Utils.formatDate(today,null);
+                synchronized (Utils.getInternersPoll().intern(account.getAccountNo())){
+                    stat = statRepository.findByAccountIdAndFromDateBeforeAndToDateAfter(account.getId(), today,today);
+                    if (stat != null) return stat;
+                    Date fromDate =Utils.formatDate(today,null);
 
-                Integer cycleNum = account.getCycle();
-                Date maxToDate = account.getToDate();
-                Date nextCycleDate = Utils.getDateBy(fromDate,cycleNum, Calendar.DAY_OF_YEAR);
-                    if (!maxToDate.after(fromDate)) return  null;
-                stat = new Stat();
-                 stat.setAccountId(account.getId());
-                 stat.setFromDate(fromDate);
-                 stat.setToDate(nextCycleDate);
-                 stat.setFlow(0l);
-                 statRepository.save(stat);
+                    Integer cycleNum = account.getCycle();
+                    Date maxToDate = account.getToDate();
+                    Date nextCycleDate = Utils.getDateBy(fromDate,cycleNum, Calendar.DAY_OF_YEAR);
+                        if (!maxToDate.after(fromDate)) return  null;
+                    stat = new Stat();
+                     stat.setAccountId(account.getId());
+                     stat.setFromDate(fromDate);
+                     stat.setToDate(nextCycleDate);
+                     stat.setFlow(0l);
+                     statRepository.save(stat);
+                }
             }
             return stat;
     }

vpn-admin/src/main/java/com/jhl/admin/service/v2ray/ProxyEventService.java

@@ -40,7 +40,7 @@ public class ProxyEventService {
     @Autowired
     V2rayAccountService v2rayAccountService;
 
-    private LinkedBlockingQueue<ProxyEvent> queue = new LinkedBlockingQueue<>();
+    private LinkedBlockingQueue<ProxyEvent> queue = new LinkedBlockingQueue<>(100);
 
     public void addProxyEvent(List<? extends ProxyEvent> proxyEvents) {
         for (ProxyEvent proxyEvent : proxyEvents) {
@@ -81,13 +81,13 @@ public void start() {
                             return;
                     }
                 } catch (InterruptedException e) {
-                    log.error("event InterruptedException :{}", e);
+                    log.error("event InterruptedException :", e);
                     Thread.currentThread().interrupt();
 
                     break;
 
                 } catch (Exception e) {
-                    log.error("event 队列 抛出异常:{}", e);
+                    log.error("event 队列 抛出异常:", e);
                 }
             }
 

vpn-admin/src/main/java/com/jhl/admin/service/v2ray/V2RayProxyEvent.java

@@ -1,6 +1,7 @@
 package com.jhl.admin.service.v2ray;
 
 
+import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.jhl.admin.entity.V2rayAccount;
 import com.jhl.admin.model.Account;
@@ -15,6 +16,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
+import java.io.Serializable;
 import java.util.List;
 
 @Slf4j
@@ -95,9 +97,10 @@ public ProxyAccount buildProxyAccount() {
                 = account.getUuid() == null ?
                 v2rayAccountService.buildV2rayAccount(Lists.newArrayList(server), account).get(0).getId()
                 : account.getUuid();
+        V2rayAccount v2rayAccount = JSON.parseObject(account.getContent(), V2rayAccount.class);
         proxyAccount.setAccountId(account.getId());
         proxyAccount.setAccountNo(account.getAccountNo());
-        proxyAccount.setAlterId(64);
+        proxyAccount.setAlterId(server.getAlterId());
         proxyAccount.setDownTrafficLimit(account.getSpeed());
         proxyAccount.setEmail(email);
         proxyAccount.setId(id);

vpn-admin/src/main/java/com/jhl/admin/service/v2ray/V2rayAccountService.java

@@ -54,6 +54,7 @@ public List<V2rayAccount> buildV2rayAccount(List<Server> servers, Account accoun
             v2rayAccount.setTls(s.getSupportTLS() ? "tls" : "");
             v2rayAccount.setHost("");
             v2rayAccount.setPs(s.getServerName());
+            v2rayAccount.setAid(s.getAlterId()+"");
             result.add(v2rayAccount);
         }
         return result;