From 7c811247ecf143e08c576986a884bedadc57dd66 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 05 六月 2020 18:29:41 +0800
Subject: [PATCH] add refresh token to resp
---
extend/sys/system.go | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/extend/sys/system.go b/extend/sys/system.go
index 647917d..3689ea7 100644
--- a/extend/sys/system.go
+++ b/extend/sys/system.go
@@ -18,12 +18,12 @@
pwd := config.Server.SudoPassword
cmdStr := fmt.Sprintf("echo %s | sudo -S %s", pwd, cmd)
- return exec.Command("/bin/sh", "-c", cmdStr).Output()
+ return exec.Command("/bin/bash", "-c", cmdStr).Output()
}
// 妫�鏌� root鏉冮檺
func CheckRootPermissions() bool {
- showRootCMD := exec.Command("/bin/sh", "-c", "ls /root/")
+ showRootCMD := exec.Command("/bin/bash", "-c", "ls /root/")
if _, err := showRootCMD.Output(); err != nil {
return false
}
@@ -61,7 +61,7 @@
// 鑾峰彇鏈満缃戝叧ip
func GetDefaultRoute(networkName string) (route string, err error) {
- cmdStr := fmt.Sprintf("ip route show | grep -P \"^default.*%s\" | awk '{printf $3}'", networkName)
+ cmdStr := fmt.Sprintf("ip route show | grep -P \"^default.*%s onlink\" | awk '{printf $3}'", networkName)
cmd := exec.Command("/bin/sh", "-c", cmdStr)
b, err := cmd.Output()
if err != nil {
@@ -83,7 +83,7 @@
// 閰嶇疆鏈嶅姟鍣ㄧ綉缁�
func SetNetworkConfig(ipv4, netmask, gateway, dns string) (bool, string) {
- networkConfigScript := "/opt/vasystem/bin/netconfig"
+ networkConfigScript := "/opt/vasystem/script/netconfig"
ifname := config.Server.NetworkAdapter
localIPv4, localNetMask, _ := GetLocalIP(ifname)
localGW, _ := GetDefaultRoute(ifname)
@@ -234,3 +234,40 @@
return err == nil
}
+
+const ngConfig = "/opt/vasystem/config/system-2.0.conf"
+func GetNginxListenPort() string {
+ _, err := os.Stat(ngConfig)
+ if err != nil {
+ return "7003"
+ }
+
+ cmdStr := fmt.Sprintf("cat %s | grep listen | awk '{printf $2}' | sed 's/;//g'", ngConfig)
+ cmd := exec.Command("/bin/sh", "-c", cmdStr)
+ port, err := cmd.Output()
+ if err != nil {
+ return ""
+ }
+
+ return string(port)
+}
+
+func SetNginxListenPort(port string) bool {
+ _, err := os.Stat(ngConfig)
+ if err != nil {
+ return false
+ }
+
+ // 淇敼閰嶇疆鏂囦欢绔彛
+ cmdStr := fmt.Sprintf("sed -i 's/listen.*/listen %s;/' %s", port, ngConfig)
+ cmd := exec.Command("/bin/sh", "-c", cmdStr)
+ _, err = cmd.Output()
+ if err != nil {
+ return false
+ }
+
+ // 閲嶅惎nginx
+ _, err = execRootCommand("service nginx reload")
+
+ return err == nil
+}
\ No newline at end of file
--
Gitblit v1.8.0