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

b0cf14d6 · huangjiamin · bfd8f423 · 32848f1b · b0cf14d6
Commit b0cf14d6 authored Sep 29, 2020 by huangjiamin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

ShopServiceImpl.java .../browserbackend/browser/service/Impl/ShopServiceImpl.java +1 -2

No files found.
--- a/src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java
+++ b/src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java
@@ -395,8 +395,7 @@ public class ShopServiceImpl implements ShopService {
        }

        logger.error("queryShop ipResource.getRegion : {}", ipResource.getRegion());
-        logger.error("queryShop ipResource.getRegion region.contains : {}", region.contains(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");
        }