From 9314ec141b15996dc0e6a71785efbf491eec8493 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 12 九月 2023 15:07:54 +0800
Subject: [PATCH] 修改wifi配置

---
 system-service/controllers/syssetconf.go |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/system-service/controllers/syssetconf.go b/system-service/controllers/syssetconf.go
index c5b2efa..a884e95 100644
--- a/system-service/controllers/syssetconf.go
+++ b/system-service/controllers/syssetconf.go
@@ -1020,10 +1020,12 @@
 // @Router /data/api-v/sysset/getWifiList [POST]
 func (sset SysSetController) GetWifiList(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
 	fname := c.PostForm("ifname")
-	wifiList, err := sys.GetWifi(fname)
+	wifiList, err := sys.ScanWifiList(fname)
 	if nil == err {
 		return &bhomeclient.Reply{Success: true, Data: wifiList}
 	} else {
+		logger.Debug("iwlist err,", fname, err.Error())
+
 		return &bhomeclient.Reply{Success: false, Msg: err.Error()}
 	}
 }
@@ -1040,7 +1042,30 @@
 	passwd := c.PostForm("passwd")
 	ssid := c.PostForm("ssid")
 
-	err := sys.ConnectWifi(fname, passwd, ssid)
+	err := sys.ConnectWifi(fname, ssid, passwd)
+	if nil == err {
+		return &bhomeclient.Reply{Success: true, Data: "杩炴帴鎴愬姛!"}
+	} else {
+		msg := err.Error()
+		if strings.Contains(msg, "exit status") {
+			msg = "鍔犲叆澶辫触,璇锋鏌ラ厤缃�!"
+		}
+		return &bhomeclient.Reply{Success: false, Msg: msg}
+	}
+}
+
+// @Summary 杩炴帴wifi
+// @Description 杩炴帴wifi
+// @Produce json
+// @Tags 杩炴帴wifi
+// @Success 200 {string} json "{"code":200, msg:"",data:[],success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"",data:"[]",success:false}"
+// @Router /data/api-v/sysset/connectWifi [POST]
+func (sset SysSetController) DisonnectWifi(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
+	fname := c.PostForm("ifname")
+
+	// 鍏抽棴wifi杩炴帴鏃秙sid 浼燿el
+	err := sys.ConnectWifi(fname, "del", "")
 	if nil == err {
 		return &bhomeclient.Reply{Success: true, Data: "杩炴帴鎴愬姛!"}
 	} else {

--
Gitblit v1.8.0