[ISSUE alibaba#3671] move some tools class into common package (aliba…

…ba#3672)
harday · Aug 24, 2020 · 3428d88 · 3428d88
1 parent a0c8353
commit 3428d88
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 72 deletions.
diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/SpasAdapter.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/SpasAdapter.java
@@ -17,7 +17,7 @@
 package com.alibaba.nacos.client.config.impl;
 
 import com.alibaba.nacos.api.common.Constants;
-import com.alibaba.nacos.client.identify.Base64;
+import com.alibaba.nacos.common.codec.Base64;
 import com.alibaba.nacos.client.identify.CredentialService;
 import com.alibaba.nacos.common.utils.StringUtils;
 

diff --git a/client/src/main/java/com/alibaba/nacos/client/config/utils/ParamUtils.java b/client/src/main/java/com/alibaba/nacos/client/config/utils/ParamUtils.java
@@ -17,7 +17,7 @@
 package com.alibaba.nacos.client.config.utils;
 
 import com.alibaba.nacos.api.exception.NacosException;
-import com.alibaba.nacos.client.utils.IpUtil;
+import com.alibaba.nacos.common.utils.IpUtils;
 import com.alibaba.nacos.common.utils.StringUtils;
 
 import java.util.List;
@@ -190,7 +190,7 @@ public static void checkBetaIps(String betaIps) throws NacosException {
         }
         String[] ipsArr = betaIps.split(",");
         for (String ip : ipsArr) {
-            if (!IpUtil.isIpv4(ip)) {
+            if (!IpUtils.isIpv4(ip)) {
                 throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "betaIps invalid");
             }
         }

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/SignUtil.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/SignUtil.java
@@ -16,7 +16,7 @@
 
 package com.alibaba.nacos.client.naming.utils;
 
-import com.alibaba.nacos.client.identify.Base64;
+import com.alibaba.nacos.common.codec.Base64;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;

diff --git a/...alibaba/nacos/client/identify/Base64.java → ...om/alibaba/nacos/common/codec/Base64.java b/...alibaba/nacos/client/identify/Base64.java → ...om/alibaba/nacos/common/codec/Base64.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.client.identify;
+package com.alibaba.nacos.common.codec;
 
 import java.nio.charset.Charset;
 

diff --git a/...om/alibaba/nacos/client/utils/IpUtil.java → ...m/alibaba/nacos/common/utils/IpUtils.java b/...om/alibaba/nacos/client/utils/IpUtil.java → ...m/alibaba/nacos/common/utils/IpUtils.java
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.client.utils;
-
-import com.alibaba.nacos.common.utils.StringUtils;
+package com.alibaba.nacos.common.utils;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -26,7 +24,7 @@
  *
  * @author Nacos
  */
-public class IpUtil {
+public class IpUtils {
 
     private static final Pattern IPV4_PATTERN = Pattern
             .compile("^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)$");

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/IPUtil.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/IPUtil.java