merge: 合并代码20241018

restagent/etc/restconf.yaml

@@ -11,7 +11,7 @@ logger:
 
 pprof: 
   enabled: true
-  addr: :36060
+  addr: :33060
 
 # rest agent listen ipv4/v6 and port, support multiple routines
 # ip: 0.0.0.0 or ::0, support IPv4/v6
@@ -20,10 +20,10 @@ pprof:
 rest:
   - ipv4: 0.0.0.0
     ipv6: 
-    port: 33040
+    port: 33030
 
 webServer:
-  enabled: false
+  enabled: true
   rootDir: d:/local.git/fe.ems.vue3/dist
   listen: 
     - addr: :80
@@ -38,29 +38,29 @@ webServer:
 database:
   type: mysql
   user: root
-  password: "root@1234"
-  host: "192.168.5.59"
-  port: 3306
+  password: "1000omc@kp!"
+  host: "127.0.0.1"
+  port: 33066
   name: "omc_db"
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
   backup: d:/local.git/be.ems/restagent/database
 
-# Redis 缓存数据，数据源声明全小写
+# Redis data cache
 redis:
   dataSource:
-    # OMC系统使用库
+    # OMC system db
     default:
       port: 6379 # Redis port
-      host: "192.168.5.59" # Redis host
-      password: "redis@1234"
+      host: "127.0.0.1" # Redis host
+      password: "helloearth"
       db: 10 # Redis db_num
-    # UDM网元用户库
+    # UDM sub/auth db
     udmuser:
       port: 6379 # Redis port
-      host: "192.168.5.60"
+      host: "127.0.0.1"
       password: "helloearth"
       db: 0 # Redis db_num
-  # 多个数据源时可以用这个指定默认的数据源
+  # used to specify the default data source for multiple data resourece
   defaultDataSourceName: "default"
 
 # sleep: time delay for after write buffer (millisecond)
@@ -77,6 +77,12 @@ mml:
   password: admin
   mmlHome: ./mmlhome
 
+# Tracking configuration
+trace:
+  enabled: true
+  host: "172.16.5.100" # Fill in the specific IP address
+  port: 33033
+
 # NE config
 ne:
   user: omcuser
@@ -123,29 +129,36 @@ omc:
 
 # Alarm module setting
 # Forward interface:
+# TLS Skip verify: true/false
 # email/sms
 # smProxy: sms(Short Message Service)/smsc(SMS Centre)  
+# dataCoding: 0:GSM7BIT, 1:ASCII, 2:BINARY8BIT1, 3:LATIN1, 
+#             4:BINARY8BIT2, 6:CYRILLIC, 7:HEBREW, 8:UCS2
 alarm:
-  forwardAlarm: false
-  email:
-    smtp: mail.agrandtech.com
+  alarmEmailForward:
+    enable: true
+    emailList: 
+    smtp: mail.smtp.com
     port: 25
-    user: smtpext@agrandtech.com
+    user: smtpext@smtp.com
     password: "1000smtp@omc!"
-    # TLS skip verify: true/false
     tlsSkipVerify: true
-  smProxy: smsc
+  alarmSMSForward:
+    enable: true
+    mobileList: "1006,1008"
+    smscAddr: "192.168.14.212:2775"
+    systemID: "123456"
+    password: "123456"
+    systemType: "UTRAN"
+    dataCoding: 0
+    serviceNumber: "OMC"
   sms:
     apiURL: http://smsc.xxx.com/
     accessKeyID: xxxx
     accessKeySecret: xxxx
     signName: xxx SMSC
     templateCode: 1000
-  smsc:
-    addr: "192.168.13.114:2775"
-    systemID: "omc"
-    password: "omc123"
-    systemType: "UTRAN"
+  smProxy: smsc
     
 #User authorized information
 # crypt: mysql/md5/bcrypt
@@ -181,12 +194,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"