marge: 合并11.2版本

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,14 +4,14 @@
 # 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
 
 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
@@ -24,7 +24,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
@@ -43,40 +43,36 @@ database:
   port: 13306
   name: "omc_db_pt"
   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 data cache
 redis:
   dataSource:
-    # OMC系统使用库
+    # OMC system db
     default:
       port: 16379 # Redis port
       host: "192.168.9.58" # Redis host
       password: "helloearth"
       db: 10 # Redis db_num
-    # UDM网元用户库
-    udmuser:
-      port: 6379 # Redis port
-      host: "192.168.8.58"
-      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)
 # 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: "192.168.5.58" # Fill in the specific IP address
+  port: 33033
+
 # NE config
 ne:
   user: omcuser
@@ -123,29 +119,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