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

bootstrap/bootstrap.go

@@ -14,8 +14,11 @@ func SystemInit() {
 	// 系统日志
 	utils.LogInit()
 
+	// 第三方平台
+	utils.ComponentInit()
+
 	// 微信系统
-	utils.WechatInit()
+	models.InitWechat()
 
 	// 路由系统
 	routers.RouteInit()

conf/wechat.conf

@@ -0,0 +1,2 @@
+appid = test
+aeskey = aeskey

controllers/component.go

@@ -0,0 +1,73 @@
+package controllers
+
+import (
+	"encoding/base64"
+	"io/ioutil"
+	"wechat-conf/utils"
+
+	"github.com/zjxpcyc/wechat/core"
+)
+
+const (
+	INFOTYPE_TICKET           = "component_verify_ticket"
+	INFOTYPE_AUTHORIZED       = "authorized"
+	INFOTYPE_UNAUTHORIZED     = "unauthorized"
+	INFOTYPE_UPDATEAUTHORIZED = "updateauthorized"
+)
+
+// ComponentPush 第三方平台推送
+func (c *BaseController) ComponentPush() {
+	r := c.Ctx.Request
+	defer r.Body.Close()
+	con, _ := ioutil.ReadAll(r.Body)
+
+	// timestamp := c.GetString("timestamp")
+	// nonce := c.GetString("nonce")
+
+	// token := "testtoken"
+	EncodingAESKey := "key"
+	// appid := "appid"
+
+	AESKey, err := base64.StdEncoding.DecodeString(EncodingAESKey + "=")
+	if err != nil {
+		utils.LogError("DecodeString失败：", err)
+	}
+	xp := &core.XMLParse{}
+	// 解析xml
+	val, err := xp.Parse(string(con))
+	if err != nil {
+		utils.LogError("xml解析失败：", err)
+	}
+
+	msgbyte, err := utils.AesDecrypt([]byte(val["Encrypt"]), AESKey)
+	if err != nil {
+		utils.LogError("解密失败：", err)
+	}
+	msg, err := xp.Parse(string(msgbyte))
+	if err != nil {
+		utils.LogError("msgxml解析失败：", err)
+	}
+	switch msg["InfoType"] {
+	case INFOTYPE_TICKET:
+		// 更新ticket
+		utils.RefreshComponentTicket(msg["ComponentVerifyTicket"])
+		break
+	case INFOTYPE_AUTHORIZED:
+		// 授权成功
+		var cert = map[string]string{
+			"appid":              msg["AuthorizerAppid"],
+			"authorization_code": msg["AuthorizationCode"],
+		}
+
+		wxclient := utils.WechatInit(cert)
+		utils.AppendWxClient(wxclient)
+		break
+	case INFOTYPE_UPDATEAUTHORIZED:
+		// 授权更新
+		break
+	case INFOTYPE_UNAUTHORIZED:
+		// 取消授权
+		break
+	}
+
+}

models/model/sys_wechat_conf.go

@@ -1,14 +1,17 @@
 package model
 
+import "time"
+
 type SysWechatConf struct {
 	ConfId string `xorm:"not null pk VARCHAR(64)"`
 	Type   string `xorm:"comment('wechat 微信公众号
             mini 小程序') VARCHAR(20)"`
-	Appid  string `xorm:"VARCHAR(50)"`
-	Secret string `xorm:"VARCHAR(50)"`
-	Token  string `xorm:"VARCHAR(50)"`
-	Aeskey string `xorm:"VARCHAR(100)"`
-	Wxid   string `xorm:"VARCHAR(50)"`
-	Remark string `xorm:"TEXT"`
-	Status int    `xorm:"SMALLINT(6)"`
+	Appid             string    `xorm:"VARCHAR(50)"`
+	AuthorizationCode string    `xorm:"VARCHAR(100)"`
+	RefreshToken      string    `xorm:"VARCHAR(100)"`
+	Token             string    `xorm:"VARCHAR(100)"`
+	Remark            string    `xorm:"TEXT"`
+	Status            int       `xorm:"SMALLINT(6)"`
+	AuthorizationInfo string    `xorm:"TEXT"`
+	BindDate          time.Time `xorm:"DATETIME"`
 }

models/wechat.go

@@ -0,0 +1,26 @@
+package models
+
+import (
+	"wechat-conf/models/model"
+	"wechat-conf/utils"
+)
+
+// InitWechat 初始化微信
+func InitWechat() {
+	var wxconfs []model.SysWechatConf
+	err := DBEngine.Where("status=1").Find(&wxconfs)
+	if err != nil {
+		utils.LogError("初始化微信失败：", err)
+		return
+	}
+	for _, conf := range wxconfs {
+		var cert = map[string]string{
+			"authorizer_access_token":  conf.Token,
+			"authorizer_refresh_token": conf.RefreshToken,
+			"authorization_code":       conf.AuthorizationCode,
+			"appid":                    conf.Appid,
+		}
+		client := utils.WechatInit(cert)
+		utils.AppendWxClient(client)
+	}
+}

service/user/user.go

@@ -48,7 +48,7 @@ func (s *UserServ) ValidUserNameLogin(userName, pass string) (*model.SysUser, er
 	}
 
 	if !s.ValidatePassword(&user, pass) {
-		return nil, helper.LogError("用户密码不正确")
+		return nil, utils.LogError("用户密码不正确")
 	}
 
 	return &user, nil

utils/aes.go

@@ -0,0 +1,49 @@
+package utils
+
+import (
+	"bytes"
+	"crypto/aes"
+	"crypto/cipher"
+)
+
+// PKCS7Padding 填充序列的每个字节都填paddingSize
+func PKCS7Padding(ciphertext []byte, blockSize int) []byte {
+	padding := blockSize - len(ciphertext)%blockSize
+	padtext := bytes.Repeat([]byte{byte(padding)}, padding)
+	return append(ciphertext, padtext...)
+}
+
+// PKCS7UnPadding 取消填充序列的每个字节都填paddingSize
+func PKCS7UnPadding(origData []byte) []byte {
+	length := len(origData)
+	unpadding := int(origData[length-1])
+	return origData[:(length - unpadding)]
+}
+
+// AesEncrypt 加密
+func AesEncrypt(origData, key []byte) ([]byte, error) {
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+	blockSize := block.BlockSize()
+	origData = PKCS7Padding(origData, blockSize)
+	blockMode := cipher.NewCBCEncrypter(block, key[:blockSize])
+	crypted := make([]byte, len(origData))
+	blockMode.CryptBlocks(crypted, origData)
+	return crypted, nil
+}
+
+// AesDecrypt 解密
+func AesDecrypt(crypted, key []byte) ([]byte, error) {
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+	blockSize := block.BlockSize()
+	blockMode := cipher.NewCBCDecrypter(block, key[:blockSize])
+	origData := make([]byte, len(crypted))
+	blockMode.CryptBlocks(origData, crypted)
+	origData = PKCS7UnPadding(origData)
+	return origData, nil
+}

utils/wechat.go

@@ -1,116 +1,42 @@
 package utils
 
 import (
-	"github.com/zjxpcyc/wechat/mini"
-	"github.com/zjxpcyc/wechat/wx"
+	"github.com/astaxie/beego/config"
+	"github.com/kinisky564477/wechat/component"
 )
 
-var wxClients map[string]*wx.Client
-var miniClients map[string]*mini.Client
+// Component 微信开放平台
+var Component *component.ComponentClient
 
-type WechatUser struct {
-	OpenID     string  `json:"openid"`
-	NickName   string  `json:"nickname"`
-	Sex        float64 `json:"sex"`
-	Province   string  `json:"province"`
-	City       string  `json:"city"`
-	Country    string  `json:"country"`
-	HeadImgURL string  `json:"headimgurl"`
-	UnionID    string  `json:"unionid"`
+// ComponentInit 第三方初始化
+func ComponentInit() {
+	// 初始化第三方
+	var cert map[string]string
+	wechat, _ := config.NewConfig("ini", appRoot+"/conf/db.conf")
+	cert["component_appid"] = wechat.String("appid")
+	cert["aeskey"] = wechat.String("aeskey")
+	Component = component.NewComponentClient(cert)
 }
 
-// WxClientSingleton 初始化
-func WxClientSingleton(org string, cert map[string]string) {
-	if wxClients == nil {
-		wxClients = map[string]*wx.Client{
-			org: wx.NewClient(cert),
-		}
-	} else {
-		if _, ok := wxClients[org]; !ok {
-			wxClients[org] = wx.NewClient(cert)
-		}
-	}
+// RefreshComponentTicket ticket
+func RefreshComponentTicket(ticket string) {
+	Component.RefreshTicket(ticket)
 }
 
-// MiniClientSingleton 初始化
-func MiniClientSingleton(org string, cert map[string]string) {
-	if miniClients == nil {
-		miniClients = map[string]*mini.Client{
-			org: mini.NewClient(cert),
-		}
-	} else {
-		if _, ok := miniClients[org]; !ok {
-			miniClients[org] = mini.NewClient(cert)
-		}
-	}
-}
-
-// WxClientFor 微信客户端
-func WxClientFor(org string) *wx.Client {
-	return wxClients[org]
-}
-
-// MiniClientFor 小程序客户端
-func MiniClientFor(org string) *mini.Client {
-	return miniClients[org]
-}
+// WechatInit 微信初始化
+func WechatInit(cert map[string]string) *component.WxClient {
+	var wechatClient *component.WxClient
 
-// GetWxAppID 获取微信ID
-func GetWxAppID(org string) string {
-	return wxClients[org].GetAppID()
-}
+	wechatClient = component.NewWxClient(
+		cert,
+		Component.GetToken,
+		Component.GetCertificate,
+	)
 
-func WechatInit() {
-	logger := GetDefaultLogger()
-	wx.SetLogInst(logger)
-	mini.SetLogInst(logger)
+	return wechatClient
 }
 
-// MapToWechatUser 映射微信人员
-func MapToWechatUser(data map[string]interface{}) *WechatUser {
-	subscribe, has := data["subscribe"]
-	if has {
-		if subscribe == nil {
-			return nil
-		}
-
-		sub := subscribe.(float64)
-		if sub == 0 {
-			return nil
-		}
-	}
-
-	user := WechatUser{
-		OpenID: data["openid"].(string),
-	}
-
-	if data["sex"] != nil {
-		user.Sex = data["sex"].(float64)
-	}
-
-	if data["nickname"] != nil {
-		user.NickName = data["nickname"].(string)
-	}
-
-	if data["province"] != nil {
-		user.Province = data["province"].(string)
-	}
-
-	if data["city"] != nil {
-		user.City = data["city"].(string)
-	}
-
-	if data["country"] != nil {
-		user.Country = data["country"].(string)
-	}
-
-	if data["headimgurl"] != nil {
-		user.HeadImgURL = data["headimgurl"].(string)
-	}
-
-	if data["unionid"] != nil {
-		user.UnionID = data["unionid"].(string)
-	}
-
-	return &user
+// AppendWxClient 增加微信实例
+func AppendWxClient(wx *component.WxClient) {
+	Component.AppendWxClient(wx)
 }