Merge branch 'dev-zrj' into 'staging'

1.专线ip延迟显示

See merge request !53

src/main/java/com/edgec/browserbackend/account/controller/AdministratorController.java

@@ -32,7 +32,7 @@ import java.util.Map;
 @RequestMapping("/vpsadmin")
 public class AdministratorController {
 
-    static final String mykey = "Xi6JZQ1SbUTxjO62u1MX01hBeB7A!qQXR6jVfer@s8@9JZxNqB@NTs$vpwH9aVXe";
+    static final String mykey = "Xi6JZQ1SbUTxjO62u1MX01hBeB7AqQXR6jVfer@s8@9JZxNqB@NTs$vpwH9aVXe";
 
     @Autowired
     private AdministratorService administratorService;

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

@@ -611,7 +611,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                         }
                     }
                 }
-                if (x.getStatus() == 6)
+                if (x.getStatus() == 6 || (x.isSpecialLine() && x.getPurchasedTime() > (Instant.now().toEpochMilli() - 12*60*1000)))
                     x.setStatus(3);
                 if (x.getStatus() == 3) {
                     x.setAddr("");
@@ -710,7 +710,7 @@ public class IpResourceServiceImpl implements IpResourceService {
         Account account = accountRepository.findByName(username);
         if (account == null)
             throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST);
-        IpResource ipResource = ipResourceRepository.findByAddr(ipResourceUpdateDto.getAddr());
+        IpResource ipResource = ipResourceRepository.findByAddrAndIsDeleted(ipResourceUpdateDto.getAddr(), false);
         if (ipResource != null) {
             return true;
         }