From 64df6e9f72b410a787dc88dce98ddaec7e760ce3 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 23 Aug 2023 19:21:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/launch.json         | 2 +-
 core/result.go              | 4 ++--
 nb_alarm.go => nbi_alarm.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename nb_alarm.go => nbi_alarm.go (94%)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index d6d3cec..325b937 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "type": "go",
             "request": "launch",
             "mode": "debug",
-            "program": "./nb_alarm.go",
+            "program": "./nbi_alarm.go",
             "args": ["-c", "conf/nbi_alarm.json"],
             "console": "integratedTerminal"
         }
diff --git a/core/result.go b/core/result.go
index 84b0734..a6ef3fe 100644
--- a/core/result.go
+++ b/core/result.go
@@ -15,8 +15,8 @@ func Result(name string, data map[string]string) []byte {
 func ResultError(name string, desc, reqID string) []byte {
 	data := map[string]string{
 		"result":  "fail",
-		"reqId":   reqID,
 		"resDesc": desc,
+		"reqId":   reqID,
 	}
 
 	return Result(name, data)
@@ -26,8 +26,8 @@ func ResultError(name string, desc, reqID string) []byte {
 func ResultSuccess(name string, desc, reqID string) []byte {
 	data := map[string]string{
 		"result":  "succ",
-		"reqId":   reqID,
 		"resDesc": desc,
+		"reqId":   reqID,
 	}
 
 	return Result(name, data)
diff --git a/nb_alarm.go b/nbi_alarm.go
similarity index 94%
rename from nb_alarm.go
rename to nbi_alarm.go
index 94a0e84..386717e 100644
--- a/nb_alarm.go
+++ b/nbi_alarm.go
@@ -16,7 +16,7 @@ import (
 	"github.com/aceld/zinx/zlog"
 )
 
-// go run nb_alarm.go -c conf\nbi_alarm.json
+// go run nbi_alarm.go -c conf\nbi_alarm.json
 func main() {
 	// 配置初始化
 	conf.Init(args.Args.ConfigFile)