Merge pull request #26 from CyJaySong/master

优化AccessToken 获取机制，临近过期才会刷新AccessToken

client.go

@@ -2,6 +2,8 @@ package gosdk
 
 import (
 	"errors"
+	"strconv"
+	"time"
 
 	"github.com/imroc/req"
 )
@@ -19,6 +21,7 @@ type Client struct {
 	ClientID     string
 	ClientSecret string
 	AccessToken  string
+	expireAt     time.Time
 	Authorizer   Authorizer
 }
 
@@ -53,11 +56,14 @@ func (da DefaultAuthorizer) Authorize(client *Client) error {
 	}
 
 	client.AccessToken = authresponse.AccessToken
+	expireIn, _ := strconv.Atoi(authresponse.ExpireIn)
+	// 记录AccessToken 过期时间，过期时间前60秒就触发刷新
+	client.expireAt = time.Now().Add(time.Second * time.Duration(expireIn-60))
 	return nil
 }
 
 func (client *Client) Auth() error {
-	if client.AccessToken != "" {
+	if client.AccessToken != "" && time.Now().Before(client.expireAt) {
 		return nil
 	}
 

vision/face/v2/detect.go

@@ -14,7 +14,6 @@ type FaceResponse struct {
 }
 
 func (fc *FaceClient) DetectAndAnalysis(image *vision.Image, options map[string]interface{}) (*FaceResponse, error) {
-
 	if err := fc.Auth(); err != nil {
 		return nil, err
 	}

vision/face/v2/person_verify.go

@@ -20,10 +20,8 @@ func (fc FaceClient) PersonVerify(image, idCardNumber, name string, options map[
 		return nil, errors.New("image length is invalid")
 	}
 
-	if fc.AccessToken == "" {
-		if err := fc.Auth(); err != nil {
-			return nil, err
-		}
+	if err := fc.Auth(); err != nil {
+		return nil, err
 	}
 	options["image"] = image
 	options["id_card_number"] = idCardNumber

vision/face/v2/search.go

@@ -18,12 +18,9 @@ type IdentifyResponse struct {
 }
 
 func (fc FaceClient) Identify(img *vision.Image, groupID []string, options map[string]interface{}) (*IdentifyResponse, error) {
-	if fc.AccessToken == "" {
-		if err := fc.Auth(); err != nil {
-			return nil, err
-		}
+	if err := fc.Auth(); err != nil {
+		return nil, err
 	}
-
 	encodedImg, err := img.Base64Encode()
 	if err != nil {
 		return nil, err
@@ -50,12 +47,9 @@ type VerifyResponse struct {
 }
 
 func (fc FaceClient) Verify(img *vision.Image, uid string, groupID string, options map[string]interface{}) (*VerifyResponse, error) {
-	if fc.AccessToken == "" {
-		if err := fc.Auth(); err != nil {
-			return nil, err
-		}
+	if err := fc.Auth(); err != nil {
+		return nil, err
 	}
-
 	encodedImg, err := img.Base64Encode()
 	if err != nil {
 		return nil, err
@@ -80,10 +74,8 @@ type MultiVerifyResponse struct {
 }
 
 func (fc FaceClient) MultiVerify(image vision.Image, groupIDs []string, options map[string]interface{}) (*MultiVerifyResponse, error) {
-	if fc.AccessToken == "" {
-		if err := fc.Auth(); err != nil {
-			return nil, err
-		}
+	if err := fc.Auth(); err != nil {
+		return nil, err
 	}
 
 	encodedImage, err := image.Base64Encode()

vision/face/v3/person_verify.go

@@ -21,10 +21,8 @@ func (fc FaceClient) PersonVerify(image, imageType, idCardNumber, name string, o
 	if imageType == "BASE64" && len(image) > 2<<(20-1)*2 {
 		return nil, errors.New("image length is invalid")
 	}
-	if fc.AccessToken == "" {
-		if err := fc.Auth(); err != nil {
-			return nil, err
-		}
+	if err := fc.Auth(); err != nil {
+		return nil, err
 	}
 	options["image"] = image
 	options["image_type"] = imageType