diff --git a/database/upgrade/upg_sys_dept.sql b/database/upgrade/upg_sys_dept.sql index 428e6c82..86192e59 100644 --- a/database/upgrade/upg_sys_dept.sql +++ b/database/upgrade/upg_sys_dept.sql @@ -1,6 +1,5 @@ SET FOREIGN_KEY_CHECKS=0; -DROP TABLE IF EXISTS `sys_menu`; CREATE TABLE IF NOT EXISTS `sys_dept` ( `dept_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门id', `parent_id` bigint(20) DEFAULT 0 COMMENT '父部门id 默认0', diff --git a/misc/importdb.sh b/misc/importdb.sh index 21320cfc..041fa875 100644 --- a/misc/importdb.sh +++ b/misc/importdb.sh @@ -14,105 +14,105 @@ create_db_sql="create database IF NOT EXISTS ${DBNAME}" case "$1" in upgrade) - echo "Upgrade database ${DBNAME}" - for SQL in ${UpgradeSQLDir}/*.sql; do - echo -n "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; - if [ $? = 0 ]; then - echo "done" - fi - done + echo "Upgrade database ${DBNAME}" + for SQL in ${UpgradeSQLDir}/*.sql; do + echo -n "Execute SQL script: ${SQL} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; + if [ $? = 0 ]; then + echo "done" + fi + done ;; upgvue3) - echo "Upgrade to vue3 database ${DBNAME}" - for SQL in ${Upgvue3SQLDir}/*.sql; do - echo -n "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; - if [ $? = 0 ]; then - echo "done" - fi - done + echo "Upgrade to vue3 database ${DBNAME}" + for SQL in ${Upgvue3SQLDir}/*.sql; do + echo -n "Execute SQL script: ${SQL} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; + if [ $? = 0 ]; then + echo "done" + fi + done ;; install) - echo "Drop database ${DBNAME} ...!!!" - mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${drop_db_sql}" - echo "Create database ${DBNAME} if not exist" - mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${create_db_sql}" - for SQL in ${InstallSQLDir}/*.sql; do - echo -n "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; - if [ $? = 0 ]; then - echo "done" - fi - done + echo "Drop database ${DBNAME} ...!!!" + mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${drop_db_sql}" + echo "Create database ${DBNAME} if not exist" + mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${create_db_sql}" + for SQL in ${InstallSQLDir}/*.sql; do + echo -n "Execute SQL script: ${SQL} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; + if [ $? = 0 ]; then + echo "done" + fi + done ;; - + *) - while true - do - read -r -p "Do you upgrade or upgrade from layui to vue3 or fresh install database ${DBNAME}? [Upgrade/upgVue3/Install/Quit] " input + while true + do + read -r -p "Do you upgrade or upgrade from layui to vue3 or fresh install database ${DBNAME}? [Upgrade/upgVue3/Install/Quit] " input - case $input in - [uU][pP][gG][rR][aA][dD][eE]|[uU]) - echo "Skip to drop database ${DBNAME}" - echo "Upgrade database ${DBNAME}" - - for SQL in ${UpgradeSQLDir}/*.sql; do - echo -n "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; - if [ $? = 0 ]; then - echo "done" - fi - done + case $input in + [uU][pP][gG][rR][aA][dD][eE]|[uU]) + echo "Skip to drop database ${DBNAME}" + echo "Upgrade database ${DBNAME}" + + for SQL in ${UpgradeSQLDir}/*.sql; do + echo -n "Execute SQL script: ${SQL} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; + if [ $? = 0 ]; then + echo "done" + fi + done - break - ;; + break + ;; - [uU][pP][gG][vV][uU][eE][3]|[vV]]) - echo "Skip to drop database ${DBNAME}" - echo "Upgrade to vue3 database ${DBNAME}" + [uU][pP][gG][vV][uU][eE][3]|[vV]]) + echo "Skip to drop database ${DBNAME}" + echo "Upgrade to vue3 database ${DBNAME}" - for SQL in ${Upgvue3SQLDir}/*.sql; do - echo -n "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; - if [ $? = 0 ]; then - echo "done" - fi - done + for SQL in ${Upgvue3SQLDir}/*.sql; do + echo -n "Execute SQL script: ${SQL} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; + if [ $? = 0 ]; then + echo "done" + fi + done - break - ;; + break + ;; - [iI][nN][sS][tT][aA][lL][lL]|[iI]) - echo "Drop database ${DBNAME} ...!!!" + [iI][nN][sS][tT][aA][lL][lL]|[iI]) + echo "Drop database ${DBNAME} ...!!!" - mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${drop_db_sql}" - echo "Create database ${DBNAME} if not exist" - mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${create_db_sql}" + mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${drop_db_sql}" + echo "Create database ${DBNAME} if not exist" + mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${create_db_sql}" - for SQL in ${InstallSQLDir}/*.sql; do - echo -n "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; - if [ $? = 0 ]; then - echo "done" - fi - done + for SQL in ${InstallSQLDir}/*.sql; do + echo -n "Execute SQL script: ${SQL} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; + if [ $? = 0 ]; then + echo "done" + fi + done - break - ;; + break + ;; - [qQ][uU][iI][tT]|[qQ]) - echo "Nothing to be done! GOOD BYE" - exit 1; - ;; + [qQ][uU][iI][tT]|[qQ]) + echo "Nothing to be done! GOOD BYE" + exit 1; + ;; - *) - echo "Invalid input..." - ;; - esac - done + *) + echo "Invalid input..." + ;; + esac + done ;; esac @@ -121,34 +121,34 @@ ne_types=$(mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D for ne_type in ${ne_types}; do TABLE_NAME="kpi_report_${ne_type}" SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} LIKE \`kpi_report\`;" - echo -n "Create table: ${TABLE_NAME} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}" - if [ $? = 0 ]; then - echo "done" - fi - SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE, ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;" - echo -n "Create index of ${TABLE_NAME} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}" - if [ $? = 0 ]; then - echo "done" - fi - SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE,ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;" - echo -n "Create index of ${TABLE_NAME} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}" - if [ $? = 0 ]; then - echo "done" - fi - SQL="ALTER TABLE ${TABLE_NAME} ADD COLUMN IF NOT EXISTS \`tenant_id\` varchar(32) NULL DEFAULT NULL AFTER \`created_at\`;" - echo -n "Alter table ${TABLE_NAME} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}" - if [ $? = 0 ]; then - echo "done" - fi + echo -n "Create table: ${TABLE_NAME} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}" + if [ $? = 0 ]; then + echo "done" + fi + SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE, ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;" + echo -n "Create index of ${TABLE_NAME} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}" + if [ $? = 0 ]; then + echo "done" + fi + SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE,ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;" + echo -n "Create index of ${TABLE_NAME} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}" + if [ $? = 0 ]; then + echo "done" + fi + SQL="ALTER TABLE ${TABLE_NAME} ADD COLUMN IF NOT EXISTS \`tenant_id\` varchar(32) NULL DEFAULT NULL AFTER \`created_at\`;" + echo -n "Alter table ${TABLE_NAME} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}" + if [ $? = 0 ]; then + echo "done" + fi TABLE_NAME="kpi_c_report_${ne_type}" SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} LIKE \`kpi_c_report\`;" - echo -n "Create table: ${TABLE_NAME} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}" - if [ $? = 0 ]; then - echo "done" - fi + echo -n "Create table: ${TABLE_NAME} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}" + if [ $? = 0 ]; then + echo "done" + fi done \ No newline at end of file