From 88927540431ee74eb4d5b056791365db693f7325 Mon Sep 17 00:00:00 2001
From: lihui <huili@taosdata.com>
Date: Sat, 21 Mar 2020 16:03:34 +0800
Subject: [PATCH] [TD-20]

---
 packaging/tools/makeclient.sh                                 | 2 +-
 packaging/tools/makepkg.sh                                    | 2 +-
 src/system/detail/src/mgmtShell.c                             | 4 +++-
 .../examples/JDBC/JDBCDemo/src/main/java/TSDBSyncSample.java  | 2 +-
 tests/examples/c/subscribe.c                                  | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packaging/tools/makeclient.sh b/packaging/tools/makeclient.sh
index 90135e5a17..43a0cf94f0 100755
--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
@@ -154,7 +154,7 @@ mkdir -p ${install_dir}/connector
 
 if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
   if [ "$osType" != "Darwin" ]; then
-    cp ${build_dir}/lib/*.jar      ${install_dir}/connector
+    cp ${build_dir}/lib/*jdbc*.jar      ${install_dir}/connector
   fi
   cp -r ${connector_dir}/grafana ${install_dir}/connector/
   cp -r ${connector_dir}/python  ${install_dir}/connector/
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index 35a9a43e92..5b3773a304 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -186,7 +186,7 @@ cp ${lib_files} ${install_dir}/driver
 connector_dir="${code_dir}/connector"
 mkdir -p ${install_dir}/connector
 if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
-  cp ${build_dir}/lib/*.jar      ${install_dir}/connector
+  cp ${build_dir}/lib/*jdbc*.jar      ${install_dir}/connector
   cp -r ${connector_dir}/grafana ${install_dir}/connector/
   cp -r ${connector_dir}/python  ${install_dir}/connector/
   cp -r ${connector_dir}/go      ${install_dir}/connector
diff --git a/src/system/detail/src/mgmtShell.c b/src/system/detail/src/mgmtShell.c
index e617b4b45c..2af9d12929 100644
--- a/src/system/detail/src/mgmtShell.c
+++ b/src/system/detail/src/mgmtShell.c
@@ -1334,7 +1334,9 @@ _rsp:
   pMsg += sizeof(STaosRsp);
 
   pConnectRsp = (SConnectRsp *)pRsp->more;
-  sprintf(pConnectRsp->acctId, "%x", pConn->pAcct->acctId);
+  if (NULL != pConn->pAcct) {
+    sprintf(pConnectRsp->acctId, "%x", pConn->pAcct->acctId);
+  }
   strcpy(pConnectRsp->version, version);
   pConnectRsp->writeAuth = pConn->writeAuth;
   pConnectRsp->superAuth = pConn->superAuth;
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/TSDBSyncSample.java b/tests/examples/JDBC/JDBCDemo/src/main/java/TSDBSyncSample.java
index c093b604da..76b2e5f857 100644
--- a/tests/examples/JDBC/JDBCDemo/src/main/java/TSDBSyncSample.java
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/TSDBSyncSample.java
@@ -6,7 +6,7 @@ public class TSDBSyncSample {
 
     private String host = "127.0.0.1";
     private String user = "root";
-    private String password = "taosdata";
+    private String password = "powerdb";  //"taosdata";
     private int port = 0;
     private String jdbcUrl = "";
 
diff --git a/tests/examples/c/subscribe.c b/tests/examples/c/subscribe.c
index 0bf93f6f2d..17f97057b2 100644
--- a/tests/examples/c/subscribe.c
+++ b/tests/examples/c/subscribe.c
@@ -144,7 +144,7 @@ void run_test(TAOS* taos) {
 int main(int argc, char *argv[]) {
   const char* host = "127.0.0.1";
   const char* user = "root";
-  const char* passwd = "taosdata";
+  const char* passwd = "powerdb";
   const char* sql = "select * from meters;";
   const char* topic = "test-multiple";
   int async = 1, restart = 0, keep = 1, test = 0, blockFetch = 0;
-- 
GitLab