From 8af452872d58ffdf2aebb3f837d539d5751b4b00 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 3 Jun 2024 18:08:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?style:=20=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=84=9A=E6=9C=AC=E8=B0=83=E6=95=B4=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E8=8F=9C=E5=8D=95=E9=87=8D=E7=BD=AE=EF=BC=8C=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=B2=97=E4=BD=8D=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/upgrade/upg_sys_menu.sql | 1 - database/upgrade/upg_sys_post.sql | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/database/upgrade/upg_sys_menu.sql b/database/upgrade/upg_sys_menu.sql index a029bc15..09955f61 100644 --- a/database/upgrade/upg_sys_menu.sql +++ b/database/upgrade/upg_sys_menu.sql @@ -20,7 +20,6 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- -- Table structure for sys_menu -- ---------------------------- -DROP TABLE IF EXISTS `sys_menu`; CREATE TABLE IF NOT EXISTS `sys_menu` ( `menu_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单ID', `menu_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '菜单名称', diff --git a/database/upgrade/upg_sys_post.sql b/database/upgrade/upg_sys_post.sql index 18f70f44..ebf9b296 100644 --- a/database/upgrade/upg_sys_post.sql +++ b/database/upgrade/upg_sys_post.sql @@ -14,9 +14,9 @@ CREATE TABLE IF NOT EXISTS `sys_post` ( PRIMARY KEY (`post_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='岗位信息表'; -INSERT INTO `sys_post` VALUES (1, 'administator', 'post.admin', 1, '1', 'supervisor', 1697110106499, NULL, 0, NULL); -INSERT INTO `sys_post` VALUES (2, 'operator', 'post.operator', 2, '1', 'supervisor', 1697110106499, NULL, 0, NULL); -INSERT INTO `sys_post` VALUES (3, 'monitor', 'post.monitor', 3, '1', 'supervisor', 1697110106499, NULL, 0, NULL); -INSERT INTO `sys_post` VALUES (4, 'visitor', 'post.visitor', 4, '1', 'supervisor', 1697110106499, NULL, 0, NULL); +INSERT IGNORE INTO `sys_post` VALUES (1, 'administator', 'post.admin', 1, '1', 'supervisor', 1697110106499, NULL, 0, NULL); +INSERT IGNORE INTO `sys_post` VALUES (2, 'operator', 'post.operator', 2, '1', 'supervisor', 1697110106499, NULL, 0, NULL); +INSERT IGNORE INTO `sys_post` VALUES (3, 'monitor', 'post.monitor', 3, '1', 'supervisor', 1697110106499, NULL, 0, NULL); +INSERT IGNORE INTO `sys_post` VALUES (4, 'visitor', 'post.visitor', 4, '1', 'supervisor', 1697110106499, NULL, 0, NULL); SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file From 44de9009dd1dd7b607d1e9d368df9cc1fd460b71 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 3 Jun 2024 18:27:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=AE=89=E8=A3=85OMC=E5=8D=87=E7=BA=A7=E9=87=8D=E5=90=AF?= =?UTF-8?q?=E8=87=AA=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network_element/service/ne_license.impl.go | 2 +- .../network_element/service/ne_version.impl.go | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/modules/network_element/service/ne_license.impl.go b/src/modules/network_element/service/ne_license.impl.go index d6f684ee..82d3060e 100644 --- a/src/modules/network_element/service/ne_license.impl.go +++ b/src/modules/network_element/service/ne_license.impl.go @@ -183,7 +183,7 @@ func (r *NeLicenseImpl) UploadLicense(neLicense model.NeLicense) error { if neTypeLower == "ims" { cmdStr = "sudo ims-stop || true && sudo ims-start" } else if neTypeLower == "omc" { - cmdStr = "sudo /usr/local/omc/bin/omcsvc.sh restart" + cmdStr = "sudo systemctl restart restagent" } sshClient.RunCMD(cmdStr) } diff --git a/src/modules/network_element/service/ne_version.impl.go b/src/modules/network_element/service/ne_version.impl.go index 473f109a..d642603c 100644 --- a/src/modules/network_element/service/ne_version.impl.go +++ b/src/modules/network_element/service/ne_version.impl.go @@ -125,10 +125,6 @@ func (r *NeVersionImpl) Operate(action string, neVersion model.NeVersion, preinp if err != nil { return "", err } - // 操作自己omc时 - if neVersion.NeType == "OMC" { - return sshClient.RunCMD(fmt.Sprintf("nohup sh -c \"sleep 3s && %s\" > /dev/null 2>&1 & \n", strings.Join(cmdStrArr, " && "))) - } // ========= 执行阶段 ========= commandLine, err := r.operateRun(sshClient, preinput, cmdStrArr, neVersion.NeType, okFlagStr) @@ -203,14 +199,15 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri // 组合命令输入 cmdStrArr := []string{} if neType == "OMC" { - cmdStrArr = append(cmdStrArr, pkgCmdStr) + cmdStrArr = append(cmdStrArr, pkgCmdStr+" \n") if action == "install" { - cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m install") // 初始化数据库 + cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m install \n") // 初始化数据库 } else { - cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/omcsvc.sh stop") - cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m upgrade") // 升级数据库 + cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m upgrade \n") // 升级数据库 } - cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/omcsvc.sh restart") + + // 2s后重启服务 + cmdStrArr = append(cmdStrArr, "nohup sh -c \"sleep 2s && sudo systemctl restart restagent\" > /dev/null 2>&1 & \n") } else if neType == "IMS" { if action == "install" { para5GData := NewNeInfoImpl.Para5GData