1116

controllers/component.go

@@ -147,6 +147,9 @@ func (c *WechatController) ComponentPush() {
 		break
 	case INFOTYPE_UNAUTHORIZED:
 		// 取消授权
+		// 删除wechatConf信息，同时将org解绑
+		appid := msg["AuthorizerAppid"]
+		c.wechatServ.UnAuthorized(appid)
 		break
 	}
 	c.ResponseRaw([]byte("success"))

controllers/wechatmenu/wechatmenu.go

@@ -7,6 +7,8 @@ import (
 	"wechat-conf/service/sysuser"
 	"wechat-conf/service/wechatmenu"
 	"wechat-conf/utils"
+
+	"github.com/astaxie/beego"
 )
 
 // MenuController 信息
@@ -30,6 +32,7 @@ func (c *MenuController) GetMenuList() {
 	if err != nil {
 		c.ResponseError(err)
 	}
+	beego.Error(appId)
 	client, err := utils.Component.GetWxClient(appId)
 	if err != nil {
 		c.ResponseError(err)

models/sysorg/sysorg.go

@@ -65,3 +65,17 @@ func (m *SysorgDAO) DeleteOrg(orgId string) error {
 	_, err := m.db.Cols(cols...).Where("org_id = ?", org.OrgId).Update(org)
 	return err
 }
+
+// UnAutoOrg 解绑
+func (m *SysorgDAO) UnAutoOrg(confid string) error {
+	var org = model.SysOrg{
+		WechatId:   "",
+		AuthStatus: models.AUTH_STATUS_NO,
+	}
+	var cols = []string{
+		"wechat_id",
+		"auth_status",
+	}
+	_, err := m.db.Cols(cols...).Where("wechat_id = ?", confid).Update(org)
+	return err
+}

service/user/user.go

@@ -7,8 +7,6 @@ import (
 	"wechat-conf/models/user"
 	"wechat-conf/utils"
 
-	"github.com/astaxie/beego"
-
 	"github.com/yl10/kit/encrypt"
 )
 
@@ -62,7 +60,6 @@ func (s *UserServ) UpdatePassword(userID, newPass string) error {
 
 // ValidatePassword 验证密码是否正确
 func (s *UserServ) ValidatePassword(user *model.SysUser, password string) bool {
-	beego.Error(encrypt.Md5(password, user.UserId))
 	return user.Pwd == encrypt.Md5(password, user.UserId)
 }
 

service/wechat/wechat.go

@@ -3,21 +3,24 @@ package wechat
 import (
 	"wechat-conf/models"
 	"wechat-conf/models/model"
+	"wechat-conf/models/sysorg"
 	"wechat-conf/models/wechat"
 	"wechat-conf/utils"
 )
 
 // WechatServ 用户
 type WechatServ struct {
-	ctx *utils.Context
-	dao *wechat.WechatDAO
+	ctx    *utils.Context
+	dao    *wechat.WechatDAO
+	orgdao *sysorg.SysorgDAO
 }
 
 // NewWechatServ 初始化
 func NewWechatServ(ctx *utils.Context) *WechatServ {
 	return &WechatServ{
-		ctx: ctx,
-		dao: wechat.NewWechatDAO(ctx),
+		ctx:    ctx,
+		dao:    wechat.NewWechatDAO(ctx),
+		orgdao: sysorg.NewSysorgDAO(ctx),
 	}
 }
 
@@ -58,3 +61,32 @@ func (s *WechatServ) GetWechatConfByConfId(confid string) (*model.SysWechatConf,
 	conf, err := s.dao.GetWechatConfByConfId(confid)
 	return conf, err
 }
+
+// UnAuthorized 取消授权
+func (s *WechatServ) UnAuthorized(appid string) error {
+	if appid == "" {
+		return nil
+	}
+	conf, err := s.dao.GetWechatConfByAppID(appid)
+	if err != nil {
+		utils.LogError("解绑获取微信信息失败：", err)
+		return err
+	}
+	if conf == nil || conf.ConfId == "" {
+		utils.LogError("解绑获取微信信息为空")
+		return nil
+	}
+	var wxConf = model.SysWechatConf{
+		ConfId: conf.ConfId,
+		Status: models.STATUS_DEL,
+	}
+	err = s.dao.UpdateWechatConf(wxConf, []string{
+		"status",
+	})
+	if err != nil {
+		return err
+	}
+	// 解绑org
+	err = s.orgdao.UnAutoOrg(conf.ConfId)
+	return err
+}