From 2be150c9ae92d3d552612f51c56f8915a30c1ccb Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Sat, 31 Aug 2024 14:38:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20restagent=E6=94=B9omc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/cm/ne.go                     |  2 +-
 omc/omc.go                            | 42 ---------------------------
 src/app.go                            |  5 +++-
 src/framework/utils/machine/launch.go |  2 +-
 src/modules/common/common.go          |  2 ++
 5 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/features/cm/ne.go b/features/cm/ne.go
index 88fbcbf..a409022 100644
--- a/features/cm/ne.go
+++ b/features/cm/ne.go
@@ -862,7 +862,7 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
 		// send 204 to fe firstly
 		services.ResponseStatusOK204NoContent(w)
 		//actionCmd := fmt.Sprintf("sudo %s/bin/omcsvc.sh %s", config.GetYamlConfig().NE.OmcDir, action)
-		actionCmd := fmt.Sprintf("sudo systemctl %s restagent", action)
+		actionCmd := fmt.Sprintf("sudo systemctl %s omc", action)
 		go RunSSHCmd(sshHost, actionCmd)
 		return
 		// cmd := exec.Command("ssh", sshHost, actionCmd)
diff --git a/omc/omc.go b/omc/omc.go
index 742a72d..7a22773 100644
--- a/omc/omc.go
+++ b/omc/omc.go
@@ -31,48 +31,6 @@ import (
 	"golang.org/x/net/http2/h2c"
 )
 
-// const defaultConfigFile = "./etc/restconf.yaml"
-
-// func init() {
-// 	cfile := flag.String("c", defaultConfigFile, "config file")
-// 	pv := flag.Bool("v", false, "print version")
-// 	ph := flag.Bool("h", false, "print help")
-
-// 	flag.Parse()
-// 	if *pv {
-// 		fmt.Printf("OMC restagent version: %s\n%s\n%s\n\n", global.Version, global.BuildTime, global.GoVer)
-// 		os.Exit(0)
-// 	}
-// 	if *ph {
-// 		flag.Usage()
-// 		os.Exit(0)
-// 	}
-
-// 	config.ReadConfig(*cfile)
-// 	config.UriPrefix = config.GetYamlConfig().OMC.UriPrefix
-// 	//fmt.Println(config.UriPrefix)
-// }
-
-// func listenIPv6(ipv6 string, port int) {
-// 	//
-// 	addr := &net.TCPAddr{
-// 		IP:   net.ParseIP(ipv6),
-// 		Port: port,
-// 	}
-
-// 	listener, err := net.ListenTCP("tcp6", addr)
-// 	if err != nil {
-// 		fmt.Println("Failed to listen:", err)
-// 		return
-// 	}
-
-// 	server := &http.Server{}
-// 	err = server.Serve(listener)
-// 	if err != nil {
-// 		fmt.Println("Failed to serve:", err)
-// 	}
-// }
-
 func HttpListen(addr string, router http.Handler) {
 	// 创建HTTP服务器
 	h2s := &http2.Server{
diff --git a/src/app.go b/src/app.go
index 3c460d2..59a4090 100644
--- a/src/app.go
+++ b/src/app.go
@@ -98,7 +98,10 @@ func initAppEngine() *gin.Engine {
 // 初始全局默认
 func initDefeat(app *gin.Engine) {
 	// 全局中间件
-	app.Use(errorcatch.ErrorCatch(), middleware.Report(), middleware.Cors(), security.Security())
+	if config.Env() == "local" {
+		app.Use(middleware.Report())
+	}
+	app.Use(errorcatch.ErrorCatch(), middleware.Cors(), security.Security())
 
 	// 静态目录-静态资源
 	if v := config.Get("staticFile.default"); v != nil {
diff --git a/src/framework/utils/machine/launch.go b/src/framework/utils/machine/launch.go
index 5f5f83b..b0a9cc0 100644
--- a/src/framework/utils/machine/launch.go
+++ b/src/framework/utils/machine/launch.go
@@ -167,7 +167,7 @@ func Reset() error {
 			return err
 		}
 		// 重启服务
-		if _, err := cmd.Execf("nohup sh -c \"sleep 1s && %s\" > /dev/null 2>&1 &", "sudo systemctl restart restagent"); err != nil {
+		if _, err := cmd.Execf("nohup sh -c \"sleep 1s && %s\" > /dev/null 2>&1 &", "sudo systemctl restart omc"); err != nil {
 			return err
 		}
 	}
diff --git a/src/modules/common/common.go b/src/modules/common/common.go
index 35c7a1e..24ed6af 100644
--- a/src/modules/common/common.go
+++ b/src/modules/common/common.go
@@ -52,6 +52,7 @@ func Setup(router *gin.Engine) {
 			// 	Count: 10,
 			// 	Type:  middleware.LIMIT_IP,
 			// }),
+			middleware.CryptoApi(true, true),
 			controller.NewAccount.Login,
 		)
 		indexGroup.GET("/getInfo", middleware.PreAuthorize(nil), controller.NewAccount.Info)
@@ -74,6 +75,7 @@ func Setup(router *gin.Engine) {
 			// 	Count: 10,
 			// 	Type:  middleware.LIMIT_IP,
 			// }),
+			middleware.CryptoApi(true, true),
 			controller.NewRegister.Register,
 		)
 	}