marge: 合并代码

restagent/etc/restconf.yaml

@@ -26,7 +26,7 @@ rest:
     keyFile: ./etc/certs/omc-server.key
 
 webServer:
-  enabled: true
+  enabled: false
   rootDir: d:/local.git/fe.ems.vue3/dist
   listen: 
     - addr: :80
@@ -42,7 +42,7 @@ database:
   type: mysql
   user: root
   # password: 1000omc@kp!
-  # host: 127.0.0.1
+  # host: "192.168.8.103"
   # port: 33066
   name: omc_db
   backup: d:/local.git/ems.agt/restagent/database

restagent/makefile

@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2401.3
+VERSION = 2.2402.5
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build

restagent/restagent.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"ems.agt/features/dbrest"
+	"ems.agt/features/event"
 	"ems.agt/features/fm"
 	"ems.agt/features/lm"
 	"ems.agt/features/pm"
@@ -22,6 +23,8 @@ import (
 	"ems.agt/src/framework/middleware"
 	libSession "ems.agt/src/lib_features/session"
 	"github.com/gin-gonic/gin"
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/h2c"
 )
 
 // const defaultConfigFile = "./etc/restconf.yaml"
@@ -67,23 +70,29 @@ import (
 // }
 
 func HttpListen(addr string, router http.Handler) {
-	err := http.ListenAndServe(addr, router)
+	// 创建HTTP服务器
+	h2s := &http2.Server{
+		// ...
+	}
+	server := &http.Server{
+		Addr:    addr,
+		Handler: h2c.NewHandler(router, h2s),
+	}
+
+	// // support http 2.0 server
+	// err := http2.ConfigureServer(server, &http2.Server{})
+	// if err != nil {
+	// 	fmt.Println("ConfigureServer err:", err)
+	// 	os.Exit(11)
+	// }
+	err := server.ListenAndServe()
 	if err != nil {
 		fmt.Println("ListenAndServe err:", err)
-		os.Exit(5)
+		os.Exit(12)
 	}
 }
 
 func HttpListenTLS(addr, caFile, certFile, keyFile string, clientAuthType int, router http.Handler) {
-	HttpListenConfigTLS(addr, caFile, certFile, keyFile, clientAuthType, router)
-	err := http.ListenAndServeTLS(addr, certFile, keyFile, router)
-	if err != nil {
-		fmt.Println("ListenAndServeTLS err:", err)
-		os.Exit(6)
-	}
-}
-
-func HttpListenConfigTLS(addr, caFile, certFile, keyFile string, clientAuthType int, router http.Handler) {
 	// 加载根证书
 	caCert, err := os.ReadFile(caFile)
 	if err != nil {
@@ -107,27 +116,71 @@ func HttpListenConfigTLS(addr, caFile, certFile, keyFile string, clientAuthType
 		TLSConfig: tlsConfig,
 	}
 
+	// support http 2.0 server
+	http2.ConfigureServer(server, &http2.Server{})
+	if err != nil {
+		fmt.Println("ConfigureServer err:", err)
+		os.Exit(13)
+	}
 	err = server.ListenAndServeTLS(certFile, keyFile)
 	if err != nil {
 		fmt.Println("ListenAndServeTLS err:", err)
-		os.Exit(6)
+		os.Exit(14)
 	}
 }
 
 func HttpListenWebServerTLS(addr, caFile, certFile, keyFile string, clientAuthType int) {
-	HttpListenConfigTLS(addr, caFile, certFile, keyFile, clientAuthType, nil)
-	err := http.ListenAndServeTLS(addr, certFile, keyFile, nil)
+	// 加载根证书
+	caCert, err := os.ReadFile(caFile)
+	if err != nil {
+		log.Fatal(err)
+	}
+	caCertPool := x509.NewCertPool()
+	caCertPool.AppendCertsFromPEM(caCert)
+
+	// 创建自定义的TLS配置
+	tlsConfig := &tls.Config{
+		MinVersion: tls.VersionTLS10,
+		MaxVersion: tls.VersionTLS13,
+		ClientCAs:  caCertPool,
+		ClientAuth: tls.ClientAuthType(clientAuthType),
+	}
+
+	// 创建HTTP服务器
+	server := &http.Server{
+		Addr:      addr,
+		TLSConfig: tlsConfig,
+	}
+
+	// support http 2.0 server
+	http2.ConfigureServer(server, &http2.Server{})
+	if err != nil {
+		fmt.Println("ConfigureServer err:", err)
+		os.Exit(9)
+	}
+	err = server.ListenAndServeTLS(certFile, keyFile)
 	if err != nil {
 		fmt.Println("ListenAndServeTLS err:", err)
-		os.Exit(7)
+		os.Exit(10)
 	}
 }
 
 func HttpListenWebServer(addr string) {
-	err := http.ListenAndServe(addr, nil)
+	// 创建HTTP服务器
+	server := &http.Server{
+		Addr: addr,
+	}
+
+	// support http 2.0 server
+	err := http2.ConfigureServer(server, &http2.Server{})
+	if err != nil {
+		fmt.Println("ConfigureServer err:", err)
+		os.Exit(7)
+	}
+	err = server.ListenAndServe()
 	if err != nil {
 		fmt.Println("ListenAndServe err:", err)
-		os.Exit(7)
+		os.Exit(8)
 	}
 }
 
@@ -164,7 +217,7 @@ func main() {
 	err = dbrest.InitDbClient(conf.Database.Type, conf.Database.User, conf.Database.Password,
 		conf.Database.Host, conf.Database.Port, conf.Database.Name)
 	if err != nil {
-		fmt.Println("rests.initDbClient err:", err)
+		fmt.Println("dbrest.initDbClient err:", err)
 		os.Exit(4)
 	}
 	err = lm.InitDbClient(conf.Database.Type, conf.Database.User, conf.Database.Password,
@@ -185,6 +238,8 @@ func main() {
 	uriGroup := app.Group(config.UriPrefix)
 	uriGroup.Use(libSession.SessionHeader())
 	uriGroup.Any("/*any", gin.WrapH(routes.NewRouter()))
+	// AMF上报的UE事件, 无前缀，暂时特殊处理
+	app.POST(event.UriUEEvent, event.PostUEEventFromAMF)
 
 	// 开启监控采集
 	// monitor.StartMonitor(false, "")