From cd05259c7812b30a8933d7179d5f84a965fd492b Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Thu, 25 Feb 2021 13:31:38 +0800
Subject: [PATCH] change

---
 .../main/java/com/taosdata/jdbc/rs/RestfulDriver.java | 11 +++++++++++
 .../java/com/taosdata/jdbc/rs/AuthenticationTest.java |  4 +---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java
index 3e1eea2fbf..d45ca0c3a0 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java
@@ -7,6 +7,8 @@ import com.taosdata.jdbc.TSDBConstants;
 import com.taosdata.jdbc.TSDBDriver;
 import com.taosdata.jdbc.utils.HttpClientPoolUtil;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.sql.*;
 import java.util.Properties;
 import java.util.logging.Logger;
@@ -41,6 +43,15 @@ public class RestfulDriver extends AbstractDriver {
                 + props.getProperty(TSDBDriver.PROPERTY_KEY_PORT) + "/rest/login/"
                 + props.getProperty(TSDBDriver.PROPERTY_KEY_USER) + "/"
                 + props.getProperty(TSDBDriver.PROPERTY_KEY_PASSWORD) + "";
+        try {
+            String user = URLEncoder.encode(props.getProperty(TSDBDriver.PROPERTY_KEY_USER), "UTF-8");
+            String password = URLEncoder.encode(props.getProperty(TSDBDriver.PROPERTY_KEY_PASSWORD), "UTF-8");
+            loginUrl = "http://" + props.getProperty(TSDBDriver.PROPERTY_KEY_HOST) + ":"
+                    + props.getProperty(TSDBDriver.PROPERTY_KEY_PORT) + "/rest/login/" + user + "/" + password + "";
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
         String result = HttpClientPoolUtil.execute(loginUrl);
         JSONObject jsonResult = JSON.parseObject(result);
         String status = jsonResult.getString("status");
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java
index aba591ba56..b0666989ba 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java
@@ -3,14 +3,12 @@ package com.taosdata.jdbc.rs;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.sql.*;
 
 public class AuthenticationTest {
 
     private static final String host = "127.0.0.1";
-    //        private static final String host = "master";
+    //    private static final String host = "master";
     private static final String user = "root";
     private static final String password = "taos?data";
     private Connection conn;