From: guochuyicmri <guochuyi@chinamobile.com>
Date: Tue, 16 Apr 2019 02:08:08 +0000 (+0800)
Subject: Upgrade uui-server database to postgreSQL
X-Git-Tag: 2.0.0~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2ab776ce04fd45c07d8918fdcb131b9b123250e5;p=usecase-ui%2Fserver.git

Upgrade uui-server database to postgreSQL

Change-Id: I0cc146be21d3dc4cddbb635cdca931640f2c66f0
Issue-ID: USECASEUI-236
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
---

diff --git a/standalone/src/main/assembly/bin/run.sh b/standalone/src/main/assembly/bin/run.sh
index 57b49897..679fc208 100644
--- a/standalone/src/main/assembly/bin/run.sh
+++ b/standalone/src/main/assembly/bin/run.sh
@@ -25,7 +25,7 @@ sleep 10
 echo "usecase-ui database init script start..."
 dbScript="$main_path/resources/bin/initDB.sh"
 chmod 755 $dbScript
-source $dbScript postgres postgres 127.0.0.1 5432 postgres
+source $dbScript 127.0.0.1 5432 postgres postgres postgres
 echo "usecase-ui database init script finished normally..."
 
 JAVA_PATH="$JAVA_HOME/bin/java"
diff --git a/standalone/src/main/assembly/resources/bin/initDB.sh b/standalone/src/main/assembly/resources/bin/initDB.sh
index a7ee1eed..8c4cc8b8 100644
--- a/standalone/src/main/assembly/resources/bin/initDB.sh
+++ b/standalone/src/main/assembly/resources/bin/initDB.sh
@@ -17,17 +17,22 @@
 
 echo "setting database init parameters"
 main_path="/home/uui"
-user=$1
-password=$2
-host=$3
-port=$4
-dbname=$5
+host=$1
+port=$2
+dbname=$3
+user=$4
+password=$5
+
+echo "setting postgres database password"
+su - $user <<EOF
+psql --command "alter user $user with password '$password';"
+EOF
 
 echo "start create usecase-ui database..."
 dbscripts_path="$main_path/resources/dbscripts/postgres"
 psql "host=$host port=$port user=$user password=$password dbname=$dbname" -f $dbscripts_path/uui_create_db.sql
 sql_result=$?
-if [ $sql_result!=0 ] then
+if [ $sql_result!=0 ]; then
     echo "failed to create usecase-ui database!"
     exit 1
 else
@@ -37,7 +42,7 @@ fi
 echo "start create usecase-ui tables..."
 psql "host=$host port=$port user=$user password=$password dbname=$dbname" -f $dbscripts_path/uui_create_table.sql
 sql_result=$?
-if [ $sql_result!=0 ] then
+if [ $sql_result!=0 ]; then
     echo "failed to create usecase-ui table!"
     exit 1
 else