From 6e5530ad5e1d35f34fc175e994c1e8e71aa2501c Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Sat, 27 Jul 2024 11:31:47 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=202.2407.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                    | 8 ++++++++
 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, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index caedb06d..ff57a421 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # 版本发布日志
 
+## 2.2407.4-20240727
+
+- 新增 网元配置备份功能
+- 新增 UDM鉴权文件导入K4文件支持
+- 更新 对使用手册/官网进行按钮级限制
+- 修复 KPI上报推送到对应网元，查询改用时间戳
+- 修复 IMS CDR RecordType查询语法处理，兼容mariadb数据库
+
 ## 2.2407.3-20240716
 
 - 更新 参数配置AMF参数配置system
diff --git a/captrace/makefile b/captrace/makefile
index 0f67fe6d..79e24160 100644
--- a/captrace/makefile
+++ b/captrace/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2407.3
+VERSION = 2.2407.4
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
diff --git a/crontask/makefile b/crontask/makefile
index 690bc389..e1bf0419 100644
--- a/crontask/makefile
+++ b/crontask/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2407.3
+VERSION = 2.2407.4
 LIBDIR = be.ems/lib
 BINNAME = crontask
 
diff --git a/data2html/makefile b/data2html/makefile
index 8175ee49..3933e7c7 100644
--- a/data2html/makefile
+++ b/data2html/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2407.3
+VERSION = 2.2407.4
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
diff --git a/makefile b/makefile
index 0dcb5bfb..0c6ceeb6 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2407.3
+VERSION = 2.2407.4
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
diff --git a/mkpkg.sh b/mkpkg.sh
index c5ce36e8..44ebf0ca 100644
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -2,7 +2,7 @@
 
 ProcList="restagent crontask sshsvc captrace data2html"
 ProjectL=omc
-VERSION=2.2407.3
+VERSION=2.2407.4
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}
diff --git a/restagent/makefile b/restagent/makefile
index ff761071..09d2d2e1 100644
--- a/restagent/makefile
+++ b/restagent/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2407.3
+VERSION = 2.2407.4
 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 23260483..f5091929 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.2407.3"
+  version: "2.2407.4"
 
 # 应用服务配置
 server:
diff --git a/sshsvc/makefile b/sshsvc/makefile
index 20e2f55b..187cc8dc 100644
--- a/sshsvc/makefile
+++ b/sshsvc/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2407.3
+VERSION = 2.2407.4
 LIBDIR = be.ems/lib
 BINNAME = sshsvc