From 69046d2bc80713429fdf28f7313506329cce1797 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Sun, 4 Feb 2024 10:58:23 +0800
Subject: [PATCH] version change to 2.2402.5

---
 captrace/makefile           |  2 +-
 crontask/makefile           |  2 +-
 data2html/makefile          |  2 +-
 makefile                    |  2 +-
 mkpkg.sh                    |  2 +-
 restagent/etc/restconf.yaml | 21 ++++++++++++---------
 restagent/makefile          |  2 +-
 sshsvc/makefile             |  2 +-
 8 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/captrace/makefile b/captrace/makefile
index 3351a6c4..841c8bfe 100644
--- a/captrace/makefile
+++ b/captrace/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2402.4
+VERSION = 2.2402.5
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
diff --git a/crontask/makefile b/crontask/makefile
index 3bfd6957..8fbd47d9 100644
--- a/crontask/makefile
+++ b/crontask/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2402.4
+VERSION = 2.2402.5
 LIBDIR = ems.agt/lib
 BINNAME = crontask
 
diff --git a/data2html/makefile b/data2html/makefile
index c52978b5..ef14672b 100644
--- a/data2html/makefile
+++ b/data2html/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2402.4
+VERSION = 2.2402.5
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
diff --git a/makefile b/makefile
index 2b04ce06..6826124b 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2402.4
+VERSION = 2.2402.5
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
diff --git a/mkpkg.sh b/mkpkg.sh
index a2b3892c..9d42d611 100644
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -2,7 +2,7 @@
 
 ProcList="restagent crontask sshsvc captrace data2html"
 ProjectL=omc
-VERSION=2.2402.4
+VERSION=2.2402.5
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}
diff --git a/restagent/etc/restconf.yaml b/restagent/etc/restconf.yaml
index 4d42455e..6f4d4ede 100644
--- a/restagent/etc/restconf.yaml
+++ b/restagent/etc/restconf.yaml
@@ -26,7 +26,7 @@ rest:
     keyFile: ./etc/certs/omc-server.key
 
 webServer:
-  enabled: true
+  enabled: false
   rootDir: d:/local.git/fe.ems.vue3/dist
   listen: 
     - addr: :80
@@ -41,11 +41,14 @@ webServer:
 database:
   type: mysql
   user: root
-  password: 1000omc@kp!
-  host: 127.0.0.1
-  port: 33066
+  # password: 1000omc@kp!
+  # host: "192.168.8.103"
+  # port: 33066
   name: omc_db
   backup: d:/local.git/ems.agt/restagent/database
+  password: "root@1234"
+  host: "192.168.5.59"
+  port: 3306
 
 # Redis 缓存数据，数据源声明全小写
 redis:
@@ -53,14 +56,14 @@ redis:
     # OMC系统使用库
     default:
       port: 6379 # Redis port
-      host: "192.168.2.219" # Redis host
-      password: "123456"
+      host: "192.168.5.59" # Redis host
+      password: "redis@1234"
       db: 10 # Redis db_num
     # UDM网元用户库
     udmuser:
       port: 6379 # Redis port
-      host: "192.168.2.219"
-      password: "123456"
+      host: "192.168.13.140"
+      password: ""
       db: 0 # Redis db_num
   # 多个数据源时可以用这个指定默认的数据源
   defaultDataSourceName: "default"
@@ -78,7 +81,7 @@ mml:
 
 # NE config
 ne:
-  user: root
+  user: agtuser
   etcdir: /usr/local/etc
   bindir: /usr/local/bin
   omcdir: /usr/local/omc
diff --git a/restagent/makefile b/restagent/makefile
index e3549da5..b353e9ec 100644
--- a/restagent/makefile
+++ b/restagent/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2402.4
+VERSION = 2.2402.5
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
diff --git a/sshsvc/makefile b/sshsvc/makefile
index 07419797..d2e5fd56 100644
--- a/sshsvc/makefile
+++ b/sshsvc/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2402.4
+VERSION = 2.2402.5
 LIBDIR = ems.agt/lib
 BINNAME = sshsvc