From 1104be0b1907286cc46768fa289c82724870fc4c Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 12 Jul 2024 17:45:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9B=B8=E5=85=B3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 omc/etc/omc.yaml                          | 14 +++++++-------
 omc/omc.go                                |  9 ---------
 src/framework/config/config.go            |  6 +++---
 src/modules/nms_cxy/controller/test.go    |  2 +-
 src/modules/nms_cxy/service/alarm.impl.go |  1 -
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/omc/etc/omc.yaml b/omc/etc/omc.yaml
index 6b1f88a..daaf105 100644
--- a/omc/etc/omc.yaml
+++ b/omc/etc/omc.yaml
@@ -187,7 +187,7 @@ nmsCXY:
   # 专业编码2位 核心网HX 无线网WX
   professionCode: "HX"
   # 厂商编码2位 中信科ZX
-  vendorCode: "AG"
+  vendorCode: "AT"
   # OMC编号3位
   omcCode: "001"
   # 设备序列号
@@ -195,9 +195,9 @@ nmsCXY:
   # Kafka配置
   kafka:
     addrs:
-      - "192.168.5.59:19092"
-      - "192.168.5.59:29092"
-      - "192.168.5.59:39092"
+      - "192.168.8.58:19092"
+      - "192.168.8.58:29092"
+      - "192.168.8.58:39092"
     # 启用 Kerberos 认证
     krb5:
       enable: false
@@ -211,7 +211,7 @@ nmsCXY:
   # OSS配置
   oss:
     bucketname: "omc-bucket"
-    endpoint: "192.168.5.59:9000"
+    endpoint: "192.168.8.58:39000"
     useSSL: false
-    accessKeyID: "aOW0r1gfw74G88Z3XZJ6"
-    secretAccessKey: "9tDErvtCEuVox6LoQu5BOVtycQKcQjlXOGvjl1eD"
+    accessKeyID: "hZjJOByIz6TFzOzNkKB9"
+    secretAccessKey: "eLpRYAG5Wb3Dr6bvmznGoiLmmflUsydOENLp9tlu"
diff --git a/omc/omc.go b/omc/omc.go
index 7f54caa..a7c5f84 100644
--- a/omc/omc.go
+++ b/omc/omc.go
@@ -214,15 +214,6 @@ func main() {
 				go HttpListen(listen, app)
 			}
 		}
-		// if rest.IPv4 != "0.0.0.0" {
-		// 	// 默认启动localhost侦听
-		// 	listenLocal := "127.0.0.1" + ":" + strconv.Itoa(int(rest.Port))
-		// 	if strings.ToLower(rest.Scheme) == "https" {
-		// 		go HttpListenTLS(listenLocal, rest.CaFile, rest.CertFile, rest.KeyFile, rest.ClientAuthType, app)
-		// 	} else {
-		// 		go HttpListen(listenLocal, app)
-		// 	}
-		// }
 		// ipv6 goroutines
 		if rest.IPv6 != "" {
 			listenv6 := "[" + rest.IPv6 + "]" + ":" + strconv.Itoa(int(rest.Port))
diff --git a/src/framework/config/config.go b/src/framework/config/config.go
index 66468f4..bdc31a4 100644
--- a/src/framework/config/config.go
+++ b/src/framework/config/config.go
@@ -27,9 +27,9 @@ func InitConfig() {
 func initFlag() {
 	// --env prod
 	pflag.String("env", "prod", "Specify Run Environment Configuration local or prod")
-	// --c /etc/restconf.yaml
-	// -c /etc/restconf.yaml
-	pConfig := pflag.StringP("config", "c", "./etc/restconf.yaml", "Specify Configuration File")
+	// --c /etc/omc.yaml
+	// -c /etc/omc.yaml
+	pConfig := pflag.StringP("config", "c", "./etc/omc.yaml", "Specify Configuration File")
 	// --version
 	// -V
 	pVersion := pflag.BoolP("version", "V", false, "Output program version")
diff --git a/src/modules/nms_cxy/controller/test.go b/src/modules/nms_cxy/controller/test.go
index e8ac0a6..f2a7cec 100644
--- a/src/modules/nms_cxy/controller/test.go
+++ b/src/modules/nms_cxy/controller/test.go
@@ -85,7 +85,7 @@ func (s *TestController) Demo(c *gin.Context) {
 		return
 	}
 	if body.OperType == "performance" {
-		err := s.performanceService.PerformanceUploadOSS("SMF", "2024-03-20 19:00:05", "2024-03-20 19:50:05")
+		err := s.performanceService.PerformanceUploadOSS("AMF", "2024-07-12 16:00:05", "2024-07-12 17:00:05")
 		c.JSON(200, map[string]any{
 			"requestId": body.RequestId,
 			"operType":  body.OperType,
diff --git a/src/modules/nms_cxy/service/alarm.impl.go b/src/modules/nms_cxy/service/alarm.impl.go
index 25cb715..ffb0ff6 100644
--- a/src/modules/nms_cxy/service/alarm.impl.go
+++ b/src/modules/nms_cxy/service/alarm.impl.go
@@ -97,7 +97,6 @@ func (s *AlarmImpl) KafkaPush(alarm neDataModel.Alarm) error {
 	// 发送消息
 	partition, offset, err := kafka.KInitConm.MessageSyncSend(topic, 0, string(bytes))
 	if err != nil {
-		logger.Errorf("KafkaPush MessageSyncSend err => %s", err.Error())
 		return err
 	}
 	logger.Infof("KafkaPush MessageSyncSend Partition:%d, Offset:%d", partition, offset)