Skip to content

Commit ac04e31

Browse files
committed
more fix
1 parent dd6628b commit ac04e31

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

mp/bridge/msg_handler.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,12 @@ func (srv *MsgHandler) Handle() error {
6464
return err
6565
}
6666
//debug
67-
//fmt.Println("request msg = ", string(srv.requestRawXMLMsg))
67+
// fmt.Println("request msg = ", string(srv.requestRawXMLMsg))
6868
err = srv.buildResponse(replyMsg)
6969
if err == nil {
7070
srv.Send()
71+
} else {
72+
return err
7173
}
7274
}
7375
return nil

mp/jssdk/jssdk.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ type Config struct {
2525
}
2626

2727
//JsString wx.config中的配置
28-
func (c *Config) JsString() (str string) {
29-
return fmt.Sprintf(`
30-
appId: "%s",
31-
timestamp: '%d',
32-
nonceStr: '%s',
33-
signature: '%s',`, c.AppID, c.Timestamp, c.NonceStr, c.Signature)
28+
func (c *Config) ToMap() (cfg map[string]interface{}) {
29+
cfg = make(map[string]interface{})
30+
cfg["appId"] = c.AppID
31+
cfg["timestamp"] = c.Timestamp
32+
cfg["nonceStr"] = c.NonceStr
33+
cfg["signature"] = c.Signature
34+
return
3435
}
3536

3637
// resTicket 请求jsapi_tikcet返回结果

util/http.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
128128
func NewTLSHttpClientFromContent(certContent, keyContent string) (httpClient *http.Client, err error) {
129129
cert, err := tls.X509KeyPair([]byte(certContent), []byte(keyContent))
130130
if err != nil {
131-
return
131+
fmt.Print("can not init cert...")
132+
return nil, err
132133
}
133134
tlsConfig := &tls.Config{
134135
Certificates: []tls.Certificate{cert},
@@ -153,7 +154,8 @@ func NewTLSHttpClientFromContent(certContent, keyContent string) (httpClient *ht
153154
func NewTLSHttpClient(certFile, keyFile string) (httpClient *http.Client, err error) {
154155
cert, err := tls.LoadX509KeyPair(certFile, keyFile)
155156
if err != nil {
156-
return
157+
fmt.Print("can not init cert...")
158+
return nil, err
157159
}
158160
tlsConfig := &tls.Config{
159161
Certificates: []tls.Certificate{cert},

wechat.go

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package gowechat
33

44
import (
55
"fmt"
6+
"net/http"
67
"sync"
78

89
"github.com/astaxie/beego/cache"
@@ -41,14 +42,19 @@ func initContext(cfg *wxcontext.Config, context *wxcontext.Context) {
4142
if cfg.SslCertFilePath != "" && cfg.SslKeyFilePath != "" {
4243
if client, err := util.NewTLSHttpClient(cfg.SslCertFilePath, cfg.SslKeyFilePath); err == nil {
4344
context.SHTTPClient = client
45+
} else {
46+
fmt.Print(err)
4447
}
4548
}
4649

4750
if cfg.SslCertContent != "" && cfg.SslKeyContent != "" {
4851
if client, err := util.NewTLSHttpClientFromContent(cfg.SslCertContent, cfg.SslKeyContent); err == nil {
4952
context.SHTTPClient = client
53+
} else {
54+
fmt.Print(err)
5055
}
5156
}
57+
context.HTTPClient = http.DefaultClient
5258
}
5359

5460
//MchMgr 商户平台

wxcontext/render.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var plainContentType = []string{"text/plain; charset=utf-8"}
1111
//Render render from bytes
1212
func (ctx *Context) Render(bytes []byte) {
1313
//debug
14-
//fmt.Println("response msg = ", string(bytes))
14+
// fmt.Println("response msg = ", string(bytes))
1515
ctx.Writer.WriteHeader(200)
1616
_, err := ctx.Writer.Write(bytes)
1717
if err != nil {

0 commit comments

Comments
 (0)