Merge branch 'main' of http://61.169.135.146:8081/git/cac/install

ncac/setup.ini

@@ -20,7 +20,7 @@ CAC_INS=1
 AUTO_START=1
 
 ### 是否安装61850 ###
-GUI_INS=1
+GUI_INS=0
 
 ### 是否安装自带的JDK ###
 JDK_INS=1

ncac/ubuntu22/setup.sh

@@ -33,7 +33,6 @@ installDatabase(){
     systemctl stop mysql
     sleep 1
     sed -i 's/123456/'${DB_PASS}'/' package/init.sql
-    sed -i 's/cacdb/'${DB_INS}'/g' package/cacdb.sql
 
     echo "  初始化数据库 ..."
     echo ""
@@ -47,11 +46,20 @@ installDatabase(){
     sleep 1
     export MYSQL_PWD=${DB_PASS}
     mysql -u root < package/init.sql
-    mysql -u root < package/cacdb.sql
     sleep 1
     echo "  重启数据库 ..."
     echo ""
     systemctl restart mysql
+    sleep 1
+}
+
+createDatabase(){
+    echo "  建库建表 ..."
+    echo ""
+    sed -i 's/cacdb/'${DB_INS}'/g' package/cacdb.sql
+    export MYSQL_PWD=${DB_PASS}
+    mysql -u root < package/cacdb.sql
+    sleep 1
 }
 
 #################### 安装OpenJDK ################################################
@@ -330,6 +338,9 @@ fi
 if [ $MYSQL_INS == 1 ]; then
     installDatabase
 fi
+if [ $DB_CREATE == 1 ]; then
+    createDatabase
+fi
 
 if [ $JDK_INS == 1 ]; then
     installJDK