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/sysInit.go | 486 +++++++++++++++++++++++++++---------------------------
1 files changed, 243 insertions(+), 243 deletions(-)
diff --git a/system-service/controllers/sysInit.go b/system-service/controllers/sysInit.go
index 9c70252..373db13 100644
--- a/system-service/controllers/sysInit.go
+++ b/system-service/controllers/sysInit.go
@@ -1,243 +1,243 @@
-package controllers
-
-import (
- "basic.com/valib/bhomeclient.git"
- "basic.com/valib/logger.git"
- "github.com/satori/go.uuid"
- "time"
- "vamicro/extend/util"
- "vamicro/system-service/models"
- "vamicro/system-service/sys"
-)
-
-type SysInitController struct {
-}
-
-//comment 鑾峰彇mqtt閰嶇疆
-//router /data/api-v/sysinit/getInitInfo
-func (sic *SysInitController) GetInitInfo(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
- var conf models.SysInit
- rows, _ := conf.Select()
- inited := false
- initUsername := ""
- initReg := false
- if rows > 0 {
- inited = conf.InitPwd
- initUsername = conf.InitUsername
- }
- if conf.UserType != "" && conf.Name != "" && conf.ProvinceId != "" && conf.CityId != "" && conf.Email != "" {
- initReg = true
- }
- return &bhomeclient.Reply{Success: true, Msg: "鏌ヨ鎴愬姛", Data: map[string]interface{}{
- "initPwd": inited,
- "initRegInfo": initReg,
- "username": initUsername,
- }}
-}
-
-//鍒濆鍖栫郴缁熷瘑鐮�
-//router /data/api-v/sysinit/savePassword
-func (sic *SysInitController) SavePassword(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
- type arg struct {
- Username string `json:"username"`
- Password string `json:"password"`
- }
- var reqBody arg
- c.BindJSON(&reqBody)
- if reqBody.Username == "" || reqBody.Password == "" || reqBody.Username == "basic" {
- return &bhomeclient.Reply{Msg: "鐢ㄦ埛鍚嶆垨瀵嗙爜涓嶈兘涓虹┖"}
- }
- //鍏堜繚瀛樼敤鎴峰悕瀵嗙爜锛岀劧鍚庡皢sysinit涓殑initPwd缃负true
- encryPwd, pe := util.Encrypt(reqBody.Password)
- if pe != nil {
- return &bhomeclient.Reply{Msg: pe.Error()}
- }
- tx := models.GetDB().Begin()
- var err error
- defer func() {
- if tx != nil && err != nil {
- tx.Rollback()
- }
- }()
-
- var tmpUser models.SysUser
- ru, _ := tmpUser.FindByName(reqBody.Username)
- targetUID := ""
- defHeadPic := ""
- var dhp models.DefHeadPic
- if headPics, err := dhp.FindAll(); err == nil && len(headPics) > 0 {
- defHeadPic = headPics[0].Path
- }
-
- if ru > 0 {
- targetUID = tmpUser.Id
- if err = tx.Exec("update "+tmpUser.TableName()+" set password=?,headpic=?,backgroundpic=? where id=?", encryPwd, defHeadPic, models.DefaultBgPic, targetUID).Error; err != nil {
- return &bhomeclient.Reply{Msg: err.Error()}
- }
- } else {
- targetUID = uuid.NewV4().String()
- if err = tx.Table(tmpUser.TableName()).Create(&models.SysUser{Id: targetUID, Username: reqBody.Username, Password: encryPwd, HeadPic: defHeadPic, BackgroundPic: models.DefaultBgPic}).Error; err != nil {
- return &bhomeclient.Reply{Msg: err.Error()}
- }
- }
- //缁欑敤鎴锋坊鍔犺彍鍗曟潈闄�
- var sysR models.SysRole
- _, err = sysR.FindByName("绠＄悊鍛�")
- if err != nil {
- return &bhomeclient.Reply{Msg: err.Error()}
- }
-
- userRole := models.SysUserRole{
- Id: uuid.NewV4().String(),
- UserId: targetUID,
- RoleId: sysR.Id,
- }
- if err = tx.Table(userRole.TableName()).Create(&userRole).Error; err != nil {
- return &bhomeclient.Reply{Msg: err.Error()}
- }
-
- var siModel models.SysInit
- err = tx.Table(siModel.TableName()).First(&siModel).Error
- if err != nil {
- if err.Error() != models.RecordNotFound {
- return &bhomeclient.Reply{Msg: err.Error()}
- } else {
- if err = tx.Table(siModel.TableName()).Create(models.SysInit{
- InitPwd: true,
- InitUsername: reqBody.Username,
- InitTime: time.Now().Format("2006-01-02 15:04:05"),
- NetName: "",
- UserType: "",
- PhoneNum: "",
- Name: "",
- ProvinceId: "",
- CityId: "",
- CountyId: "",
- Email: "",
- }).Error; err != nil {
- return &bhomeclient.Reply{Msg: err.Error()}
- }
- }
- } else {
- err = tx.Exec("update "+siModel.TableName()+" set initPwd=?, initUsername=?", true, reqBody.Username).Error
- if err != nil {
- return &bhomeclient.Reply{Msg: err.Error()}
- }
- }
- //鍒濆鍖栨椂缁欑鐞嗗憳鎵�鏈夌殑鑿滃崟鏉冮檺
- var sysMenu models.SysMenu
- allMenus := sysMenu.FindAll()
- err = tx.Exec("delete from "+models.SysRoleMenu{}.TableName()+" where role_id=?", sysR.Id).Error
- if err != nil {
- return &bhomeclient.Reply{Msg: err.Error()}
- }
- for _, n := range allMenus {
- tmpMenu := models.SysRoleMenu{
- Id: uuid.NewV4().String(),
- RoleId: sysR.Id,
- MenuId: n.Id,
- }
- err = tx.Table(tmpMenu.TableName()).Create(&tmpMenu).Error
- if err != nil {
- return &bhomeclient.Reply{Msg: err.Error()}
- }
- }
-
- err = tx.Exec("delete from "+models.SysUserMenu{}.TableName()+" where user_id=?", targetUID).Error
- if err != nil {
- return &bhomeclient.Reply{Msg: err.Error()}
- }
-
- tx.Commit()
- return &bhomeclient.Reply{Success: true, Msg: "淇濆瓨鎴愬姛"}
-}
-
-//comment 鑾峰彇缃戝崱涓嬫媺鑿滃崟
-//router /data/api-v/sysinit/networkList
-func (sic *SysInitController) NetworkList(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
- cards, e := sys.GetNetWorkCards()
- if e != nil {
- return &bhomeclient.Reply{Msg: e.Error()}
- }
-
- return &bhomeclient.Reply{Success: true, Data: cards}
-}
-
-//comment 绯荤粺绗竴娆″惎鍔ㄦ椂鍒濆鍖栫綉缁�
-// router /data/api-v/sysinit/initNetwork
-func (sic *SysInitController) InitNetwork(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
- type arg struct {
- NetName string `json:"netName"` //缃戝崱
- Ip string `json:"ip"` //ip
- SubMask string `json:"subMask"` //瀛愮綉鎺╃爜
- Gateway string `json:"gateway"` //缃戝叧
- Dns string `json:"dns"` //dns
- }
- var reqBody arg
- c.BindJSON(&reqBody)
- if reqBody.NetName == "" || reqBody.Ip == "" || reqBody.SubMask == "" || reqBody.Gateway == "" || reqBody.Dns == "" {
- return &bhomeclient.Reply{Msg: "鍙傛暟鏈夎锛岃妫�鏌�"}
- }
- isOk, msg := sys.SetNetworkConfig(
- reqBody.Ip,
- reqBody.SubMask,
- reqBody.Gateway,
- reqBody.Dns,
- reqBody.NetName)
- logger.Debug("isOk:", isOk, "msg:", msg)
- if !isOk {
- return &bhomeclient.Reply{Msg: msg}
- }
- return &bhomeclient.Reply{Success: true, Msg: "鍒濆鍖栨垚鍔�"}
-}
-
-type RegInfo struct {
- UserType string `json:"userType"` //personal:涓汉 company:鍏徃
- Name string `json:"name"` //濮撳悕
- ProvinceId string `json:"provinceId"` //鐪佷唤id
- CityId string `json:"cityId"` //鍩庡競id
- Addr string `json:"addr"` //鍦板潃
- Email string `json:"email"` //閭
-}
-
-//comment 淇濆瓨娉ㄥ唽淇℃伅
-//router /data/api-v/sysinit/saveRegInfo
-func (sic *SysInitController) SaveRegInfo(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
- var reqBody RegInfo
- c.BindJSON(&reqBody)
- if reqBody.UserType == "" || reqBody.Name == "" || reqBody.ProvinceId == "" || reqBody.CityId == "" || reqBody.Email == "" || reqBody.Addr == "" {
- return &bhomeclient.Reply{Msg: "鍙傛暟鏈夎"}
- }
- var siModel models.SysInit
- i, _ := siModel.Select()
- if i == 0 {
- return &bhomeclient.Reply{Msg: "璇峰厛閰嶇疆鐢ㄦ埛鍚嶅拰瀵嗙爜淇℃伅"}
- }
- siModel.UserType = reqBody.UserType
- siModel.Name = reqBody.Name
- siModel.ProvinceId = reqBody.ProvinceId
- siModel.CityId = reqBody.CityId
- siModel.Email = reqBody.Email
- if siModel.Update() {
- return &bhomeclient.Reply{Success: true, Msg: "淇濆瓨鎴愬姛"}
- }
- return &bhomeclient.Reply{Msg: "淇濆瓨澶辫触"}
-}
-
-//comment 鑾峰彇娉ㄥ唽淇℃伅
-//router /data/api-v/sysinit/getRegInfo
-func (sic *SysInitController) GetRegInfo(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
- var siModel models.SysInit
- i, _ := siModel.Select()
- if i > 0 {
- return &bhomeclient.Reply{Success: true, Data: map[string]string{
- "userType": siModel.UserType,
- "name": siModel.Name,
- "provinceId": siModel.ProvinceId,
- "cityId": siModel.CityId,
- "countyId": siModel.CountyId,
- "email": siModel.Email,
- }}
- }
- return &bhomeclient.Reply{Msg: "鑾峰彇澶辫触"}
-}
+package controllers
+
+import (
+ "basic.com/valib/bhomeclient.git"
+ "basic.com/valib/logger.git"
+ "github.com/satori/go.uuid"
+ "time"
+ "vamicro/extend/util"
+ "vamicro/system-service/models"
+ "vamicro/system-service/sys"
+)
+
+type SysInitController struct {
+}
+
+//comment 鑾峰彇mqtt閰嶇疆
+//router /data/api-v/sysinit/getInitInfo
+func (sic *SysInitController) GetInitInfo(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
+ var conf models.SysInit
+ rows, _ := conf.Select()
+ inited := false
+ initUsername := ""
+ initReg := false
+ if rows > 0 {
+ inited = conf.InitPwd
+ initUsername = conf.InitUsername
+ }
+ if conf.UserType != "" && conf.Name != "" && conf.ProvinceId != "" && conf.CityId != "" && conf.Email != "" {
+ initReg = true
+ }
+ return &bhomeclient.Reply{Success: true, Msg: "鏌ヨ鎴愬姛", Data: map[string]interface{}{
+ "initPwd": inited,
+ "initRegInfo": initReg,
+ "username": initUsername,
+ }}
+}
+
+//鍒濆鍖栫郴缁熷瘑鐮�
+//router /data/api-v/sysinit/savePassword
+func (sic *SysInitController) SavePassword(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
+ type arg struct {
+ Username string `json:"username"`
+ Password string `json:"password"`
+ }
+ var reqBody arg
+ c.BindJSON(&reqBody)
+ if reqBody.Username == "" || reqBody.Password == "" || reqBody.Username == "basic" {
+ return &bhomeclient.Reply{Msg: "鐢ㄦ埛鍚嶆垨瀵嗙爜涓嶈兘涓虹┖"}
+ }
+ //鍏堜繚瀛樼敤鎴峰悕瀵嗙爜锛岀劧鍚庡皢sysinit涓殑initPwd缃负true
+ encryPwd, pe := util.Encrypt(reqBody.Password)
+ if pe != nil {
+ return &bhomeclient.Reply{Msg: pe.Error()}
+ }
+ tx := models.GetDB().Begin()
+ var err error
+ defer func() {
+ if tx != nil && err != nil {
+ tx.Rollback()
+ }
+ }()
+
+ var tmpUser models.SysUser
+ ru, _ := tmpUser.FindByName(reqBody.Username)
+ targetUID := ""
+ defHeadPic := ""
+ var dhp models.DefHeadPic
+ if headPics, err := dhp.FindAll(); err == nil && len(headPics) > 0 {
+ defHeadPic = headPics[0].Path
+ }
+
+ if ru > 0 {
+ targetUID = tmpUser.Id
+ if err = tx.Exec("update "+tmpUser.TableName()+" set password=?,headpic=?,backgroundpic=? where id=?", encryPwd, defHeadPic, models.DefaultBgPic, targetUID).Error; err != nil {
+ return &bhomeclient.Reply{Msg: err.Error()}
+ }
+ } else {
+ targetUID = uuid.NewV4().String()
+ if err = tx.Table(tmpUser.TableName()).Create(&models.SysUser{Id: targetUID, Username: reqBody.Username, Password: encryPwd, HeadPic: defHeadPic, BackgroundPic: models.DefaultBgPic}).Error; err != nil {
+ return &bhomeclient.Reply{Msg: err.Error()}
+ }
+ }
+ //缁欑敤鎴锋坊鍔犺彍鍗曟潈闄�
+ var sysR models.SysRole
+ _, err = sysR.FindByName("绠＄悊鍛�")
+ if err != nil {
+ return &bhomeclient.Reply{Msg: err.Error()}
+ }
+
+ userRole := models.SysUserRole{
+ Id: uuid.NewV4().String(),
+ UserId: targetUID,
+ RoleId: sysR.Id,
+ }
+ if err = tx.Table(userRole.TableName()).Create(&userRole).Error; err != nil {
+ return &bhomeclient.Reply{Msg: err.Error()}
+ }
+
+ var siModel models.SysInit
+ err = tx.Table(siModel.TableName()).First(&siModel).Error
+ if err != nil {
+ if err.Error() != models.RecordNotFound {
+ return &bhomeclient.Reply{Msg: err.Error()}
+ } else {
+ if err = tx.Table(siModel.TableName()).Create(models.SysInit{
+ InitPwd: true,
+ InitUsername: reqBody.Username,
+ InitTime: time.Now().Format("2006-01-02 15:04:05"),
+ NetName: "",
+ UserType: "",
+ PhoneNum: "",
+ Name: "",
+ ProvinceId: "",
+ CityId: "",
+ CountyId: "",
+ Email: "",
+ }).Error; err != nil {
+ return &bhomeclient.Reply{Msg: err.Error()}
+ }
+ }
+ } else {
+ err = tx.Exec("update "+siModel.TableName()+" set initPwd=?, initUsername=?", true, reqBody.Username).Error
+ if err != nil {
+ return &bhomeclient.Reply{Msg: err.Error()}
+ }
+ }
+ //鍒濆鍖栨椂缁欑鐞嗗憳鎵�鏈夌殑鑿滃崟鏉冮檺
+ var sysMenu models.SysMenu
+ allMenus := sysMenu.FindAll()
+ err = tx.Exec("delete from "+models.SysRoleMenu{}.TableName()+" where role_id=?", sysR.Id).Error
+ if err != nil {
+ return &bhomeclient.Reply{Msg: err.Error()}
+ }
+ for _, n := range allMenus {
+ tmpMenu := models.SysRoleMenu{
+ Id: uuid.NewV4().String(),
+ RoleId: sysR.Id,
+ MenuId: n.Id,
+ }
+ err = tx.Table(tmpMenu.TableName()).Create(&tmpMenu).Error
+ if err != nil {
+ return &bhomeclient.Reply{Msg: err.Error()}
+ }
+ }
+
+ err = tx.Exec("delete from "+models.SysUserMenu{}.TableName()+" where user_id=?", targetUID).Error
+ if err != nil {
+ return &bhomeclient.Reply{Msg: err.Error()}
+ }
+
+ tx.Commit()
+ return &bhomeclient.Reply{Success: true, Msg: "淇濆瓨鎴愬姛"}
+}
+
+//comment 鑾峰彇缃戝崱涓嬫媺鑿滃崟
+//router /data/api-v/sysinit/networkList
+func (sic *SysInitController) NetworkList(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
+ cards, e := sys.GetNetWorkCards()
+ if e != nil {
+ return &bhomeclient.Reply{Msg: e.Error()}
+ }
+
+ return &bhomeclient.Reply{Success: true, Data: cards}
+}
+
+//comment 绯荤粺绗竴娆″惎鍔ㄦ椂鍒濆鍖栫綉缁�
+// router /data/api-v/sysinit/initNetwork
+func (sic *SysInitController) InitNetwork(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
+ type arg struct {
+ NetName string `json:"netName"` //缃戝崱
+ Ip string `json:"ip"` //ip
+ SubMask string `json:"subMask"` //瀛愮綉鎺╃爜
+ Gateway string `json:"gateway"` //缃戝叧
+ Dns string `json:"dns"` //dns
+ }
+ var reqBody arg
+ c.BindJSON(&reqBody)
+ if reqBody.NetName == "" || reqBody.Ip == "" || reqBody.SubMask == "" || reqBody.Gateway == "" || reqBody.Dns == "" {
+ return &bhomeclient.Reply{Msg: "鍙傛暟鏈夎锛岃妫�鏌�"}
+ }
+ isOk, msg := sys.SetNetworkConfig(
+ reqBody.Ip,
+ reqBody.SubMask,
+ reqBody.Gateway,
+ reqBody.Dns,
+ reqBody.NetName)
+ logger.Debug("isOk:", isOk, "msg:", msg)
+ if !isOk {
+ return &bhomeclient.Reply{Msg: msg}
+ }
+ return &bhomeclient.Reply{Success: true, Msg: "鍒濆鍖栨垚鍔�"}
+}
+
+type RegInfo struct {
+ UserType string `json:"userType"` //personal:涓汉 company:鍏徃
+ Name string `json:"name"` //濮撳悕
+ ProvinceId string `json:"provinceId"` //鐪佷唤id
+ CityId string `json:"cityId"` //鍩庡競id
+ Addr string `json:"addr"` //鍦板潃
+ Email string `json:"email"` //閭
+}
+
+//comment 淇濆瓨娉ㄥ唽淇℃伅
+//router /data/api-v/sysinit/saveRegInfo
+func (sic *SysInitController) SaveRegInfo(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
+ var reqBody RegInfo
+ c.BindJSON(&reqBody)
+ if reqBody.UserType == "" || reqBody.Name == "" || reqBody.ProvinceId == "" || reqBody.CityId == "" || reqBody.Email == "" || reqBody.Addr == "" {
+ return &bhomeclient.Reply{Msg: "鍙傛暟鏈夎"}
+ }
+ var siModel models.SysInit
+ i, _ := siModel.Select()
+ if i == 0 {
+ return &bhomeclient.Reply{Msg: "璇峰厛閰嶇疆鐢ㄦ埛鍚嶅拰瀵嗙爜淇℃伅"}
+ }
+ siModel.UserType = reqBody.UserType
+ siModel.Name = reqBody.Name
+ siModel.ProvinceId = reqBody.ProvinceId
+ siModel.CityId = reqBody.CityId
+ siModel.Email = reqBody.Email
+ if siModel.Update() {
+ return &bhomeclient.Reply{Success: true, Msg: "淇濆瓨鎴愬姛"}
+ }
+ return &bhomeclient.Reply{Msg: "淇濆瓨澶辫触"}
+}
+
+//comment 鑾峰彇娉ㄥ唽淇℃伅
+//router /data/api-v/sysinit/getRegInfo
+func (sic *SysInitController) GetRegInfo(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
+ var siModel models.SysInit
+ i, _ := siModel.Select()
+ if i > 0 {
+ return &bhomeclient.Reply{Success: true, Data: map[string]string{
+ "userType": siModel.UserType,
+ "name": siModel.Name,
+ "provinceId": siModel.ProvinceId,
+ "cityId": siModel.CityId,
+ "countyId": siModel.CountyId,
+ "email": siModel.Email,
+ }}
+ }
+ return &bhomeclient.Reply{Msg: "鑾峰彇澶辫触"}
+}
--
Gitblit v1.8.0