chore: 更新版本号2.2407.2

CHANGELOG.md

@@ -1,5 +1,13 @@
 # 版本发布日志
 
+## 2.2407.2-20240712
+
+- 修复 网元版本安装MME写入host文件ip错误
+- 修复 支持kvdb依赖包安装，默认带的adb改为kvdb
+- 修复 网元版本安装命令终止符判断#$
+- 更新 CNType0表示禁止接入NA
+- 修复 文件复制到本地时创建文件目录避免路径错误
+
 ## 2.2407.1-20240704
 
 - 修复 网元版本安装MME修改S6A地址为MME_IP

captrace/makefile

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

crontask/makefile

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

data2html/makefile

@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2407.1
+VERSION = 2.2407.2
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)

makefile

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

mkpkg.sh

@@ -2,7 +2,7 @@
 
 ProcList="restagent crontask sshsvc captrace data2html"
 ProjectL=omc
-VERSION=2.2407.1
+VERSION=2.2407.2
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}

restagent/etc/restconf.yaml

@@ -21,17 +21,9 @@ rest:
   - ipv4: 0.0.0.0
     ipv6: 
     port: 33040
-  - ipv4: 0.0.0.0
-    ipv6: 
-    port:  34443
-    scheme: https
-    clientAuthType: 0
-    caFile: ./etc/certs/omc-ca.crt
-    certFile: ./etc/certs/omc-server.crt
-    keyFile: ./etc/certs/omc-server.key
 
 webServer:
-  enabled: true
+  enabled: false
   rootDir: d:/local.git/fe.ems.vue3/dist
   listen: 
     - addr: :80
@@ -46,10 +38,10 @@ webServer:
 database:
   type: mysql
   user: root
-  password: 1000omc@kp!
-  host: 127.0.0.1
-  port: 33066
-  name: omc_db
+  password: "root@1234"
+  host: "192.168.8.58"
+  port: 3306
+  name: "omc_db"
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
   backup: d:/local.git/be.ems/restagent/database
 
@@ -59,13 +51,13 @@ redis:
     # OMC系统使用库
     default:
       port: 6379 # Redis port
-      host: "127.0.0.1" # Redis host
-      password: "helloearth"
+      host: "192.168.8.58" # Redis host
+      password: "redis@1234"
       db: 10 # Redis db_num
     # UDM网元用户库
     udmuser:
-      port: 6379 # Redis port
-      host: "127.0.0.1"
+      port: 36379 # Redis port
+      host: "192.168.8.58"
       password: "helloearth"
       db: 0 # Redis db_num
   # 多个数据源时可以用这个指定默认的数据源
@@ -78,7 +70,7 @@ mml:
   port2: 5002
   sleep: 200
   deadLine: 10
-  sizeRow: 100
+  sizeRow: 600
   sizeCol: 128
   bufferSize: 65535
   user: admin
@@ -87,7 +79,7 @@ mml:
 
 # NE config
 ne:
-  user: root
+  user: omcuser
   etcdir: /usr/local/etc
   bindir: /usr/local/bin
   omcdir: /usr/local/omc
@@ -116,12 +108,12 @@ omc:
   checksign: false
   rootDir: ./
   binDir: ./bin
-  backup: ./backup
-  upload: ./upload
-  frontUpload: d:/local.git/fe.ems/upload
-  frontTraceDir: d:/local.git/fe.ems/trace
-  software: ./software
-  license: ./license
+  backup: C:/usr/local/omc/backup
+  upload: C:/usr/local/omc/upload
+  frontUpload: C:/usr/local/omc/upload
+  frontTraceDir: C:/usr/local/omc/trace
+  software: C:/usr/local/omc/software
+  license: C:/usr/local/omc/license
   gtpUri: gtp:192.168.2.219:2152
   checkContentType: false
   testMode: false
@@ -134,7 +126,7 @@ omc:
 # email/sms
 # smProxy: sms(Short Message Service)/smsc(SMS Centre)  
 alarm:
-  forwardAlarm: true
+  forwardAlarm: false
   email:
     smtp: mail.agrandtech.com
     port: 25
@@ -189,12 +181,12 @@ testConfig:
   file: ./etc/testconfig.yaml
 
 # 静态文件配置, 相对项目根路径或填绝对路径
-staticFile:
-  # 默认资源，dir目录需要预先创建
-  default:
-    prefix: "/static"
-    dir: "./static"
-  # 文件上传资源目录映射，与项目目录同级
-  upload:
-    prefix: "/upload"
-    dir: "./upload"
+# staticFile:
+#   # 默认资源，dir目录需要预先创建
+#   default:
+#     prefix: "/static"
+#     dir: "./static"
+#   # 文件上传资源目录映射，与项目目录同级
+#   upload:
+#     prefix: "/upload"
+#     dir: "./upload"

restagent/makefile

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

sshsvc/makefile

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