1115PM

controllers/component.go

@@ -109,15 +109,29 @@ func (c *WechatController) ComponentPush() {
 		}
 		beego.Error(wxclient)
 		utils.AppendWxClient(wxclient)
+
+		// 获取微信信息
+		info, err := wxclient.GetWechatInfo()
+		if err != nil {
+			utils.LogError("获取微信信息失败")
+			c.ResponseRaw([]byte("success"))
+		}
+		authorizerInfo := (info["authorizer_info"]).(map[string]interface{})
+
 		// 插入数据库
 		mjson, _ := json.Marshal(msg)
 		var conf = model.SysWechatConf{
 			Appid:             msg["AuthorizerAppid"],
 			AuthorizationCode: msg["AuthorizationCode"],
 			AuthorizationInfo: string(mjson),
+			WxNikeName:        authorizerInfo["nikd_name"].(string),
+			HeadImg:           authorizerInfo["head_img"].(string),
+			UserName:          authorizerInfo["user_name"].(string),
+			PrincipalName:     authorizerInfo["principal_name"].(string),
+			QrcodeUrl:         authorizerInfo["qrcode_url"].(string),
 		}
 
-		err := c.wechatServ.SaveWechatConf(conf)
+		err = c.wechatServ.SaveWechatConf(conf)
 		if err != nil {
 			utils.LogError("保存微信授权信息失败：", err)
 			c.ResponseRaw([]byte("success"))
@@ -217,3 +231,20 @@ func (c *WechatController) GetPreAuthCode() {
 		"code":  code,
 	})
 }
+
+// GetWechatMenuByAppID 根据appid获取微信详情
+func (c *WechatController) GetWechatInfoByAppID() {
+	appid := c.GetString(":appid")
+	beego.Error(utils.Component)
+	wxclient, err := utils.Component.GetWxClient(appid)
+	if err != nil {
+		utils.LogError("获取微信信息失败: " + err.Error())
+		c.ResponseError(err)
+	}
+	info, err := wxclient.GetWechatInfo()
+	if err != nil {
+		utils.LogError("获取微信详情失败: " + err.Error())
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(info)
+}

controllers/sysorg/sysorg.go

@@ -61,3 +61,11 @@ func (c *SysorgController) DeleteOrg() {
 	c.ResponseJSON("删除成功")
 
 }
+
+// OrgBindWechat 项目绑定微信
+func (c *SysorgController) OrgBindWechat() {
+	orgid := c.GetString(":orgid")
+	code := c.GetString(":code")
+
+	c.dao.BindWechat(orgid, code)
+}

models/model/sys_wechat_conf.go

@@ -9,6 +9,11 @@ type SysWechatConf struct {
 	Appid             string    `xorm:"VARCHAR(50)"`
 	AuthorizationCode string    `xorm:"VARCHAR(100)"`
 	RefreshToken      string    `xorm:"VARCHAR(100)"`
+	WxNikeName        string    `xorm:"VARCHAR(100)"`
+	HeadImg           string    `xorm:"TEXT"`
+	UserName          string    `xorm:"VARCHAR(100)"`
+	PrincipalName     string    `xorm:"VARCHAR(200)"`
+	QrcodeUrl         string    `xorm:"TEXT"`
 	Token             string    `xorm:"VARCHAR(100)"`
 	Remark            string    `xorm:"TEXT"`
 	Status            int       `xorm:"SMALLINT(6)"`

models/wechat.go

@@ -30,7 +30,6 @@ func ComponentInit() {
 		d = string(subd)
 	}
 
-	beego.Error("过期时间：", d)
 	var cert = map[string]string{
 		"appid":                 conf.Appid,
 		"aeskey":                conf.Aeskey,
@@ -56,9 +55,7 @@ func UpdateComponentToken(token map[string]interface{}) {
 
 	expire := token["expire_in"].(int64)
 	if expire > 0 {
-		beego.Error(time.Now())
 		expriesTime := time.Now().Local().Add(time.Duration(expire) * time.Second)
-		beego.Error(expriesTime)
 		conf.ExpiresDate = expriesTime
 		sql := `update sys_component_conf set token=?,expires_date=?`
 		_, err := DBEngine.Exec(sql, conf.Token, conf.ExpiresDate)
@@ -77,11 +74,12 @@ func UpdateComponentToken(token map[string]interface{}) {
 // InitWechat 初始化微信
 func InitWechat() {
 	var wxconfs []model.SysWechatConf
-	err := DBEngine.Where("status=1").Find(&wxconfs)
+	err := DBEngine.Where("status>?", STATUS_DEL).Find(&wxconfs)
 	if err != nil {
 		utils.LogError("初始化微信失败：", err)
 		return
 	}
+
 	for _, conf := range wxconfs {
 		var cert = map[string]string{
 			"authorizer_access_token":  conf.Token,
@@ -90,6 +88,7 @@ func InitWechat() {
 			"appid":                    conf.Appid,
 		}
 		client := utils.WechatInit(cert, UpdateToken)
+		beego.Error(client)
 		utils.AppendWxClient(client)
 	}
 }

models/wechat/wechat.go

@@ -93,3 +93,10 @@ func (m *WechatDAO) UpdateComponentTicket(conf *model.SysComponentConf) error {
 	}...).Where("appid = ?", conf.Appid).Update(conf)
 	return err
 }
+
+// GetWxByCode 根据code获取微信信息
+func (m *WechatDAO) GetWxByCode(code string) (*model.SysWechatConf, error) {
+	var conf model.SysWechatConf
+	_, err := m.db.Where("authorization_code=?", code).And("status>?", models.STATUS_DEL).Get(&conf)
+	return &conf, err
+}

routers/router.go

@@ -72,6 +72,8 @@ func RouteInit() {
 		beego.NSRouter("/:appid/callback", &controllers.WechatController{}, "get:WxReceive"),
 		beego.NSRouter("/:appid/callback", &controllers.WechatController{}, "post:WxReceive"),
 		beego.NSRouter("/authcode", &controllers.WechatController{}, "get:GetPreAuthCode"),
+		beego.NSRouter("/wechatinfo/:appid", &controllers.WechatController{}, "get:GetWechatInfoByAppID"),
+		// beego.NSRouter("/menu/:appid", &controllers.WechatController{}, "get:GetWechatMenuByAppID"),
 	)
 
 	beego.AddNamespace(ns)

service/sysorg/sysorg.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"wechat-conf/models/model"
 	"wechat-conf/models/sysorg"
+	"wechat-conf/models/wechat"
 	"wechat-conf/models/wechatmenu"
 	"wechat-conf/service"
 	"wechat-conf/utils"
@@ -11,17 +12,19 @@ import (
 
 // SysorgServ 用户
 type SysorgServ struct {
-	ctx  *utils.Context
-	dao  *sysorg.SysorgDAO
-	mdao *wechatmenu.WechatMenuDAO
+	ctx       *utils.Context
+	dao       *sysorg.SysorgDAO
+	mdao      *wechatmenu.WechatMenuDAO
+	wechatdao *wechat.WechatDAO
 }
 
 // NewSysorgServ 初始化
 func NewSysorgServ(ctx *utils.Context) *SysorgServ {
 	return &SysorgServ{
-		ctx:  ctx,
-		dao:  sysorg.NewSysorgDAO(ctx),
-		mdao: wechatmenu.NewWechatMenuDAO(ctx),
+		ctx:       ctx,
+		dao:       sysorg.NewSysorgDAO(ctx),
+		mdao:      wechatmenu.NewWechatMenuDAO(ctx),
+		wechatdao: wechat.NewWechatDAO(ctx),
 	}
 }
 func (s *SysorgServ) GetOrgList(page, pageSize int) (map[string]interface{}, error) {
@@ -78,3 +81,16 @@ func (s *SysorgServ) DeleteOrg(orgId string) error {
 	}
 	return nil
 }
+
+// BindWechat 绑定微信
+func (s *SysorgServ) BindWechat(orgid, code string) error {
+	wechatConf, err := s.wechatdao.GetWxByCode(code)
+	if err != nil {
+		return err
+	}
+	if wechatConf == nil && wechatConf.Appid == "" {
+		return errors.New("没有获取到微信信息")
+	}
+
+	return nil
+}