From 3a4164368df336e08243828849a4ec9a73dab278 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Fri, 19 Jan 2024 10:33:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96access=5Ftoken?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flossom/miniProgram/domain/vo/WxAccessTokenRet.java  | 8 ++++----
 .../com/flossom/miniProgram/utils/MiniProgramUtils.java  | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/WxAccessTokenRet.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/WxAccessTokenRet.java
index aab11bb..20bf0c3 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/WxAccessTokenRet.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/WxAccessTokenRet.java
@@ -6,14 +6,14 @@ package com.flossom.miniProgram.domain.vo;
 public class WxAccessTokenRet {
 
     private String access_token;
-    private String expires_in;
+    private Integer expires_in;
     private Integer errcode;
     private String errmsg;
 
     public WxAccessTokenRet() {
     }
 
-    public WxAccessTokenRet(String access_token, String expires_in, Integer errcode, String errmsg) {
+    public WxAccessTokenRet(String access_token, Integer expires_in, Integer errcode, String errmsg) {
         this.access_token = access_token;
         this.expires_in = expires_in;
         this.errcode = errcode;
@@ -28,11 +28,11 @@ public class WxAccessTokenRet {
         this.access_token = access_token;
     }
 
-    public String getExpires_in() {
+    public Integer getExpires_in() {
         return expires_in;
     }
 
-    public void setExpires_in(String expires_in) {
+    public void setExpires_in(Integer expires_in) {
         this.expires_in = expires_in;
     }
 
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java
index 205e873..5411824 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java
@@ -125,9 +125,12 @@ public class MiniProgramUtils {
                 logger.error("获取 access_token 失败: {}", wxAccessTokenRet.getErrmsg());
                 return null;
             }
-            // 保存缓存
-            redisService.setCacheObject(cacheKey,
-                    wxAccessTokenRet.getAccess_token(), CacheConstants.WX_ACCESS_TOKEN_EXPIRATION, TimeUnit.MINUTES);
+            // 保存缓存，按照返回的有效期来缓存，如果没有有效期则临时使用一次
+            if (wxAccessTokenRet.getExpires_in() != null && wxAccessTokenRet.getExpires_in() > 0) {
+                Integer minutes = wxAccessTokenRet.getExpires_in() / 60;
+                redisService.setCacheObject(cacheKey,
+                        wxAccessTokenRet.getAccess_token(), minutes.longValue(), TimeUnit.MINUTES);
+            }
             return wxAccessTokenRet.getAccess_token();
         }
         return accessToken;