marge: 合并代码，包名变更be.ems

features/state/getstate.go

@@ -14,12 +14,12 @@ import (
 	"github.com/go-resty/resty/v2"
 	"github.com/gorilla/mux"
 
-	"ems.agt/lib/dborm"
-	"ems.agt/lib/global"
-	"ems.agt/lib/log"
-	"ems.agt/lib/services"
-	"ems.agt/restagent/config"
-	tokenConst "ems.agt/src/framework/constants/token"
+	"be.ems/lib/dborm"
+	"be.ems/lib/global"
+	"be.ems/lib/log"
+	"be.ems/lib/services"
+	"be.ems/restagent/config"
+	tokenConst "be.ems/src/framework/constants/token"
 )
 
 type CpuUsage struct {
@@ -756,6 +756,8 @@ func GetStateFromNF(w http.ResponseWriter, r *http.Request) {
 			result["ipAddress"] = ne.Ip
 			resp, err := client.R().
 				EnableTrace().
+				SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
+				//SetHeaders(map[string]string{"accessToken": token}).
 				SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 				SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 				Get(requestURI2NF)

features/state/state_linux.go

@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"time"
 
-	"ems.agt/lib/log"
+	"be.ems/lib/log"
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/shirou/gopsutil/v3/mem"

features/state/sysinfo.go

@@ -1,7 +1,7 @@
 package state
 
 import (
-	"ems.agt/lib/log"
+	"be.ems/lib/log"
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/shirou/gopsutil/host"