diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e60ccb3..469e4c5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 版本发布日志 +## 2.2502.4-20250228 + +- 重构 轻量化适配 + ## 2.2502.3-20250221 - 重构 数据库表结构变更 diff --git a/makefile b/makefile index da45b9ee..628f94aa 100644 --- a/makefile +++ b/makefile @@ -3,7 +3,7 @@ ProjectL = omc ProjectU = OMC PROJECT = $(ProjectL) -VERSION = 2.2502.3 +VERSION = 2.2502.4 RelDate = `date +%Y%m%d` Release = $(RelDate) RelVer = $(VERSION)-$(RelDate) diff --git a/mkpkg.sh b/mkpkg.sh index 6ffb2d3d..3af0f518 100755 --- a/mkpkg.sh +++ b/mkpkg.sh @@ -2,7 +2,7 @@ ProcList="restagent sshsvc" ProjectL=omc -VERSION=2.2502.3 +VERSION=2.2502.4 RelDate=`date +%Y%m%d` Release=${RelDate} RelVer=${VERSION}-${RelDate} diff --git a/restagent/etc/restconf.yaml b/restagent/etc/restconf.yaml index 66461bc0..56224b80 100644 --- a/restagent/etc/restconf.yaml +++ b/restagent/etc/restconf.yaml @@ -31,8 +31,8 @@ rest: keyFile: ./etc/certs/omc-server.key webServer: - enabled: true - rootDir: d:/omc.git/fe.ems.vue3/dist # front-end build dist directory + enabled: false + rootDir: d:/omc.git/fe.ems.vue3/dist listen: - addr: :80 schema: http @@ -49,11 +49,11 @@ database: # Default database instance default: type: "mysql" - host: "127.0.0.1" - port: 33066 + host: "192.168.9.58" + port: 13306 username: "root" password: "1000omc@kp!" - database: "omc_db" + database: "omc_db_lite" logging: true # Built-in lightweight database lite: @@ -68,8 +68,8 @@ redis: dataSource: # OMC system db default: - port: 6379 # Redis port - host: "127.0.0.1" # Redis host + port: 16379 # Redis port + host: "192.168.9.58" # Redis host password: "helloearth" db: 10 # Redis db_num # used to specify the default data source for multiple data resourece @@ -87,8 +87,8 @@ mml: # Tracking configuration trace: - enabled: false - host: "127.0.0.1" # Fill in the specific IP address + enabled: true + host: "192.168.5.58" # Fill in the specific IP address port: 33033 # NE config @@ -202,14 +202,3 @@ params: testConfig: enabled: false file: ./etc/testconfig.yaml - -# 静态文件配置, 相对项目根路径或填绝对路径 -staticFile: - # 默认资源,dir目录需要预先创建 - default: - prefix: "/static" - dir: "./static" - # 文件上传资源目录映射,与项目目录同级 - upload: - prefix: "/upload" - dir: "./upload" diff --git a/restagent/makefile b/restagent/makefile index 6685169a..c4ac488c 100644 --- a/restagent/makefile +++ b/restagent/makefile @@ -1,7 +1,7 @@ # Makefile for rest agent project PROJECT = OMC -VERSION = 2.2502.3 +VERSION = 2.2502.4 PLATFORM = amd64 ARMPLATFORM = aarch64 BUILDDIR = ../../build diff --git a/sshsvc/makefile b/sshsvc/makefile index 13d215cf..781de273 100644 --- a/sshsvc/makefile +++ b/sshsvc/makefile @@ -1,7 +1,7 @@ # Makefile for OMC-OMC-crontask project PROJECT = OMC -VERSION = 2.2502.3 +VERSION = 2.2502.4 LIBDIR = be.ems/lib BINNAME = sshsvc