merge: 合并代码20241031

restagent/etc/restconf-t.yaml

@@ -3,7 +3,7 @@
 # duration: rotation time with xx hours, example: 1/12/24 hours
 # count: rotation count of log, default is 30 rotation
 logger:
-  file: d:/local.git/be.ems/restagent/log/restagent.log
+  file: d:/omc.git/be.ems/restagent/log/restagent.log
   level: trace
   duration: 24
   count: 2   
@@ -27,7 +27,7 @@ rest:
 
 webServer:
   enabled: false
-  rootDir: d:/local.git/fe.ems.vue3/dist
+  rootDir: d:/omc.git/fe.ems.vue3/dist
   listen: 
     - addr: :80
       schema: http
@@ -46,7 +46,7 @@ database:
   port: 33066
   name: omc_db
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
-  backup: d:/local.git/be.ems/restagent/database
+  backup: d:/omc.git/be.ems/restagent/database
 
 # Redis 缓存数据，数据源声明全小写
 redis:
@@ -113,8 +113,8 @@ omc:
   binDir: ./bin
   backup: ./backup
   upload: ./upload
-  frontUpload: d:/local.git/fe.ems/upload
-  frontTraceDir: d:/local.git/fe.ems/trace
+  frontUpload: d:/omc.git/fe.ems/upload
+  frontTraceDir: d:/omc.git/fe.ems/trace
   software: ./software
   license: ./license
   gtpUri: gtp:192.168.2.219:2152

restagent/etc/restconf.yaml

@@ -4,7 +4,7 @@
 # count: rotation count of log, default is 30 rotation
 # pprof: false(default)/true to disable/enable pprof 
 logger:
-  file: d:/local.git/be.ems/restagent/log/restagent.log
+  file: d:/omc.git/be.ems/restagent/log/restagent.log
   level: trace
   duration: 24
   count: 2
@@ -20,11 +20,11 @@ pprof:
 rest:
   - ipv4: 0.0.0.0
     ipv6: 
-    port: 33030
+    port: 33040
 
 webServer:
-  enabled: true
-  rootDir: d:/local.git/fe.ems.vue3/dist
+  enabled: false
+  rootDir: d:/omc.git/fe.ems.vue3/dist
   listen: 
     - addr: :80
       schema: http
@@ -39,25 +39,25 @@ database:
   type: mysql
   user: root
   password: "1000omc@kp!"
-  host: "127.0.0.1"
-  port: 33066
+  host: "192.168.9.58"
+  port: 13306
   name: "omc_db"
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
-  backup: d:/local.git/be.ems/restagent/database
+  backup: d:/omc.git/be.ems/restagent/database
 
 # Redis data cache
 redis:
   dataSource:
     # OMC system db
     default:
-      port: 6379 # Redis port
-      host: "127.0.0.1" # Redis host
+      port: 16379 # Redis port
+      host: "192.168.9.58" # Redis host
       password: "helloearth"
       db: 10 # Redis db_num
     # UDM sub/auth db
     udmuser:
       port: 6379 # Redis port
-      host: "127.0.0.1"
+      host: "192.168.8.58"
       password: "helloearth"
       db: 0 # Redis db_num
   # used to specify the default data source for multiple data resourece
@@ -66,21 +66,17 @@ redis:
 # sleep: time delay for after write buffer (millisecond)
 # deadLine: timeout for io read and write (second)  
 mml:
-  port: 4100
-  port2: 5002
   sleep: 200
   deadLine: 10
   sizeRow: 600
   sizeCol: 128
   bufferSize: 65535
-  user: admin
-  password: admin
   mmlHome: ./mmlhome
 
 # Tracking configuration
 trace:
   enabled: true
-  host: "172.16.5.100" # Fill in the specific IP address
+  host: "192.168.5.58" # Fill in the specific IP address
   port: 33033
 
 # NE config
@@ -194,12 +190,12 @@ testConfig:
   file: ./etc/testconfig.yaml
 
 # 静态文件配置, 相对项目根路径或填绝对路径
-staticFile:
-  # 默认资源，dir目录需要预先创建
-  default:
-    prefix: "/static"
-    dir: "./static"
-  # 文件上传资源目录映射，与项目目录同级
-  upload:
-    prefix: "/upload"
-    dir: "./upload"
+# staticFile:
+#   # 默认资源，dir目录需要预先创建
+#   default:
+#     prefix: "/static"
+#     dir: "./static"
+#   # 文件上传资源目录映射，与项目目录同级
+#   upload:
+#     prefix: "/upload"
+#     dir: "./upload"

restagent/makefile

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