marge: 合并代码

restagent/config/config.go

@@ -123,6 +123,8 @@ type YamlConfig struct {
 		LicenseDir     string `yaml:"licensedir"`
 		EtcListIMS     string `yaml:"etcListIMS"`
 		EtcListDefault string `yaml:"etcListDefault"`
+		DpkgOverwrite  bool   `yaml:"dpkgOverwrite"`
+		DpkgTimeout    int    `yaml:"dpkgTimeout"`
 	} `yaml:"ne"`
 
 	Auth struct {

restagent/etc/restconf.yaml

@@ -41,23 +41,23 @@ webServer:
 database:
   type: mysql
   user: root
-  # password: "1000omc@kp!"
-  # host: "192.168.2.166"
+  # password: 1000omc@kp!
+  # host: 127.0.0.1
   # port: 33066
-  # name: omc_db
+  name: omc_db
   backup: d:/local.git/ems.agt/restagent/database
   password: "root@1234"
-  host: "192.168.5.57"
+  host: "192.168.5.59"
   port: 3306
-  name: "omc_db"
+
 # Redis 缓存数据，数据源声明全小写
 redis:
   dataSource:
     # OMC系统使用库
     default:
       port: 6379 # Redis port
-      host: "192.168.5.57" # Redis host
-      password: ""
+      host: "192.168.5.59" # Redis host
+      password: "redis@1234"
       db: 10 # Redis db_num
     # UDM网元用户库
     udmuser:
@@ -66,7 +66,7 @@ redis:
       password: ""
       db: 0 # Redis db_num
   # 多个数据源时可以用这个指定默认的数据源
-  defaultDataSourceName: "default"   
+  defaultDataSourceName: "default"
 
 # sleep: time delay for after write buffer (millisecond)
 # deadLine: timeout for io read and write (second)  
@@ -81,7 +81,7 @@ mml:
 
 # NE config
 ne:
-  user: root
+  user: agtuser
   etcdir: /usr/local/etc
   bindir: /usr/local/bin
   omcdir: /usr/local/omc
@@ -90,6 +90,10 @@ ne:
   # backup etc list of IMS,no space  
   etcListIMS: '{*.yaml,mmtel,vars.cfg}'
   etcListDefault: '{*.yaml,*.conf,*.cfg}'
+  # true/false to overwrite config file when dpkg ne software 
+  dpkgOverwrite: false
+  # dpkg timeout (second)
+  dpkgTimeout: 180
 
 # chk2ne: true/false, if put OmcNeConfig parameters to NE
 omc:

restagent/makefile

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

restagent/restagent.go

@@ -5,7 +5,6 @@ import (
 	"crypto/x509"
 	"fmt"
 	"net/http"
-	_ "net/http/pprof"
 	"os"
 	"strconv"
 	"strings"
@@ -187,11 +186,6 @@ func main() {
 	uriGroup.Use(libSession.SessionHeader())
 	uriGroup.Any("/*any", gin.WrapH(routes.NewRouter()))
 
-	// 注册 pprof 路由
-	go func() {
-		http.ListenAndServe("0.0.0.0:6060", nil)
-	}()
-
 	// 开启监控采集
 	// monitor.StartMonitor(false, "")