Merge branch 'dev-zrj' into 'staging'

修改ip延迟bug

See merge request !65

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

@@ -621,16 +621,11 @@ 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("");
                 }
-                if (x.isSpecialLine() && x.getPurchasedTime() > (Instant.now().toEpochMilli() - 12*60*1000)) {
-                    x.setStatus(3);
-                    ipResourceRepository.save(x);
-                    x.setAddr("");
-                }
                 SpecialLine specialLine = specialLineRepository.findAll().get(0);
                 if (x.isSpecialLine())
                     ipResourceDtos.add(new IpResourceDto(x, shopDto, false, specialLine));