修复缺陷 && 优化命名

Author: royalrick

decrypt.go

@@ -110,7 +110,7 @@ type UserInfo struct {
 // iv 加密算法的初始向量
 func (cli *Client) DecryptUserInfo(sessionKey, rawData, encryptedData, signature, iv string) (*UserInfo, error) {
 
-	if encrypt.NewSigner(false, rawData, sessionKey).CompareWith(signature) {
+	if !encrypt.NewSignable(false, rawData, sessionKey).IsEqual(signature) {
 		return nil, errors.New("failed to validate signature")
 	}
 

encrypt/sign.go

@@ -7,27 +7,27 @@ import (
 	"strings"
 )
 
-type Signer struct {
+type Signable struct {
 	// 是否需要字典排序
 	sort bool
 	// 需要签名的内容
 	parts []string
 }
 
-func NewSigner(sort bool, parts ...string) *Signer {
-	return &Signer{
+func NewSignable(sort bool, parts ...string) *Signable {
+	return &Signable{
 		sort:  sort,
 		parts: parts,
 	}
 }
 
 // 对比签名
-func (sign *Signer) CompareWith(signature string) bool {
+func (sign *Signable) IsEqual(signature string) bool {
 	return signature == sign.Sign()
 }
 
 // 生成签名
-func (sign *Signer) Sign() string {
+func (sign *Signable) Sign() string {
 
 	if sign.sort {
 		sort.Strings(sign.parts)

server/server.go

@@ -272,7 +272,7 @@ func (srv *Server) handleRequest(w http.ResponseWriter, r *http.Request, isEncrp
 		nonce, signature, timestamp := query.Get("nonce"), query.Get("signature"), query.Get("timestamp")
 
 		// 检验消息是否来自微信服务器
-		if encrypt.NewSigner(true, srv.token, timestamp, nonce).CompareWith(signature) {
+		if !encrypt.NewSignable(true, srv.token, timestamp, nonce).IsEqual(signature) {
 			return nil, errors.New("failed to validate signature")
 		}
 
@@ -658,7 +658,7 @@ func (srv *Server) validateServer(req *http.Request) bool {
 	signature := query.Get("signature")
 	timestamp := query.Get("timestamp")
 
-	return encrypt.NewSigner(true, nonce, timestamp, srv.token).CompareWith(signature)
+	return encrypt.NewSignable(true, nonce, timestamp, srv.token).IsEqual(signature)
 }
 
 // 加密消息
@@ -679,7 +679,7 @@ func (srv *Server) encryptMsg(message string, timestamp int64) (*EncryptedMsgReq
 	timestr := strconv.FormatInt(timestamp, 10)
 
 	//生成安全签名
-	signature := encrypt.NewSigner(true, srv.token, timestr, nonce, cipher).Sign()
+	signature := encrypt.NewSignable(true, srv.token, timestr, nonce, cipher).Sign()
 	request := EncryptedMsgRequest{
 		Nonce:        nonce,
 		Encrypt:      cipher,