From f18d18d7a2784922066bf86d63311e7cc9f230e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= <gc@dtapp.net>
Date: Thu, 30 Dec 2021 16:13:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=AE=E4=BF=A1=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cgi-bin.token.monitor.go                  | 28 ++-----------------
 service/wechatoffice/cgi-bin.token.monitor.go | 28 ++-----------------
 service/wechatunion/cgi-bin.token.monitor.go  | 28 ++-----------------
 3 files changed, 6 insertions(+), 78 deletions(-)

diff --git a/service/wechatminiprogram/cgi-bin.token.monitor.go b/service/wechatminiprogram/cgi-bin.token.monitor.go
index f5eb4231..df760460 100644
--- a/service/wechatminiprogram/cgi-bin.token.monitor.go
+++ b/service/wechatminiprogram/cgi-bin.token.monitor.go
@@ -2,10 +2,6 @@ package wechatminiprogram
 
 import (
 	"errors"
-	"fmt"
-	"gopkg.in/dtapps/go-library.v3/utils/goredis"
-	"gopkg.in/dtapps/go-library.v3/utils/gotime"
-	"time"
 )
 
 var (
@@ -21,32 +17,12 @@ func (app *App) AuthGetAccessTokenMonitor(qdType string) error {
 			if app.Db == nil {
 				return errors.New("驱动没有初始化")
 			}
-			token := app.AuthGetAccessToken()
-			if token.Result.AccessToken == "" {
-				return errors.New("获取AccessToken失败")
-			} else {
-				app.Db.Create(&WechatAccessTokenDbModel{
-					AppID:       app.AppId,
-					AppSecret:   app.AppSecret,
-					AccessToken: token.Result.AccessToken,
-					ExpiresIn:   token.Result.ExpiresIn,
-					ExpiresTime: gotime.Current().AfterSeconds(7000).Format(),
-				})
-				return nil
-			}
+			app.GetAccessTokenDb()
 		case QdTypeRdb:
 			if app.RDb == nil {
 				return errors.New("驱动没有初始化")
 			}
-			cacheName := fmt.Sprintf("wechat_access_token:%v", app.AppId)
-			redis := goredis.App{
-				Rdb: app.RDb,
-			}
-			token := app.AuthGetAccessToken()
-			if token.Result.AccessToken == "" {
-				return errors.New("获取AccessToken失败")
-			}
-			redis.NewStringOperation().Set(cacheName, token.Result.AccessToken, goredis.WithExpire(time.Second*7000))
+			app.GetAccessTokenRDb()
 			return nil
 		default:
 			return errors.New("驱动类型不在范围内")
diff --git a/service/wechatoffice/cgi-bin.token.monitor.go b/service/wechatoffice/cgi-bin.token.monitor.go
index 94e8aa02..bf60c7bf 100644
--- a/service/wechatoffice/cgi-bin.token.monitor.go
+++ b/service/wechatoffice/cgi-bin.token.monitor.go
@@ -2,10 +2,6 @@ package wechatoffice
 
 import (
 	"errors"
-	"fmt"
-	"gopkg.in/dtapps/go-library.v3/utils/goredis"
-	"gopkg.in/dtapps/go-library.v3/utils/gotime"
-	"time"
 )
 
 var (
@@ -21,32 +17,12 @@ func (app *App) AuthGetAccessTokenMonitor(qdType string) error {
 			if app.Db == nil {
 				return errors.New("驱动没有初始化")
 			}
-			token := app.AuthGetAccessToken()
-			if token.Result.AccessToken == "" {
-				return errors.New("获取AccessToken失败")
-			} else {
-				app.Db.Create(&WechatAccessTokenDbModel{
-					AppID:       app.AppId,
-					AppSecret:   app.AppSecret,
-					AccessToken: token.Result.AccessToken,
-					ExpiresIn:   token.Result.ExpiresIn,
-					ExpiresTime: gotime.Current().AfterSeconds(7000).Format(),
-				})
-				return nil
-			}
+			app.GetAccessTokenDb()
 		case QdTypeRdb:
 			if app.RDb == nil {
 				return errors.New("驱动没有初始化")
 			}
-			cacheName := fmt.Sprintf("wechat_access_token:%v", app.AppId)
-			redis := goredis.App{
-				Rdb: app.RDb,
-			}
-			token := app.AuthGetAccessToken()
-			if token.Result.AccessToken == "" {
-				return errors.New("获取AccessToken失败")
-			}
-			redis.NewStringOperation().Set(cacheName, token.Result.AccessToken, goredis.WithExpire(time.Second*7000))
+			app.GetAccessTokenRDb()
 			return nil
 		default:
 			return errors.New("驱动类型不在范围内")
diff --git a/service/wechatunion/cgi-bin.token.monitor.go b/service/wechatunion/cgi-bin.token.monitor.go
index cc519c3e..22b557db 100644
--- a/service/wechatunion/cgi-bin.token.monitor.go
+++ b/service/wechatunion/cgi-bin.token.monitor.go
@@ -2,10 +2,6 @@ package wechatunion
 
 import (
 	"errors"
-	"fmt"
-	"gopkg.in/dtapps/go-library.v3/utils/goredis"
-	"gopkg.in/dtapps/go-library.v3/utils/gotime"
-	"time"
 )
 
 var (
@@ -21,32 +17,12 @@ func (app *App) AuthGetAccessTokenMonitor(qdType string) error {
 			if app.Db == nil {
 				return errors.New("驱动没有初始化")
 			}
-			token := app.AuthGetAccessToken()
-			if token.Result.AccessToken == "" {
-				return errors.New("获取AccessToken失败")
-			} else {
-				app.Db.Create(&WechatAccessTokenDbModel{
-					AppID:       app.AppId,
-					AppSecret:   app.AppSecret,
-					AccessToken: token.Result.AccessToken,
-					ExpiresIn:   token.Result.ExpiresIn,
-					ExpiresTime: gotime.Current().AfterSeconds(7000).Format(),
-				})
-				return nil
-			}
+			app.GetAccessTokenDb()
 		case QdTypeRdb:
 			if app.RDb == nil {
 				return errors.New("驱动没有初始化")
 			}
-			cacheName := fmt.Sprintf("wechat_access_token:%v", app.AppId)
-			redis := goredis.App{
-				Rdb: app.RDb,
-			}
-			token := app.AuthGetAccessToken()
-			if token.Result.AccessToken == "" {
-				return errors.New("获取AccessToken失败")
-			}
-			redis.NewStringOperation().Set(cacheName, token.Result.AccessToken, goredis.WithExpire(time.Second*7000))
+			app.GetAccessTokenRDb()
 			return nil
 		default:
 			return errors.New("驱动类型不在范围内")