marge: 合并代码

restagent/etc/restconf.yaml

@@ -38,12 +38,12 @@ database:
   type: mysql
   user: root
   # password: "1000omc@kp!"
-  # host: "192.168.2.219"
+  # host: "192.168.5.57"
   # port: 33066
   # name: omc_db
   backup: d:/local.git/ems.agt/restagent/database
   password: "root@1234"
-  host: "192.168.2.152"
+  host: "192.168.5.57"
   port: 3306
   name: "omc_db"
 # Redis 缓存数据，数据源声明全小写
@@ -52,8 +52,8 @@ redis:
     # OMC系统使用库
     default:
       port: 6379 # Redis port
-      host: "192.168.2.152" # Redis host
-      password: "redis@1234"
+      host: "192.168.5.57" # Redis host
+      password: ""
       db: 10 # Redis db_num
     # UDM网元用户库
     udmuser:
@@ -117,7 +117,7 @@ omc:
 # Forward interface:
 # email/sms  
 alarm:
-  forwardAlarm: true
+  forwardAlarm: false
   email:
     smtp: mail.agrandtech.com
     port: 25

restagent/makefile

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