From 63645d248c765244488cd34dbc1bb6528ca6b7c7 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 05 九月 2023 09:58:13 +0800
Subject: [PATCH] 修复编译
---
system-service/controllers/mqtt.go | 130 +++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/system-service/controllers/mqtt.go b/system-service/controllers/mqtt.go
index 9d2b95d..630477a 100644
--- a/system-service/controllers/mqtt.go
+++ b/system-service/controllers/mqtt.go
@@ -1,66 +1,66 @@
-package controllers
-
-import (
- "basic.com/valib/bhomeclient.git"
- "basic.com/valib/logger.git"
- "encoding/json"
- "io/ioutil"
- "os"
- "vamicro/extend/util"
- "vamicro/system-service/sys"
- "vamicro/system-service/vo"
-)
-
-type MqttController struct {
-
-}
-
-//鑾峰彇mqtt閰嶇疆
-func (mc *MqttController) GetConfig(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply{
- r := &bhomeclient.Reply{ Success:true }
- mqttf := util.GetVamicroPath()+"/mqtt.config"
- if util.FileExists(mqttf) {
- b, err := ioutil.ReadFile(mqttf)
- if err == nil {
- var set vo.MqttConf
- if err = json.Unmarshal(b, &set);err == nil {
- r.Data = set
- }
- }
- }
-
- return r
-}
-
-//淇濆瓨mqtt閰嶇疆
-func (mc *MqttController) SaveConfig(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply{
- var reqBody vo.MqttConf
- if err :=c.BindJSON(&reqBody);err !=nil {
- return &bhomeclient.Reply{Msg:err.Error()}
- }
- if !reqBody.AnonymousEnable && (reqBody.Username == "" || reqBody.Password == "") {
- return &bhomeclient.Reply{ Msg:"鐢ㄦ埛鍚嶅拰瀵嗙爜涓嶈兘涓虹┖" }
- }
-
- b, err := json.Marshal(reqBody)
- if err != nil {
- return &bhomeclient.Reply{Msg:err.Error()}
- }
-
- mqttf := util.GetVamicroPath()+"/mqtt.config"
- err = ioutil.WriteFile(mqttf, b, os.ModePerm)
- if err != nil {
- return &bhomeclient.Reply{Msg:err.Error()}
- }
- //1.妫�鏌osquitto 鏄惁瀹夎 (apt瀹夎,閰嶇疆鏂囦欢鍦�/etc/mosquitto鐩綍涓�)
- if ex :=sys.ExistService("mosquitto");ex == "" {
- return &bhomeclient.Reply{ Msg:"mqtt server 灏氭湭瀹夎锛岃鍏堝畨瑁呮湇鍔�" }
- }
- err = sys.SetMqttConf(&reqBody)
- if err != nil {
- logger.Error("SetMqttConf err:", err)
- return &bhomeclient.Reply{Msg:err.Error()}
- }
-
- return &bhomeclient.Reply{Success:true, Msg:"淇濆瓨鎴愬姛"}
+package controllers
+
+import (
+ "basic.com/valib/bhomeclient.git"
+ "basic.com/valib/logger.git"
+ "encoding/json"
+ "io/ioutil"
+ "os"
+ "vamicro/extend/util"
+ "vamicro/system-service/sys"
+ "vamicro/system-service/vo"
+)
+
+type MqttController struct {
+
+}
+
+//鑾峰彇mqtt閰嶇疆
+func (mc *MqttController) GetConfig(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply{
+ r := &bhomeclient.Reply{ Success:true }
+ mqttf := util.GetVamicroPath()+"/mqtt.config"
+ if util.FileExists(mqttf) {
+ b, err := ioutil.ReadFile(mqttf)
+ if err == nil {
+ var set vo.MqttConf
+ if err = json.Unmarshal(b, &set);err == nil {
+ r.Data = set
+ }
+ }
+ }
+
+ return r
+}
+
+//淇濆瓨mqtt閰嶇疆
+func (mc *MqttController) SaveConfig(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply{
+ var reqBody vo.MqttConf
+ if err :=c.BindJSON(&reqBody);err !=nil {
+ return &bhomeclient.Reply{Msg:err.Error()}
+ }
+ if !reqBody.AnonymousEnable && (reqBody.Username == "" || reqBody.Password == "") {
+ return &bhomeclient.Reply{ Msg:"鐢ㄦ埛鍚嶅拰瀵嗙爜涓嶈兘涓虹┖" }
+ }
+
+ b, err := json.Marshal(reqBody)
+ if err != nil {
+ return &bhomeclient.Reply{Msg:err.Error()}
+ }
+
+ mqttf := util.GetVamicroPath()+"/mqtt.config"
+ err = ioutil.WriteFile(mqttf, b, os.ModePerm)
+ if err != nil {
+ return &bhomeclient.Reply{Msg:err.Error()}
+ }
+ //1.妫�鏌osquitto 鏄惁瀹夎 (apt瀹夎,閰嶇疆鏂囦欢鍦�/etc/mosquitto鐩綍涓�)
+ if ex :=sys.ExistService("mosquitto");ex == "" {
+ return &bhomeclient.Reply{ Msg:"mqtt server 灏氭湭瀹夎锛岃鍏堝畨瑁呮湇鍔�" }
+ }
+ err = sys.SetMqttConf(&reqBody)
+ if err != nil {
+ logger.Error("SetMqttConf err:", err)
+ return &bhomeclient.Reply{Msg:err.Error()}
+ }
+
+ return &bhomeclient.Reply{Success:true, Msg:"淇濆瓨鎴愬姛"}
}
\ No newline at end of file
--
Gitblit v1.8.0