Merge remote-tracking branch 'origin/main' into multi-tenant

CHANGELOG.md

@@ -1,5 +1,11 @@
 # 版本发布日志
 
+## 2.2502.2-20250214
+
+- 修复 修改调度任务导出SMSC-CDR时间格式错误
+- 修复 导出备份配置文件同步FTP功能配置调整
+- 更新 调整/路由提示信息
+
 ## 2.2502.1-20250208
 
 - 新增 基站状态记录上报和导出功能

makefile

@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2502.1
+VERSION = 2.2502.2
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)

mkpkg.sh

@@ -2,7 +2,7 @@
 
 ProcList="restagent sshsvc"
 ProjectL=omc
-VERSION=2.2502.1
+VERSION=2.2502.2
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}

restagent/makefile

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

src/modules/common/controller/index.go

@@ -32,6 +32,6 @@ func (s *IndexController) Handler(c *gin.Context) {
 	name := "OMC"
 	version := libGlobal.Version
 	// str := "欢迎使用%s核心网管理平台，当前版本：%s，请通过前台地址访问。"
-	str := "Welcome to the %s Core Network Management Platform, current version: %s, please access via the frontend address."
+	str := "%s Core Network Management, current version: %s"
 	c.JSON(200, result.OkMsg(fmt.Sprintf(str, name, version)))
 }

sshsvc/makefile

@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2502.1
+VERSION = 2.2502.2
 LIBDIR = be.ems/lib
 BINNAME = sshsvc