Commit cac1e0c9 authored by huangjiamin's avatar huangjiamin

购买后将海外的IP添加KCP端口号

parent 1c075f10
...@@ -709,9 +709,9 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -709,9 +709,9 @@ public class IpResourceServiceImpl implements IpResourceService {
} }
// 2. 如果 ip 资源的 status 为 6(未分配) 或者 ( ip资源为专线 且 purchasedTime(购买IP的时间) 在 14 分钟内) // 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.isSpecialLine() && x.getPurchasedTime() > (Instant.now().minusSeconds(14 * 60).toEpochMilli()))) {
x.setStatus(3); x.setStatus(3);
} }*/
// 3. 如果 ip 资源的 status 为 3(正在分配) // 3. 如果 ip 资源的 status 为 3(正在分配)
if (x.getStatus() == 3) { if (x.getStatus() == 3) {
......
...@@ -394,7 +394,6 @@ public class ShopServiceImpl implements ShopService { ...@@ -394,7 +394,6 @@ public class ShopServiceImpl implements ShopService {
ipResourceDto = new IpResourceDto(ipResource, null, false); ipResourceDto = new IpResourceDto(ipResource, null, false);
} }
logger.error("queryShop ipResource.getRegion : {}", ipResource.getRegion());
if(org.apache.commons.lang3.StringUtils.isNotBlank(ipResource.getRegion()) && region.contains(ipResource.getRegion())){ if(org.apache.commons.lang3.StringUtils.isNotBlank(ipResource.getRegion()) && region.contains(ipResource.getRegion())){
ipResourceDto.setSecondaryProxyPort("20020"); ipResourceDto.setSecondaryProxyPort("20020");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment