From 9ffb07bbfd0b0aa6282c593c32ec5020a75c1337 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 26 Mar 2025 16:19:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/default/omc.yaml | 8 +++--- pkg.sh | 65 ------------------------------------------ 2 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 pkg.sh diff --git a/build/default/omc.yaml b/build/default/omc.yaml index 6c823e8b..599a5ca4 100644 --- a/build/default/omc.yaml +++ b/build/default/omc.yaml @@ -18,11 +18,11 @@ logger: # rest agent listen ipv4/v6 and port, support multiple routines # ip: 0.0.0.0 or ::0, support IPv4/v6 rest: - - ipv4: "0.0.0.0" + - ipv4: 0.0.0.0 ipv6: "" port: 33030 schema: http - - ipv4: "0.0.0.0" + - ipv4: 0.0.0.0 ipv6: "" port: 33443 schema: https @@ -33,9 +33,9 @@ webServer: enabled: true rootDir: /usr/local/etc/omc/web listen: - - addr: "0.0.0.0:80" + - addr: 0.0.0.0:80 schema: http - - addr: "0.0.0.0:443" + - addr: 0.0.0.0:443 schema: https certFile: /usr/local/etc/omc/certs/omc-web.crt keyFile: /usr/local/etc/omc/certs/omc-web.key diff --git a/pkg.sh b/pkg.sh deleted file mode 100644 index 52f5419d..00000000 --- a/pkg.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# 前端目录 -WebDir=/root/omc.git/fe.ems.vue3/ -BuildWeb="" -# 当前目录 -RootDir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) -# 默认版本值 -VERSION="2.2503.2" - -# usage -usage() { - echo "Usage: bash $0 [OPTION]" - echo - echo "Build Software Package OPTION:" - echo " -v Specify the version" - echo " -web Build Web ($WebDir)" - echo " -h Display this help message" - echo - exit 1 -} -# Read command line arguments -while [[ $# -gt 0 ]]; do - case "$1" in - -v) VERSION="$2"; shift 2 ;; - -web) BuildWeb="build"; shift ;; - *) usage ;; - esac -done - -# =================== Web -echo -# Determine if -web is passed in -if [ -n "$BuildWeb" ]; then - cd $WebDir - npm install --registry https://registry.npmmirror.com - npm run build - rm -rf $RootDir/build/linux/usr/local/etc/omc/web - cp -rf dist/default/config.js dist/config.js - cp -rf dist $RootDir/build/linux/usr/local/etc/omc/web - echo "===> web build dist copy to /build/linux/usr/local/etc/omc/web" -fi - - -# =================== sshsvc -echo -cd $RootDir/sshsvc -make - -cp -rf sshsvc $RootDir/build/linux/usr/local/bin/sshsvc -echo "===> go build sshsvc copy to /build/linux/usr/local/bin" - - -# =================== omc -echo -cd $RootDir -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)'" - -cp -rf omc $RootDir/build/linux/usr/local/bin/omc -echo "===> go build omc copy to /build/linux/usr/local/bin" - - -# =================== deb/rpm -echo -bash $RootDir/build/build.sh -v $VERSION