改进 webservice https 和 http 请求
diff --git a/webservice.go b/webservice.go
index 8dca00a..c6e1be9 100644
--- a/webservice.go
+++ b/webservice.go
@@ -221,6 +221,9 @@
// NewSession new session object
func NewSession(appid, appsecret, termid, baseurl string, timeout int, sslVerify bool) *WebSession {
+ if transport, ok := goreq.DefaultTransport.(*http.Transport); ok {
+ transport.TLSClientConfig = nil
+ }
return &WebSession{
AppID: appid,
AppSecret: appsecret,
@@ -244,7 +247,14 @@
transport.TLSClientConfig = &tls.Config{RootCAs: certs}
}
- return NewSession(appID, appSecret, termID, baseURL, timeout, true), nil
+ return &WebSession{
+ AppID: appID,
+ AppSecret: appSecret,
+ TermID: termID,
+ BaseURL: baseURL,
+ DefaultTimeout: timeout,
+ sslVerify: true,
+ }, nil
}
func (w *WebSession) getAuthToken() (string, error) {
diff --git a/webservice_test.go b/webservice_test.go
index 1bcdca2..00393a2 100644
--- a/webservice_test.go
+++ b/webservice_test.go
@@ -36,7 +36,7 @@
termID = "1020303"
)
-func T1estUseHTTP(t *testing.T) {
+func TestUseHTTP(t *testing.T) {
uri := "http://vb-docker:8443/epayapi/services"
session := NewSession(appID, appSecret, termID, uri, 3, true)
err := session.Auth()
@@ -60,5 +60,11 @@
}
func TestUseSecureHTTPS(t *testing.T) {
-
+ uri := "https://www.baidu.com"
+ session := NewSession(appID, appSecret, termID, uri, 3, true)
+ err := session.Auth()
+ if err != nil {
+ t.Errorf("Auth Error: %v", err)
+ return
+ }
}