marge: 合并11.2版本

restagent/restagent.go

@@ -11,6 +11,7 @@ import (
 
 	_ "net/http/pprof"
 
+	"be.ems/features"
 	"be.ems/features/dbrest"
 	"be.ems/features/event"
 	"be.ems/features/fm"
@@ -212,6 +213,12 @@ func main() {
 		fmt.Println("dborm.initDbClient err:", err)
 		os.Exit(4)
 	}
+	err = dborm.InitGormConnect(conf.Database.Type, conf.Database.User, conf.Database.Password,
+		conf.Database.Host, conf.Database.Port, conf.Database.Name, conf.Database.ConnParam, true)
+	if err != nil {
+		fmt.Println("dborm.InitGormConnect err:", err)
+		os.Exit(4)
+	}
 	err = fm.InitDbClient(conf.Database.Type, conf.Database.User, conf.Database.Password,
 		conf.Database.Host, conf.Database.Port, conf.Database.Name, conf.Database.ConnParam)
 	if err != nil {
@@ -251,6 +258,9 @@ func main() {
 	// AMF上报的UE事件, 无前缀，暂时特殊处理
 	app.POST(event.UriUEEventAMF, event.PostUEEventFromAMF)
 
+	// register feature service gin.Engine
+	features.InitServiceEngine(app)
+
 	// var listenLocalhost bool = false
 	for _, rest := range conf.Rest {
 		// ipv4 goroutines