OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

Merge remote-tracking branch 'origin/lichang'

Browse Source
This commit is contained in:
TsMask
2024-06-03 18:32:29 +08:00
parent db665f5dc8 44de9009dd
commit 084938eb5c
4 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
database/upgrade/upg_sys_menu.sql
View File

@@ -20,7 +20,6 @@ SET FOREIGN_KEY_CHECKS = 0;
-- ---------------------------- -- ----------------------------
-- Table structure for sys_menu -- Table structure for sys_menu
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `sys_menu`;
CREATE TABLE IF NOT EXISTS `sys_menu` ( CREATE TABLE IF NOT EXISTS `sys_menu` (
`menu_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单ID', `menu_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单ID',
`menu_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '菜单名称', `menu_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '菜单名称',

8
database/upgrade/upg_sys_post.sql
View File

@@ -14,9 +14,9 @@ CREATE TABLE IF NOT EXISTS `sys_post` (
PRIMARY KEY (`post_id`) USING BTREE PRIMARY KEY (`post_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='岗位信息表'; ) 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 IGNORE 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 IGNORE 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 IGNORE 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 (4, 'visitor', 'post.visitor', 4, '1', 'supervisor', 1697110106499, NULL, 0, NULL);
SET FOREIGN_KEY_CHECKS=1; SET FOREIGN_KEY_CHECKS=1;

2
src/modules/network_element/service/ne_license.impl.go
View File

@@ -183,7 +183,7 @@ func (r *NeLicenseImpl) UploadLicense(neLicense model.NeLicense) error {
if neTypeLower == "ims" { if neTypeLower == "ims" {
cmdStr = "sudo ims-stop || true && sudo ims-start" cmdStr = "sudo ims-stop || true && sudo ims-start"
} else if neTypeLower == "omc" { } else if neTypeLower == "omc" {
cmdStr = "sudo /usr/local/omc/bin/omcsvc.sh restart" cmdStr = "sudo systemctl restart restagent"
} }
sshClient.RunCMD(cmdStr) sshClient.RunCMD(cmdStr)
} }

15
src/modules/network_element/service/ne_version.impl.go
View File

@@ -125,10 +125,6 @@ func (r *NeVersionImpl) Operate(action string, neVersion model.NeVersion, preinp
if err != nil { if err != nil {
return "", err 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) 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{} cmdStrArr := []string{}
if neType == "OMC" { if neType == "OMC" {
cmdStrArr = append(cmdStrArr, pkgCmdStr) cmdStrArr = append(cmdStrArr, pkgCmdStr+" \n")
if action == "install" { 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 { } else {
cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/omcsvc.sh stop") cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m upgrade \n") // 升级数据库
cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m upgrade") // 升级数据库
} }
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" { } else if neType == "IMS" {
if action == "install" { if action == "install" {
para5GData := NewNeInfoImpl.Para5GData para5GData := NewNeInfoImpl.Para5GData