From 4467d786c722c494162b378fa3c99dc599121c14 Mon Sep 17 00:00:00 2001 From: zhangsz Date: Mon, 16 Jun 2025 14:02:52 +0800 Subject: [PATCH] feat: change db name from omc_db to psap_db --- config/etc/default/restconf.yaml | 2 +- config/etc/default/sshsvc.yaml | 2 +- database/install/mf_callback_ticket.sql | 3 ++- misc/importdb.sh | 2 +- misc/setomc.sh | 2 +- restagent/etc/restconf-t.yaml | 2 +- restagent/etc/restconf.yaml | 2 +- src/config/config.local.yaml | 2 +- src/modules/network_element/ne_config_test.go | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/config/etc/default/restconf.yaml b/config/etc/default/restconf.yaml index 7a8a8e36..75173d72 100644 --- a/config/etc/default/restconf.yaml +++ b/config/etc/default/restconf.yaml @@ -44,7 +44,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: psap_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True backup: /usr/local/omc/database diff --git a/config/etc/default/sshsvc.yaml b/config/etc/default/sshsvc.yaml index 414c397e..71a639d2 100644 --- a/config/etc/default/sshsvc.yaml +++ b/config/etc/default/sshsvc.yaml @@ -71,7 +71,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: psap_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True omc: diff --git a/database/install/mf_callback_ticket.sql b/database/install/mf_callback_ticket.sql index fc4acc79..744ac08a 100755 --- a/database/install/mf_callback_ticket.sql +++ b/database/install/mf_callback_ticket.sql @@ -11,7 +11,7 @@ Target Server Version : 100622 (10.6.22-MariaDB-0ubuntu0.22.04.1) File Encoding : 65001 - Date: 14/06/2025 12:30:47 + Date: 16/06/2025 11:52:26 */ SET NAMES utf8mb4; @@ -29,6 +29,7 @@ CREATE TABLE `mf_callback_ticket` ( `agent_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT 'agent name', `comment` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT 'comment for callback', `msd_data` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT 'MSD data', + `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'MF Resource UID', `created_at` bigint(20) NULL DEFAULT NULL COMMENT 'created at time', `updated_at` bigint(20) NULL DEFAULT NULL COMMENT 'updated at time', PRIMARY KEY (`ticket_id`) USING BTREE, diff --git a/misc/importdb.sh b/misc/importdb.sh index 2faa001e..cf193e39 100755 --- a/misc/importdb.sh +++ b/misc/importdb.sh @@ -4,7 +4,7 @@ USER="root" PASSWORD="1000omc@kp!" HOST="127.0.0.1" PORT="33066" -DBNAME="omc_db" +DBNAME="psap_db" UpgradeSQLDir=/usr/local/omc/etc/db/upgrade Upgvue3SQLDir=/usr/local/omc/etc/db/upgvue3 InstallSQLDir=/usr/local/omc/etc/db/install diff --git a/misc/setomc.sh b/misc/setomc.sh index 619d3206..2a978a4a 100755 --- a/misc/setomc.sh +++ b/misc/setomc.sh @@ -42,7 +42,7 @@ check_args() { USER="root" PASSWORD="1000omc@kp!" PORT="33066" -DBNAME="omc_db" +DBNAME="psap_db" OMCRootDir=/usr/local/omc OMCBinDir=${OMCRootDir}/bin UpgradeSQLDir=${OMCRootDir}/etc/db/upgrade diff --git a/restagent/etc/restconf-t.yaml b/restagent/etc/restconf-t.yaml index 2ec34bdc..87065159 100644 --- a/restagent/etc/restconf-t.yaml +++ b/restagent/etc/restconf-t.yaml @@ -44,7 +44,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: psap_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True backup: d:/omc.git/be.ems/restagent/database diff --git a/restagent/etc/restconf.yaml b/restagent/etc/restconf.yaml index 9836dc69..0eb32a37 100644 --- a/restagent/etc/restconf.yaml +++ b/restagent/etc/restconf.yaml @@ -49,7 +49,7 @@ database: password: "1000omc@kp!" host: "192.168.2.223" port: 33066 - name: omc_db + name: psap_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True backup: ./database diff --git a/src/config/config.local.yaml b/src/config/config.local.yaml index f2dacf6b..c1c2737f 100644 --- a/src/config/config.local.yaml +++ b/src/config/config.local.yaml @@ -34,7 +34,7 @@ gorm: port: 33066 username: "root" password: "1000omc@kp!" - database: "omc_db" + database: "psap_db" logging: true # Redis 缓存数据，数据源声明全小写 diff --git a/src/modules/network_element/ne_config_test.go b/src/modules/network_element/ne_config_test.go index c84ef00d..5c3fb054 100644 --- a/src/modules/network_element/ne_config_test.go +++ b/src/modules/network_element/ne_config_test.go @@ -25,7 +25,7 @@ const ( DbPort = 33066 DbUser = "root" DbPassswd = "1000omc@kp!" - DbName = "omc_db" + DbName = "psap_db" // 配置文件路径 configParamDir = "../../../config/param" // configParamFile = "*" // 目录下全部更新