Merge branch 'master' of http://git.ycjcjy.com/default/wechat-conf

controllers/component.go

 			utils.LogError("获取微信信息失败")
 			c.ResponseRaw([]byte("success"))
 		}
+		beego.Error(info)
 		authorizerInfo := (info["authorizer_info"]).(map[string]interface{})
-
+		beego.Error(info["authorizer_info"])
 		// 插入数据库
 		mjson, _ := json.Marshal(msg)
+		HeadImg := ""
+		if authorizerInfo["head_img"] != nil {
+			HeadImg = authorizerInfo["head_img"].(string)
+		}
 		var conf = model.SysWechatConf{
 			Appid:             msg["AuthorizerAppid"],
 			AuthorizationCode: msg["AuthorizationCode"],
 			AuthorizationInfo: string(mjson),
-			WxNikeName:        authorizerInfo["nikd_name"].(string),
-			HeadImg:           authorizerInfo["head_img"].(string),
+			WxNikeName:        authorizerInfo["nick_name"].(string),
+			HeadImg:           HeadImg,
 			UserName:          authorizerInfo["user_name"].(string),
 			PrincipalName:     authorizerInfo["principal_name"].(string),
 			QrcodeUrl:         authorizerInfo["qrcode_url"].(string),
 // 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.ResponseJSON(info)
 }
+
+// GetWechatMenuByAppID 获取菜单
+func (c *WechatController) GetWechatMenuByAppID() {
+	appid := c.GetString(":appid")
+	wxclient, err := utils.Component.GetWxClient(appid)
+	if err != nil {
+		utils.LogError("获取微信信息失败: " + err.Error())
+		c.ResponseError(err)
+	}
+	menus, err := wxclient.GetMenu()
+	if err != nil {
+		utils.LogError("获取微信详情失败: " + err.Error())
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(menus)
+}
+
+// GetWechatByCode 根据code获取微信信息
+func (c *WechatController) GetWechatByCode() {
+	code := c.GetString(":code")
+	beego.Error(code)
+	conf, err := c.wechatServ.GetWechatByCode(code)
+	if err != nil {
+		utils.LogError("获取微信详情失败: " + err.Error())
+		c.ResponseError(err)
+	}
+	beego.Error(conf)
+	if conf == nil || conf.ConfId == "" || conf.Status == models.STATUS_NORMAL {
+		c.ResponseJSON("")
+	}
+
+	c.ResponseJSON(map[string]string{
+		"ConfId":   conf.ConfId,
+		"NickName": conf.WxNikeName,
+		"HeadImg":  conf.HeadImg,
+	})
+}

controllers/sysorg/sysorg.go

 // OrgBindWechat 项目绑定微信
 func (c *SysorgController) OrgBindWechat() {
 	orgid := c.GetString(":orgid")
-	code := c.GetString(":code")
+	confid := c.GetString(":confid")
 
-	err := c.dao.BindWechat(orgid, code)
+	err := c.dao.BindWechat(orgid, confid)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/wechat/wechat.go

 	_, err := m.db.Where("authorization_code=?", code).And("status>?", models.STATUS_DEL).Get(&conf)
 	return &conf, err
 }
+
+// GetWechatConfByConfId 根据confid获取微信信息
+func (m *WechatDAO) GetWechatConfByConfId(confid string) (*model.SysWechatConf, error) {
+	var conf model.SysWechatConf
+	_, err := m.db.Where("conf_id=?", confid).And("status>?", models.STATUS_DEL).Get(&conf)
+	return &conf, err
+}

routers/router.go

 			beego.NSRouter("/sysorg", &sysorg.SysorgController{}, "put:AuthOrg"),
 			beego.NSRouter("/sysorg/:orgId", &sysorg.SysorgController{}, "delete:DeleteOrg"),
 
-			beego.NSRouter("/sysorg/:orgid/:code", &sysorg.SysorgController{}, "put:OrgBindWechat"),
+			beego.NSRouter("/sysorg/:orgid/:confid", &sysorg.SysorgController{}, "put:OrgBindWechat"),
 
 			// 文件
 			beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
 			// 微信菜单
 			beego.NSRouter("/wechatmenu", &wechatmenu.MenuController{}, "get:GetMenuList"),
 			beego.NSRouter("/wechatmenu", &wechatmenu.MenuController{}, "put:RefreshMenu"),
+
+			// 微信
+			beego.NSRouter("/authcode", &controllers.WechatController{}, "get:GetPreAuthCode"),
+			beego.NSRouter("/wechat/conf/:code", &controllers.WechatController{}, "get:GetWechatByCode"),
 		),
 
 		beego.NSRouter("/ticket", &controllers.WechatController{}, "post:ComponentPush"),
 		beego.NSRouter("/ticket", &controllers.WechatController{}, "get:ComponentPush"),
 		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.NSRouter("/wechatinfo/:appid", &controllers.WechatController{}, "get:GetWechatInfoByAppID"),
+		beego.NSRouter("/menu/:appid", &controllers.WechatController{}, "get:GetWechatMenuByAppID"),
 	)
 
 	beego.AddNamespace(ns)

service/sysorg/sysorg.go

 
 import (
 	"errors"
+	"time"
+	"wechat-conf/models"
 	"wechat-conf/models/model"
 	"wechat-conf/models/sysorg"
 	"wechat-conf/models/sysuser"
 }
 
 // BindWechat 绑定微信
-func (s *SysorgServ) BindWechat(orgid, code string) error {
-	wechatConf, err := s.wechatdao.GetWxByCode(code)
+func (s *SysorgServ) BindWechat(orgid, confid string) error {
+	wechatConf, err := s.wechatdao.GetWechatConfByConfId(confid)
 	if err != nil {
 		return err
 	}
 		WechatName: wechatConf.WxNikeName,
 	}
 	err = s.dao.AuthOrg(orginfo)
+
+	if err != nil {
+		return err
+	}
+	// 更新微信信息
+	var conf = model.SysWechatConf{
+		BindDate: time.Now().Local(),
+		Status:   models.STATUS_NORMAL,
+		ConfId:   wechatConf.ConfId,
+	}
+
+	err = s.wechatdao.UpdateWechatConf(conf, []string{
+		"bind_date",
+		"status",
+	})
 	return err
 }

service/wechat/wechat.go

 	err := s.dao.UpdateComponentTicket(conf)
 	return err
 }
+
+// GetWechatByCode 根据code获取微信信息
+func (s *WechatServ) GetWechatByCode(code string) (*model.SysWechatConf, error) {
+	conf, err := s.dao.GetWxByCode(code)
+	return conf, err
+}
+
+// GetWechatConfByConfId 根据confid获取微信信息
+func (s *WechatServ) GetWechatConfByConfId(confid string) (*model.SysWechatConf, error) {
+	conf, err := s.dao.GetWechatConfByConfId(confid)
+	return conf, err
+}

utils/aes.go

 	blockSize := block.BlockSize()
 	blockMode := cipher.NewCBCDecrypter(block, key[:blockSize])
 	origData := make([]byte, len(crypted))
-	beego.Error(origData)
-	beego.Error(crypted)
 	blockMode.CryptBlocks(origData, crypted)
 	origData = PKCS7UnPadding(origData)
 	return origData, nil