From 8aea58da555af257acccbd5d334f208154c26c5f Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期一, 21 八月 2023 14:27:33 +0800 Subject: [PATCH] update --- utils/cmd.go | 8 ++------ conf/apsClient.json | 2 +- api/v1/config.go | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/api/v1/config.go b/api/v1/config.go index 96a1c3e..571d203 100644 --- a/api/v1/config.go +++ b/api/v1/config.go @@ -76,7 +76,7 @@ shName = conf.Conf.System.NetDownShellName } sh := fmt.Sprintf("%s %v %v %v", shName, params.IP, params.MASK, params.Gateway) - err = utils.Cmd(conf.Conf.System.NetSetShellPath, sh) + err = utils.Cmd(conf.Conf.System.NetSetShellPath + sh) if err != nil { logx.Errorf("network update failed: %v", err.Error()) ctx.FailWithMsg(ecode.UnknownErr, "缃戠粶璁剧疆澶辫触") diff --git a/conf/apsClient.json b/conf/apsClient.json index 207a4c1..6549a1c 100644 --- a/conf/apsClient.json +++ b/conf/apsClient.json @@ -3,7 +3,7 @@ "env": "develop", "port": 8003, "deviceId": "DeviceID 1", - "netSetShellPath": "/data/network", + "netSetShellPath": "/data/network/", "netUpShellName": "up.sh", "netDownShellName": "down.sh" }, diff --git a/utils/cmd.go b/utils/cmd.go index 018f63a..b7392b1 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -6,13 +6,9 @@ "os/exec" ) -func Cmd(directory, script string) error { +func Cmd(script string) error { // 鍒涘缓涓�涓墽琛屽懡浠ょ殑瀵硅薄 - cmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("cd %s && %s", directory, script)) - - // 璁剧疆鍛戒护鐨勫伐浣滅洰褰� - cmd.Dir = directory - + cmd := exec.Command("/bin/bash", "-c", script) // 灏嗗懡浠ょ殑杈撳嚭杩炴帴鍒板綋鍓嶈繘绋嬬殑杈撳嚭 cmd.Stderr = os.Stderr -- Gitblit v1.8.0