Merge remote-tracking branch 'origin/main' into multi-tenant

restagent/config/config.go

@@ -177,8 +177,8 @@ type MMLParam struct {
 	Port2      int    `yaml:"port2"`
 	Sleep      int64  `yaml:"sleep"`
 	DeadLine   int64  `yaml:"deadLine"`
-	SizeRow    byte   `yaml:"sizeRow"`
-	SizeCol    byte   `yaml:"sizeCol"`
+	SizeRow    int16  `yaml:"sizeRow"`
+	SizeCol    int16  `yaml:"sizeCol"`
 	BufferSize int    `yaml:"bufferSize"`
 	User       string `yaml:"user"`
 	Password   string `ymal:"password"`
@@ -226,8 +226,8 @@ func NewYamlConfig() YamlConfig {
 			ConnParam: "charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True",
 		},
 		MML: MMLParam{
-			SizeRow:    100,
-			SizeCol:    128,
+			SizeRow:    200,
+			SizeCol:    120,
 			BufferSize: 65535,
 		},
 		Alarm: AlarmConfig{

restagent/etc/restconf-t.yaml

@@ -73,13 +73,12 @@ mml:
   port2: 5002
   sleep: 200
   deadLine: 10
-  sizeRow: 100
+  sizeRow: 600
   sizeCol: 128
   bufferSize: 65535
   user: admin
   password: admin
   mmlHome: ./mmlhome
-  upload: /home/manager
 
 # NE config
 ne:

restagent/makefile

@@ -14,7 +14,7 @@ BINNAME = restagent
 
 .PHONY: build $(BINNAME)
 build $(BINNAME):
-	go build -o $(BINNAME) -v -ldflags "-X '$(LIBDIR)/global.Version=$(VERSION)' \
+	go build -o $(BINNAME) -v -ldflags "-s -w -X '$(LIBDIR)/global.Version=$(VERSION)' \
 		-X '$(LIBDIR)/global.BuildTime=`date`' \
 		-X '$(LIBDIR)/global.GoVer=`go version`'"
 

restagent/restagent.go

@@ -249,7 +249,7 @@ func main() {
 	uriGroup := app.Group(config.UriPrefix)
 	uriGroup.Any("/*any", gin.WrapH(routes.NewRouter()))
 	// AMF上报的UE事件, 无前缀，暂时特殊处理
-	app.POST(event.UriUEEvent, event.PostUEEventFromAMF)
+	app.POST(event.UriUEEventAMF, event.PostUEEventFromAMF)
 
 	var listenLocalhost bool = false
 	for _, rest := range conf.Rest {