Merge branch 'hotfix_1.8_4.0.x_30548' into hotfix_1.8_4.0.x_30855

Author: a49a

flinkx-hive/flinkx-hive-core/src/main/java/com/dtstack/flinkx/hive/util/HiveDbUtil.java

@@ -63,7 +63,7 @@ public final class HiveDbUtil {
     public static final String PARAM_DELIMITER = "&";
     public static final String KEY_PRINCIPAL = "principal";
 
-    public static Pattern HIVE_JDBC_PATTERN = Pattern.compile("(?i)jdbc:hive2://(?<host>[0-9a-zA-Z\\.]+):(?<port>\\d+)/(?<db>[0-9a-z_%]+)(?<param>[\\?;#].*)*");
+    public static Pattern HIVE_JDBC_PATTERN = Pattern.compile("(?i)jdbc:hive2://(?<host>[^:]+):(?<port>\\d+)/(?<db>[^;]+)(?<param>[\\?;#].*)*");
     public static final String HOST_KEY = "host";
     public static final String PORT_KEY = "port";
     public static final String DB_KEY = "db";
@@ -264,7 +264,8 @@ public static String parseIpAndPort(String url) {
         if (matcher.find()) {
             addr = matcher.group(HOST_KEY) + ":" + matcher.group(PORT_KEY);
         } else {
-            addr = url.substring(url.indexOf("//") + 2, url.lastIndexOf("/"));
+            addr = url.substring(url.indexOf("//") + 2);
+            addr=  addr.substring(0,addr.indexOf("/"));
         }
         return addr;
     }