marge: 合并代码，包名变更be.ems

restagent/dev.yaml

@@ -6,76 +6,95 @@ logger:
   file: "../temp/log/restagent.log"
   level: "trace"
   duration: 24
-  count: 2   
+  count: 2
 
 # rest agent listen ipv4/v6 and port, support multiple routines
 # ip: 0.0.0.0 or ::0, support IPv4/v6
+# clientAuthType: 0:NoClientCert (default), 1:RequestClientCert, 2:RequireAnyClientCert,
+#                 3:VerifyClientCertIfGiven, 4:RequireAndVerifyClientCerts
 rest:
   - ipv4: 0.0.0.0
-    ipv6: 
-    port: 3186
+    ipv6:
+    port: 33040
   - ipv4: 0.0.0.0
-    ipv6: 
-    port:  3187
+    ipv6:
+    port: 33443
     scheme: https
-    caFile: ./etc/certs/rootca.crt
-    certFile: ./etc/certs/tsa-omc.crt
-    keyFile: ./etc/certs/tsa-omc_pri.key
+    clientAuthType: 0
+    caFile: ./etc/certs/omc-ca.crt
+    certFile: ./etc/certs/omc-server.crt
+    keyFile: ./etc/certs/omc-server.key
 
 webServer:
   enabled: false
-  rootDir: "d:/local.git/fe.ems"
-  listen: 
-    - addr: :8080
+  rootDir: d:/local.git/fe.ems.vue3/dist
+  listen:
+    - addr: :80
       schema: http
-    - addr: :8443
+    - addr: :443
       scheme: https
-      caFile: ./etc/certs/rootca.crt
-      certFile: ./etc/certs/tsa-omc.crt
-      keyFile: ./etc/certs/tsa-omc_pri.key
+      clientAuthType: 0
+      caFile: ./etc/certs/omc-ca.crt
+      certFile: ./etc/certs/omc-server.crt
+      keyFile: ./etc/certs/omc-server.key
 
 database:
   type: mysql
   user: root
-  password: "1000omc@kp!"
-  host: "192.168.2.166"
-  port: 33066
-  name: "omc_db_dev"
-  backup: "../temp/database"
+  # password: 1000omc@kp!
+  # host: "192.168.8.103"
+  # port: 33066
+  name: omc_db
+  backup: d:/local.git/be.ems/restagent/database
+  password: "root@1234"
+  host: "192.168.5.59"
+  port: 3306
 
 # Redis 缓存数据，数据源声明全小写
 redis:
   dataSource:
     # OMC系统使用库
     default:
-      port: 3189 # Redis port
-      host: "192.168.2.166" # Redis host
+      port: 6379 # Redis port
+      host: "192.168.5.59" # Redis host
       password: "redis@1234"
       db: 10 # Redis db_num
     # UDM网元用户库
     udmuser:
-      port: 3189 # Redis port
-      host: "192.168.2.166"
-      password: "redis@1234"
+      port: 6379 # Redis port
+      host: "192.168.13.140"
+      password: ""
       db: 0 # Redis db_num
   # 多个数据源时可以用这个指定默认的数据源
   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
   user: admin
   password: admin
-  mmlHome: "../temp/mmlhome"
+  mmlHome: ./mmlhome
   upload: /home/agtuser
 
+# NE config
 ne:
-  user: root
+  user: agtuser
   etcdir: /usr/local/etc
   bindir: /usr/local/bin
   omcdir: /usr/local/omc
   scpdir: /tmp
   licensedir: /usr/local/etc/{neType}/license
+  # 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:
@@ -88,37 +107,46 @@ omc:
   vendor: ""
   dn: 4600
   chk2ne: false
-  sn: 13750650
+  sn: "-"
   checksign: false
+  rootDir: ./
+  binDir: ./bin
   backup: ./backup
   upload: ./upload
-  frontUpload: C:\AMP\Probject\ems_frontend\upload
+  frontUpload: d:/local.git/fe.ems/upload
   frontTraceDir: d:/local.git/fe.ems/trace
   software: ./software
   license: ./license
-  gtpUri: gtp:192.168.2.119:2152
+  gtpUri: gtp:192.168.2.219:2152
   checkContentType: false
   testMode: false
   rbacMode: true
-  runDir: 
+  runDir:
+  cmdTimeout: 120
 
 # Alarm module setting
 # Forward interface:
-# email/sms  
+# email/sms
 alarm:
   forwardAlarm: true
   email:
-    smtp: smtp@xxx.com.cn
+    smtp: mail.agrandtech.com
     port: 25
-    user: smtpuser
-    password: smtpuser@omc
+    user: smtpext@agrandtech.com
+    password: "1000smtp@omc!"
+    # TLS skip verify: true/false
+    tlsSkipVerify: true
   sms:
     apiURL: http://smsc.xxx.com.cn/
     accessKeyID: xxxx
     accessKeySecret: xxxx
     signName: xxx SMSC
     templateCode: 1000
-    
+  smsc:
+    addr: "192.168.14.211:2775"
+    userName: OMC
+    password: "123456"
+
 #User authorized information
 # crypt: mysql/md5/bcrypt
 # token: true/false to check accessToken
@@ -133,7 +161,7 @@ auth:
   publicKey: ./etc/certs/omc_pub.key
   privateKey: ./etc/certs/omc_pri.key
 
-# Parameter for limit number 
+# Parameter for limit number
 # rmuid_maxnum: the max number of rmUID, default: 50
 # alarmid_maxnum: the max number of AlarmID, default: 50
 # pmid_maxnum: the max number of pmID, default: 50
@@ -150,4 +178,4 @@ params:
 
 testConfig:
   enabled: true
-  file: ./etc/testconfig.yaml
+  file: ./etc/testconfig.yaml