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

bootstrap/bootstrap.go

@@ -15,7 +15,7 @@ func SystemInit() {
 	utils.LogInit()
 
 	// 第三方平台
-	utils.ComponentInit()
+	models.ComponentInit()
 
 	// 微信系统
 	models.InitWechat()

conf/wechat.conf

@@ -1,3 +0,0 @@
-[wechat]
-appid = wx9fd33312e78e8d02
-aeskey = 41b2994de43d4e3b9dc0f54ee8c5c1bb0050496367e

controllers/component.go

@@ -43,12 +43,17 @@ func (c *WechatController) ComponentPush() {
 	r := c.Ctx.Request
 	defer r.Body.Close()
 	con, _ := ioutil.ReadAll(r.Body)
-
-	EncodingAESKey := "key"
+	conf, err := c.wechatServ.GetComponentInfo()
+	if err != nil || conf == nil || conf.Appid == "" {
+		utils.LogError("读取微信配置文件失败")
+		c.ResponseRaw([]byte(""))
+	}
+	EncodingAESKey := conf.Aeskey
 
 	AESKey, err := base64.StdEncoding.DecodeString(EncodingAESKey + "=")
 	if err != nil {
 		utils.LogError("DecodeString失败：", err)
+		c.ResponseRaw([]byte(""))
 	}
 	xp := &core.XMLParse{}
 	// 解析xml
@@ -68,9 +73,15 @@ func (c *WechatController) ComponentPush() {
 		utils.LogError("msgxml解析失败：", err)
 		c.ResponseRaw([]byte(""))
 	}
+	utils.LogError("接收微信推送消息：", msg)
 	switch msg["InfoType"] {
 	case INFOTYPE_TICKET:
 		// 更新ticket
+		conf.Ticket = msg["ComponentVerifyTicket"]
+		err := c.wechatServ.UpdateComponentTicket(conf)
+		if err != nil {
+			utils.LogError("修改ticket失败：", err)
+		}
 		utils.RefreshComponentTicket(msg["ComponentVerifyTicket"])
 		break
 	case INFOTYPE_AUTHORIZED:
@@ -177,6 +188,7 @@ func (c *WechatController) getReplayMessage(replay *model.TaAutoReply, openid st
 
 // GetPreAuthCode 获取预授权码
 func (c *WechatController) GetPreAuthCode() {
+	utils.LogError(utils.Component.GetToken())
 	code, err := utils.Component.GetPreAuthCode()
 	if err != nil {
 		utils.LogError("获取预授权码错误: " + err.Error())

models/wechat.go

@@ -5,6 +5,30 @@ import (
 	"wechat-conf/utils"
 )
 
+// ComponentInit 初始化第三方
+func ComponentInit() {
+	var conf = model.SysComponentConf{}
+
+	_, err := DBEngine.Get(&conf)
+	if err != nil {
+		utils.LogError("初始化第三方失败：", err)
+		return
+	}
+	utils.LogError("获取第三方信息：", conf)
+	if conf.Appid == "" {
+		utils.LogError("初始化第三方数据失败，数据为空")
+		return
+	}
+	var cert = map[string]string{
+		"appid":                 conf.Appid,
+		"aeskey":                conf.Aeskey,
+		"secret":                conf.Secret,
+		"componentVerifyTicket": conf.Ticket,
+	}
+
+	utils.ComponentInit(cert)
+}
+
 // InitWechat 初始化微信
 func InitWechat() {
 	var wxconfs []model.SysWechatConf

models/wechat/wechat.go

@@ -75,3 +75,18 @@ func (m *WechatDAO) SaveWechatConf(conf model.SysWechatConf) error {
 	}
 	return nil
 }
+
+// GetComponentInfo 获取第三方conf
+func (m *WechatDAO) GetComponentInfo() (*model.SysComponentConf, error) {
+	var conf = model.SysComponentConf{}
+	_, err := m.db.Get(&conf)
+	return &conf, err
+}
+
+// UpdateComponentTicket 更新第三方ticket
+func (m *WechatDAO) UpdateComponentTicket(conf *model.SysComponentConf) error {
+	_, err := m.db.Cols([]string{
+		"ticket",
+	}...).Where("appid = ?", conf.Appid).Update(conf)
+	return err
+}

routers/router.go

@@ -67,6 +67,7 @@ func RouteInit() {
 		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.AddNamespace(ns)

service/wechat/wechat.go

@@ -31,3 +31,18 @@ func (s *WechatServ) SaveWechatConf(conf model.SysWechatConf) error {
 func (s *WechatServ) UpdateToken(token map[string]string) {
 	models.UpdateToken(token)
 }
+
+// GetComponentInfo 获取第三方信息
+func (s *WechatServ) GetComponentInfo() (*model.SysComponentConf, error) {
+	conf, err := s.dao.GetComponentInfo()
+	if err != nil {
+		return nil, err
+	}
+	return conf, nil
+}
+
+// UpdateComponentTicket 更新微信ticket
+func (s *WechatServ) UpdateComponentTicket(conf *model.SysComponentConf) error {
+	err := s.dao.UpdateComponentTicket(conf)
+	return err
+}

utils/wechat.go

@@ -1,8 +1,6 @@
 package utils
 
 import (
-	"github.com/astaxie/beego/config"
-	"github.com/astaxie/beego/logs"
 	"github.com/kinisky564477/wechat/component"
 )
 
@@ -10,19 +8,9 @@ import (
 var Component *component.ComponentClient
 
 // ComponentInit 第三方初始化
-func ComponentInit() {
-	// 初始化第三方
-
-	// 读取配置文件
-	conf, err := config.NewConfig("ini", GetAppRoot()+"/conf/wechat.conf")
-	if err != nil {
-		logs.Error("读取微信配置文件失败")
-	}
-	var cert = map[string]string{
-		"component_appid": conf.String("wechat::appid"),
-		"aeskey":          conf.String("wechat::aeskey"),
-	}
+func ComponentInit(cert map[string]string) {
 	Component = component.NewComponentClient(cert)
+	LogError(Component)
 }
 
 // RefreshComponentTicket ticket