merge: 合并代码

restagent/etc/restconf.yaml

@@ -16,14 +16,6 @@ rest:
   - ipv4: 0.0.0.0
     ipv6: 
     port: 33040
-  - ipv4: 0.0.0.0
-    ipv6: 
-    port:  33443
-    scheme: https
-    clientAuthType: 0
-    caFile: ./etc/certs/omc-ca.crt
-    certFile: ./etc/certs/omc-server.crt
-    keyFile: ./etc/certs/omc-server.key
 
 webServer:
   enabled: false
@@ -41,14 +33,12 @@ webServer:
 database:
   type: mysql
   user: root
-  # 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
+  name: "omc_db"
+  connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
+  backup: d:/local.git/be.ems/restagent/database
 
 # Redis 缓存数据，数据源声明全小写
 redis:
@@ -62,8 +52,8 @@ redis:
     # UDM网元用户库
     udmuser:
       port: 6379 # Redis port
-      host: "192.168.13.140"
-      password: ""
+      host: "172.60.5.140"
+      password: "helloearth"
       db: 0 # Redis db_num
   # 多个数据源时可以用这个指定默认的数据源
   defaultDataSourceName: "default"
@@ -75,6 +65,9 @@ mml:
   port2: 5002
   sleep: 200
   deadLine: 10
+  sizeRow: 100
+  sizeCol: 128
+  bufferSize: 65535
   user: admin
   password: admin
   mmlHome: ./mmlhome
@@ -128,7 +121,7 @@ omc:
 # Forward interface:
 # email/sms  
 alarm:
-  forwardAlarm: true
+  forwardAlarm: false
   email:
     smtp: mail.agrandtech.com
     port: 25
@@ -143,9 +136,10 @@ alarm:
     signName: xxx SMSC
     templateCode: 1000
   smsc:
-    addr: "192.168.14.211:2775"
-    userName: OMC
-    password: "123456"
+    addr: "192.168.13.114:2775"
+    systemID: "omc"
+    password: "omc123"
+    systemType: "UTRAN"
     
 #User authorized information
 # crypt: mysql/md5/bcrypt
@@ -178,4 +172,15 @@ params:
 
 testConfig:
   enabled: true
-  file: ./etc/testconfig.yaml
+  file: ./etc/testconfig.yaml
+
+# 静态文件配置, 相对项目根路径或填绝对路径
+# staticFile:
+#   # 默认资源，dir目录需要预先创建
+#   default:
+#     prefix: "/static"
+#     dir: "./static"
+#   # 文件上传资源目录映射，与项目目录同级
+#   upload:
+#     prefix: "/upload"
+#     dir: "./upload"