yaotian 8 лет назад
Родитель
Сommit
ac04e3138d
5 измененных файлов с 21 добавлено и 10 удалено
  1. 3 1
      mp/bridge/msg_handler.go
  2. 7 6
      mp/jssdk/jssdk.go
  3. 4 2
      util/http.go
  4. 6 0
      wechat.go
  5. 1 1
      wxcontext/render.go

+ 3 - 1
mp/bridge/msg_handler.go

@@ -64,10 +64,12 @@ func (srv *MsgHandler) Handle() error {
 			return err
 		}
 		//debug
-		//fmt.Println("request msg = ", string(srv.requestRawXMLMsg))
+		// fmt.Println("request msg = ", string(srv.requestRawXMLMsg))
 		err = srv.buildResponse(replyMsg)
 		if err == nil {
 			srv.Send()
+		} else {
+			return err
 		}
 	}
 	return nil

+ 7 - 6
mp/jssdk/jssdk.go

@@ -25,12 +25,13 @@ type Config struct {
 }
 
 //JsString wx.config中的配置
-func (c *Config) JsString() (str string) {
-	return fmt.Sprintf(`
-		appId: "%s", 
-		timestamp: '%d', 
-		nonceStr: '%s', 
-		signature: '%s',`, c.AppID, c.Timestamp, c.NonceStr, c.Signature)
+func (c *Config) ToMap() (cfg map[string]interface{}) {
+	cfg = make(map[string]interface{})
+	cfg["appId"] = c.AppID
+	cfg["timestamp"] = c.Timestamp
+	cfg["nonceStr"] = c.NonceStr
+	cfg["signature"] = c.Signature
+	return
 }
 
 // resTicket 请求jsapi_tikcet返回结果

+ 4 - 2
util/http.go

@@ -128,7 +128,8 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
 func NewTLSHttpClientFromContent(certContent, keyContent string) (httpClient *http.Client, err error) {
 	cert, err := tls.X509KeyPair([]byte(certContent), []byte(keyContent))
 	if err != nil {
-		return
+		fmt.Print("can not init cert...")
+		return nil, err
 	}
 	tlsConfig := &tls.Config{
 		Certificates: []tls.Certificate{cert},
@@ -153,7 +154,8 @@ func NewTLSHttpClientFromContent(certContent, keyContent string) (httpClient *ht
 func NewTLSHttpClient(certFile, keyFile string) (httpClient *http.Client, err error) {
 	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
 	if err != nil {
-		return
+		fmt.Print("can not init cert...")
+		return nil, err
 	}
 	tlsConfig := &tls.Config{
 		Certificates: []tls.Certificate{cert},

+ 6 - 0
wechat.go

@@ -3,6 +3,7 @@ package gowechat
 
 import (
 	"fmt"
+	"net/http"
 	"sync"
 
 	"github.com/astaxie/beego/cache"
@@ -41,14 +42,19 @@ func initContext(cfg *wxcontext.Config, context *wxcontext.Context) {
 	if cfg.SslCertFilePath != "" && cfg.SslKeyFilePath != "" {
 		if client, err := util.NewTLSHttpClient(cfg.SslCertFilePath, cfg.SslKeyFilePath); err == nil {
 			context.SHTTPClient = client
+		} else {
+			fmt.Print(err)
 		}
 	}
 
 	if cfg.SslCertContent != "" && cfg.SslKeyContent != "" {
 		if client, err := util.NewTLSHttpClientFromContent(cfg.SslCertContent, cfg.SslKeyContent); err == nil {
 			context.SHTTPClient = client
+		} else {
+			fmt.Print(err)
 		}
 	}
+	context.HTTPClient = http.DefaultClient
 }
 
 //MchMgr 商户平台

+ 1 - 1
wxcontext/render.go

@@ -11,7 +11,7 @@ var plainContentType = []string{"text/plain; charset=utf-8"}
 //Render render from bytes
 func (ctx *Context) Render(bytes []byte) {
 	//debug
-	//fmt.Println("response msg = ", string(bytes))
+	// fmt.Println("response msg = ", string(bytes))
 	ctx.Writer.WriteHeader(200)
 	_, err := ctx.Writer.Write(bytes)
 	if err != nil {