From d9a834fb8c1516eb4bb674d2a67fa7e00a3eb501 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Wed, 18 Oct 2023 18:06:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=88=97=E8=A1=A8=E6=9B=B4=E6=96=B0=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E6=96=B0=E7=9A=84=E5=89=8D=E7=AB=AFvue3=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/misc/dumpdb.sh    | 30 +++++++++++++++++++++---------
 tools/misc/tables_c.lst | 15 ++++++++-------
 tools/misc/tables_s.lst | 21 ++++++++++++---------
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/tools/misc/dumpdb.sh b/tools/misc/dumpdb.sh
index 54712ce5..b6018614 100644
--- a/tools/misc/dumpdb.sh
+++ b/tools/misc/dumpdb.sh
@@ -11,12 +11,30 @@ dbname="omc_db"
 dumpdbdir=${EmsBEDir}/tools/misc
 insdir=${EmsBEDir}/database/install
 upgdir=${EmsBEDir}/database/upgrade
-tables_c=tables_c.lst
 tables_s=tables_s.lst
+tables_c=tables_c.lst
+tables_ic=tables_ic.lst
 
 mysql -h ${host} -P ${port} -u ${user} -p${password} -D ${dbname} -e "show tables ; " > tables.lst
 
-# dump table struct and data
+# dump table struct to install dir
+while read line
+  do
+    table=`echo $line | cut -d " " -f 1`
+    echo "dump ${table} to install directory"
+    mysqldump -h ${host} -P ${port} -u ${user} -p${password} -d ${dbname} ${table} > ${insdir}/${table}.sql
+  done < ${dumpdbdir}/${tables_s}
+
+# dump table struct and data to install dir
+while read line
+  do
+    table=`echo $line | cut -d " " -f 1`
+    echo "dump ${table} to install & upgrade directory"
+    mysqldump -h ${host} -P ${port} -u ${user} -p${password} ${dbname} ${table} > ${insdir}/${table}.sql
+  done < ${dumpdbdir}/${tables_ic}
+
+
+# dump table struct and data to upgrade and install dir
 while read line
   do
     table=`echo $line | cut -d " " -f 1`
@@ -25,12 +43,6 @@ while read line
     mysqldump -h ${host} -P ${port} -u ${user} -p${password} ${dbname} ${table} > ${upgdir}/${table}.sql
   done < ${dumpdbdir}/${tables_c}
 
-# dump table struct
-while read line
-  do
-    table=`echo $line | cut -d " " -f 1`
-    echo "dump ${table} to install directory"
-    mysqldump -h ${host} -P ${port} -u ${user} -p${password} -d ${dbname} ${table} > ${insdir}/${table}.sql
-  done < ${dumpdbdir}/${tables_s}
+
 
   
\ No newline at end of file
diff --git a/tools/misc/tables_c.lst b/tools/misc/tables_c.lst
index 1746ade1..d8f3a5f4 100644
--- a/tools/misc/tables_c.lst
+++ b/tools/misc/tables_c.lst
@@ -1,5 +1,6 @@
 alarm_define
 cm_title
+config
 group
 kpi_title
 measure_title
@@ -9,12 +10,12 @@ mml_http_map
 mml_subscriber
 mml_system
 param_config
+pm_custom_title
+sys_config
+sys_dept
+sys_dict_data
+sys_dict_type
+sys_menu
 title_info
 trace_info
-user_menu
-permission
-cert_info
-sys_menu
-sys_dict_type
-sys_dict_data
-sys_config
+
diff --git a/tools/misc/tables_s.lst b/tools/misc/tables_s.lst
index 929ea25c..4c63d991 100644
--- a/tools/misc/tables_s.lst
+++ b/tools/misc/tables_s.lst
@@ -4,6 +4,7 @@ alarm_forward_log
 alarm_log
 alarm_relation
 alarm_subscribe
+cert_info
 event_log
 gold_kpi
 measure_data
@@ -38,18 +39,20 @@ security_log
 session
 sys_backup
 sys_extended
+sys_job
+sys_job_log
+sys_log_login
+sys_log_operate
 sys_perf_data
+sys_post
+sys_role
+sys_role_dept
+sys_role_menu
+sys_user
+sys_user_post
+sys_user_role
 system_log
 trace_data
 trace_task
-permission
-role_permission
-role
-user
-user_role
-sys_role
-sys_role_menu
-sys_user_role
-u_sub_user
 u_auth_user
 #end
\ No newline at end of file