From 9fb060f20e47c2433491860f2e0fbde196fa5cb7 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Tue, 2 Apr 2024 11:51:44 +0800
Subject: [PATCH] r2.2404.1

---
 CHANGELOG.md                                    | 13 +++++++++++--
 captrace/makefile                               |  2 +-
 crontask/makefile                               |  2 +-
 data2html/makefile                              |  2 +-
 makefile                                        |  2 +-
 mkpkg.sh                                        |  2 +-
 restagent/makefile                              |  2 +-
 src/framework/config/config/config.default.yaml |  2 +-
 sshsvc/makefile                                 |  2 +-
 9 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80395827..bbf80397 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,22 @@
 # 版本发布日志
 
-## 2.2403.3-20240330
+## 2.2404.1-20240402
 
 - 新增 网元安装软包管理相关接口
 - 优化 网元安装授权流程相关接口操作
 - 优化 操作日志旧接口的网元参数配置多语言翻译
 - 修复 多语言翻译值转化key进行查询
+- 增加 MOCNGW网元KPI
+- 修复 时区问题，西半球时区出现时区格式转换错误，增加database配置项connParam用于配置数据库连接参数
 
-## 2.2403.1-20240318
+## 2.2403.2-20240327
+
+- 修复 配置文件配置多个指定IP地址时启动时会导致绑定127.0.0.1地址失败
+- 增加 MOCNGW网元参数配置
+- 修复 OMC MML翻译错误
+- 优化 判断redis数据库是否安装，如果已安装不再安装且不会提示错误
+
+## 2.2403.1-20240321
 
 - 新增 telnet 连接包工具
 - 新增 终端主机配置接口
diff --git a/captrace/makefile b/captrace/makefile
index 3f4c8302..df773ce8 100644
--- a/captrace/makefile
+++ b/captrace/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2403.3
+VERSION = 2.2404.1
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
diff --git a/crontask/makefile b/crontask/makefile
index 7215035a..a34235e4 100644
--- a/crontask/makefile
+++ b/crontask/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2403.3
+VERSION = 2.2404.1
 LIBDIR = be.ems/lib
 BINNAME = crontask
 
diff --git a/data2html/makefile b/data2html/makefile
index 70b1ab6e..48f7277e 100644
--- a/data2html/makefile
+++ b/data2html/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2403.3
+VERSION = 2.2404.1
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
diff --git a/makefile b/makefile
index be088a17..c6eb0750 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2403.3
+VERSION = 2.2404.1
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
diff --git a/mkpkg.sh b/mkpkg.sh
index 390d2fc5..e3b12e95 100644
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -2,7 +2,7 @@
 
 ProcList="restagent crontask sshsvc captrace data2html"
 ProjectL=omc
-VERSION=2.2403.3
+VERSION=2.2404.1
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}
diff --git a/restagent/makefile b/restagent/makefile
index c087134a..68d24088 100644
--- a/restagent/makefile
+++ b/restagent/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2403.3
+VERSION = 2.2404.1
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
diff --git a/src/framework/config/config/config.default.yaml b/src/framework/config/config/config.default.yaml
index d61689d0..e9251dec 100644
--- a/src/framework/config/config/config.default.yaml
+++ b/src/framework/config/config/config.default.yaml
@@ -1,7 +1,7 @@
 # 项目信息
 framework:
   name: "CN EMS"
-  version: "2.2403.3"
+  version: "2.2404.1"
 
 # 应用服务配置
 server:
diff --git a/sshsvc/makefile b/sshsvc/makefile
index 5e6f178e..74512b63 100644
--- a/sshsvc/makefile
+++ b/sshsvc/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2403.3
+VERSION = 2.2404.1
 LIBDIR = be.ems/lib
 BINNAME = sshsvc