From cc6d3763795b62d353df0c1eb58cbb736b709829 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 20 十月 2023 09:48:37 +0800
Subject: [PATCH] 添加主节点退出时, 重新选举master的功能
---
system-service/controllers/syssetconf.go | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/system-service/controllers/syssetconf.go b/system-service/controllers/syssetconf.go
index 117a5ce..a884e95 100644
--- a/system-service/controllers/syssetconf.go
+++ b/system-service/controllers/syssetconf.go
@@ -10,7 +10,6 @@
"time"
"vamicro/config"
"vamicro/extend/util"
- service2 "vamicro/saas-service/service"
"vamicro/system-service/models"
"vamicro/system-service/service"
"vamicro/system-service/sys"
@@ -1021,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()}
}
}
@@ -1041,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 {
@@ -1180,7 +1204,7 @@
machineCode := licence.GetMachineCode()
// 鑾峰彇璁惧婵�娲绘椂闂�
- res, err := service2.DoBusReq("/data/api-v/version/snBus", config.Server.AnalyServerId, aiot.RequestMethod_Post, aiot.RequestContentType_ApplicationJson, map[string]interface{}{})
+ res, err := service.DoBusReq("/data/api-v/version/snBus", config.Server.AnalyServerId, aiot.RequestMethod_Post, aiot.RequestContentType_ApplicationJson, map[string]interface{}{})
logger.Warn("snBus", string(res))
installTime := ""
if err == nil {
--
Gitblit v1.8.0