From 3655fb999afac6390ab535b92f2c1070d4b9f63d Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 19 Mar 2025 21:03:30 +0800 Subject: [PATCH] =?UTF-8?q?ref:=20=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 15 ++++----------- pkg.sh | 6 +++--- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index df0f37c..d644953 100644 --- a/README.md +++ b/README.md @@ -4,25 +4,18 @@ OS: Ubuntu 18.04 / 22.04 (Recommendation) -Arch: amd64 - -Golang: go1.22.1 linux/amd64 +Golang: go1.22.5 (or above) Database: 10.6.16-MariaDB, Redis server v=5.0.5 (or above) -node.js: v18.16.0 (or above) +node.js: v20.18.0 (or above) ## Build Guide ```bash -git clone https://xxx@bitbucket.org/bluearcuscom/ems.git omc.git +git clone https://xxx@git/ems.git omc.git cd omc.git -git pull -cd fe.ems.vue3 -npm install -npm run build -cd ../build.ems -./build.sh deb +bash pkg.sh --web --api -v 2.2503.2 find "${fehooksdir}" -type f -name '*.ts' -exec sed -i 's/[一-龥()“”,。?!]~·]//g' {} + diff --git a/pkg.sh b/pkg.sh index c0f5222..306b894 100644 --- a/pkg.sh +++ b/pkg.sh @@ -46,7 +46,7 @@ if [ -n "$BuildWeb" ]; then npm install --registry https://registry.npmmirror.com npm run build - output=$BuildDir/build/linux/usr/local/etc/omc/web + output=$BuildDir/linux/usr/local/etc/omc/web rm -rf $output cp -rf dist/default/config.js dist/config.js cp -rf dist $output @@ -66,7 +66,7 @@ if [ -n "$BuildApi" ]; then MOD_CONFIG="be.ems/src/framework/config" go build -o omc -v -ldflags "-s -w -X '$MOD_CONFIG.Version=$VERSION' -X '$MOD_CONFIG.BuildTime=$(date)' -X '$MOD_CONFIG.GoVer=$(go version)'" - output=$BuildDir/build/linux/usr/local/bin + output=$BuildDir/linux/usr/local/bin cp -rf omc $output/omc echo "===> go build omc copy to $output" @@ -79,6 +79,6 @@ fi # =================== deb/rpm echo -bash $BuildDir/build/build.sh -v $VERSION +bash $BuildDir/build.sh -v $VERSION # bash pkg.sh --web --api -v 2.2503.2