From 6c7bcfdca5c3c24befde65aa085b11e60b4df62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com>
Date: Tue, 1 Mar 2022 10:24:28 +0800
Subject: [PATCH 1/3] v2.1.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 957559a..e896e2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chinaunicom.ebtp</groupId>
 		<artifactId>mall-ebtp-cloud-parent</artifactId>
-		<version>2.0.1-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
     <groupId>com.chinaunicom.mall.ebtp</groupId>
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>com.chinaunicom.mall.ebtp</groupId>
 			<artifactId>uboot-core</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
+			<version>2.1.0-SNAPSHOT</version>
 		</dependency>
 
 

From b5d302ccb2609e1644598d729be283f591e4748a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <jl-fuqj@chinaunicom.cn>
Date: Mon, 21 Mar 2022 09:27:21 +0800
Subject: [PATCH 2/3] v2.1.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e896e2f..3fa172b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chinaunicom.ebtp</groupId>
 		<artifactId>mall-ebtp-cloud-parent</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.1.1-SNAPSHOT</version>
 	</parent>
 
     <groupId>com.chinaunicom.mall.ebtp</groupId>
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>com.chinaunicom.mall.ebtp</groupId>
 			<artifactId>uboot-core</artifactId>
-			<version>2.1.0-SNAPSHOT</version>
+			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
 

From b7a3edbae2ed35857f95395154fc63ae937b2e9b Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Tue, 22 Mar 2022 11:34:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=98=BB=E6=96=AD=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crypconfigure/crypto/helper/Utils.java    | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/crypto/helper/Utils.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/crypto/helper/Utils.java
index 3db4dd4..9dd156d 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/crypto/helper/Utils.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/crypto/helper/Utils.java
@@ -294,31 +294,31 @@ public final class Utils {
         }
     }
 
-    public static Properties parseGrpcUrl(String url) {
-        if (isNullOrEmpty(url)) {
-            throw new RuntimeException("URL cannot be null or empty");
-        }
-
-        Properties props = new Properties();
-        final String regex = "([^:]+)[:]//([^:]+)[:]([0-9]+)";
-        final Pattern p = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
-        Matcher m = p.matcher(url);
-        if (m.matches()) {
-            props.setProperty("protocol", m.group(1));
-            props.setProperty("host", m.group(2));
-            props.setProperty("port", m.group(3));
-
-            String protocol = props.getProperty("protocol");
-            if (!"grpc".equals(protocol) && !"grpcs".equals(protocol)) {
-                throw new RuntimeException(format("Invalid protocol expected grpc or grpcs and found %s.", protocol));
-            }
-        } else {
-            throw new RuntimeException("URL must be of the format protocol://host:port. Found: '" + url + "'");
-        }
-
-        // TODO: allow all possible formats of the URL
-        return props;
-    }
+//    public static Properties parseGrpcUrl(String url) {
+//        if (isNullOrEmpty(url)) {
+//            throw new RuntimeException("URL cannot be null or empty");
+//        }
+//
+//        Properties props = new Properties();
+//        final String regex = "([^:]+)[:]//([^:]+)[:]([0-9]+)";
+//        final Pattern p = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
+//        Matcher m = p.matcher(url);
+//        if (m.matches()) {
+//            props.setProperty("protocol", m.group(1));
+//            props.setProperty("host", m.group(2));
+//            props.setProperty("port", m.group(3));
+//
+//            String protocol = props.getProperty("protocol");
+//            if (!"grpc".equals(protocol) && !"grpcs".equals(protocol)) {
+//                throw new RuntimeException(format("Invalid protocol expected grpc or grpcs and found %s.", protocol));
+//            }
+//        } else {
+//            throw new RuntimeException("URL must be of the format protocol://host:port. Found: '" + url + "'");
+//        }
+//
+//        // TODO: allow all possible formats of the URL
+//        return props;
+//    }
 
     /**
      * Check if the strings Grpc url is valid
@@ -326,16 +326,16 @@ public final class Utils {
      * @param url
      * @return Return the io.seata.core.exception that indicates the error or null if ok.
      */
-    public static Exception checkGrpcUrl(String url) {
-        try {
-
-            parseGrpcUrl(url);
-            return null;
-
-        } catch (Exception e) {
-            return e;
-        }
-    }
+//    public static Exception checkGrpcUrl(String url) {
+//        try {
+//
+//            parseGrpcUrl(url);
+//            return null;
+//
+//        } catch (Exception e) {
+//            return e;
+//        }
+//    }
 
     /**
      * Check if a string is null or empty.