Merge remote-tracking branch 'remotes/origin/feature-secondaryProxyPort' into staging

src/main/java/com/edgec/browserbackend/account/domain/AccountDto.java

@@ -42,7 +42,7 @@ public class AccountDto {
 
     private List<String> whiteList = new ArrayList<>();
 
-    private List<String> userWhiteList = new ArrayList<>();
+    private List<String> ownWhiteList = new ArrayList<>();
 
     private ShopSummary shopSummary;
 
@@ -70,8 +70,11 @@ public class AccountDto {
         this.setParent(account.getParent());
         this.setToken(account.getToken());
         this.setPermission(account.getPermission());
-        this.setWhiteList(account.getWhiteList());
-        this.setUserWhiteList(account.getWhiteList());
+        List<String> whiteList = account.getWhiteList();
+        this.setWhiteList(whiteList);
+        whiteList.add("google.com/recaptcha");
+        whiteList.add("google.com/js");
+        this.setOwnWhiteList(whiteList);
         this.setQueryIpUrlList(account.getQueryIpUrlList());
         if (account.getPromotion() != null) {
             this.setPromotion(account.getPromotion());
@@ -260,11 +263,11 @@ public class AccountDto {
         this.promotionCode = promotionCode;
     }
 
-    public List<String> getUserWhiteList() {
-        return userWhiteList;
+    public List<String> getOwnWhiteList() {
+        return ownWhiteList;
     }
 
-    public void setUserWhiteList(List<String> userWhiteList) {
-        this.userWhiteList = userWhiteList;
+    public void setOwnWhiteList(List<String> ownWhiteList) {
+        this.ownWhiteList = ownWhiteList;
     }
 }

src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java

@@ -709,9 +709,13 @@ public class IpResourceServiceImpl implements IpResourceService {
                         }
 
                         // 2. 如果 ip 资源的 status 为 6（未分配） 或者  （ ip资源为专线 且 purchasedTime（购买IP的时间） 在 14 分钟内）
-                        /*if (x.getStatus() == 6 || (x.isSpecialLine() && x.getPurchasedTime() > (Instant.now().minusSeconds(14 * 60).toEpochMilli()))) {
+                        if (x.getStatus() == 6) {
                             x.setStatus(3);
-                        }*/
+                        }
+
+                        if(x.isSpecialLine() && x.getStatus() == 0 && x.getPurchasedTime() > (Instant.now().minusSeconds(14 * 60).toEpochMilli())) {
+                            x.setSpecialLine(false);
+                        }
 
                         // 3. 如果 ip 资源的 status 为 3（正在分配）
                         if (x.getStatus() == 3) {