From 34b2a6ced444c133f0e6a7c7e87f07e977bdfa45 Mon Sep 17 00:00:00 2001
From: zhanghan2021 <zhanghan@kylinos.cn>
Date: Wed, 18 Oct 2023 09:55:26 +0800
Subject: [PATCH] update vendor and calling the print request method

---
 atune/server/controller/runresult.go          |  7 ++--
 atune/server/go.mod                           |  2 +-
 atune/server/go.sum                           |  2 +
 atune/server/router/router.go                 |  1 +
 .../openeuler/PilotGo/sdk/logger/logger.go    | 39 +++++++++++++++++++
 atune/server/vendor/modules.txt               |  2 +-
 6 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/atune/server/controller/runresult.go b/atune/server/controller/runresult.go
index 48a5a2a4..79d7f215 100644
--- a/atune/server/controller/runresult.go
+++ b/atune/server/controller/runresult.go
@@ -12,22 +12,23 @@ import (
 func RunCommand(c *gin.Context) {
 	d := &common.CmdStruct{}
 	if err := c.ShouldBind(d); err != nil {
-		logger.Debug("bind batch param error:%s", err)
+		logger.Debug("绑定批次参数失败：%s", err)
 		response.Fail(c, nil, "parameter error")
 		return
 	}
 
 	run_result := func(result []*common.RunResult) {
 		for _, res := range result {
+			logger.Info("结果：%v", *res)
 			if err := service.ProcessResult(res, d.Command); err != nil {
-				logger.Error("%v", err.Error())
+				logger.Error("处理结果失败：%v", err.Error())
 			}
 		}
 	}
 
 	err := plugin.GlobalClient.RunCommandAsync(d.Batch, d.Command, run_result)
 	if err != nil {
-		logger.Error("%v", err.Error())
+		logger.Error("远程调用失败：%v", err.Error())
 		response.Fail(c, nil, err.Error())
 		return
 	}
diff --git a/atune/server/go.mod b/atune/server/go.mod
index a8fd0b47..79938455 100644
--- a/atune/server/go.mod
+++ b/atune/server/go.mod
@@ -3,7 +3,7 @@ module openeuler.org/PilotGo/atune-plugin
 go 1.18
 
 require (
-	gitee.com/openeuler/PilotGo/sdk v0.0.0-20231017091904-4321a885c98b
+	gitee.com/openeuler/PilotGo/sdk v0.0.0-20231018012608-60b74bb474b3
 	github.com/gin-gonic/gin v1.7.7
 	gopkg.in/yaml.v2 v2.4.0
 	gorm.io/driver/mysql v1.5.1
diff --git a/atune/server/go.sum b/atune/server/go.sum
index 6963531a..0261d9fc 100644
--- a/atune/server/go.sum
+++ b/atune/server/go.sum
@@ -4,6 +4,8 @@ gitee.com/openeuler/PilotGo/sdk v0.0.0-20231017053937-095de8e0b8bb h1:ZOlTbYUZZU
 gitee.com/openeuler/PilotGo/sdk v0.0.0-20231017053937-095de8e0b8bb/go.mod h1:+wWAkG+wOHewMRyRZh84tgFrIvR5hep06bEpo/ppkqQ=
 gitee.com/openeuler/PilotGo/sdk v0.0.0-20231017091904-4321a885c98b h1:uQUmAth9ExwujKZRpXNK5FSChcLbsWn3cb0C3L8+Ga0=
 gitee.com/openeuler/PilotGo/sdk v0.0.0-20231017091904-4321a885c98b/go.mod h1:+wWAkG+wOHewMRyRZh84tgFrIvR5hep06bEpo/ppkqQ=
+gitee.com/openeuler/PilotGo/sdk v0.0.0-20231018012608-60b74bb474b3 h1:HrqTC6wK3+42fMWGPhH9p7ZUrC9ahKpdimbhD73pdW8=
+gitee.com/openeuler/PilotGo/sdk v0.0.0-20231018012608-60b74bb474b3/go.mod h1:+wWAkG+wOHewMRyRZh84tgFrIvR5hep06bEpo/ppkqQ=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
diff --git a/atune/server/router/router.go b/atune/server/router/router.go
index 0fe24716..3bd533cd 100644
--- a/atune/server/router/router.go
+++ b/atune/server/router/router.go
@@ -25,6 +25,7 @@ func HttpServerInit(conf *config.HttpServer) error {
 func setupRouter() *gin.Engine {
 	gin.SetMode(gin.ReleaseMode)
 	router := gin.New()
+	router.Use(logger.RequestLogger())
 	router.Use(gin.Recovery())
 
 	registerAPIs(router)
diff --git a/atune/server/vendor/gitee.com/openeuler/PilotGo/sdk/logger/logger.go b/atune/server/vendor/gitee.com/openeuler/PilotGo/sdk/logger/logger.go
index db5beb60..e9cb7969 100644
--- a/atune/server/vendor/gitee.com/openeuler/PilotGo/sdk/logger/logger.go
+++ b/atune/server/vendor/gitee.com/openeuler/PilotGo/sdk/logger/logger.go
@@ -17,7 +17,9 @@ package logger
 import (
 	"errors"
 	"os"
+	"time"
 
+	"github.com/gin-gonic/gin"
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
 	"github.com/sirupsen/logrus"
 )
@@ -113,3 +115,40 @@ func Error(format string, args ...interface{}) {
 func Fatal(format string, args ...interface{}) {
 	logrus.Fatalf(format, args...)
 }
+
+func RequestLogger() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// 开始时间
+		startTime := time.Now()
+
+		// 处理请求
+		c.Next()
+
+		// 结束时间
+		endTime := time.Now()
+
+		// 执行时间
+		latencyTime := endTime.Sub(startTime)
+
+		// 请求方式
+		reqMethod := c.Request.Method
+
+		// 请求路由
+		reqUri := c.Request.RequestURI
+
+		// 状态码
+		statusCode := c.Writer.Status()
+
+		// 请求IP
+		clientIP := c.ClientIP()
+
+		// 日志格式
+		Debug("status_code:%d latency_time:%s client_ip:%s req_method:%s req_uri:%s",
+			statusCode,
+			latencyTime,
+			clientIP,
+			reqMethod,
+			reqUri,
+		)
+	}
+}
diff --git a/atune/server/vendor/modules.txt b/atune/server/vendor/modules.txt
index 39f2f223..46db6634 100644
--- a/atune/server/vendor/modules.txt
+++ b/atune/server/vendor/modules.txt
@@ -1,4 +1,4 @@
-# gitee.com/openeuler/PilotGo/sdk v0.0.0-20231017091904-4321a885c98b
+# gitee.com/openeuler/PilotGo/sdk v0.0.0-20231018012608-60b74bb474b3
 ## explicit; go 1.17
 gitee.com/openeuler/PilotGo/sdk/common
 gitee.com/openeuler/PilotGo/sdk/logger
-- 
Gitee