diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index b553347b6..956993e89 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -143,7 +143,7 @@ public class WxInfoController extends BaseController { } else { // 检查token是否已过期, 小时就重新获取 Date curDate = new Date(); - if(curDate.getTime() > wxAppinfo.getLastTokenTime().getTime() + Constant.C_EXPIRE) { + if(curDate.getTime() > wxAppinfo.getLastTokenTime().getTime() + Constant.H_EXPIRE) { try { String accessToken = wxMaService.getAccessToken(true); wxAppinfo.setAccessToken(accessToken); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 390016591..ac0adbeb4 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -167,8 +167,7 @@ public class WxMerchantBUserController extends BaseController { } // check password if (user1.getUserPwd().equalsIgnoreCase(password)) { - user1.createToken(currentDate); - token = user1.getToken(); + token = user1.createToken(currentDate); resultMap.put("token", token); resultMap.put("bUserId",user1.getId()); request.setAttribute(Constant.LOGIN_USER_KEY, user1.getId()); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 782ce710c..541b825b4 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -130,7 +130,7 @@ public class WxUserGrantController extends BaseController { } else { // 检查token是否已过期, 1小时就重新获取 Date curDate = new Date(); - if(curDate.getTime() > wxAppinfo.getLastTokenTime().getTime() + Constant.C_EXPIRE) { + if(curDate.getTime() > wxAppinfo.getLastTokenTime().getTime() + Constant.H_EXPIRE) { updateAppAccessToken(wxAppinfo, wxMaService); wxMaService = getWeappServiceByAppInfo(wxAppinfo); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index c6fa92034..04471c0b6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -588,12 +588,12 @@ public class WxCUser implements Serializable { } public String createToken(Date currentDate) { - if (expireTime == null || expireTime.getTime() < currentDate.getTime()) + if (expireTime == null || expireTime.getTime() - Constant.H_EXPIRE < currentDate.getTime()) { //生成一个token this.token = UUID.randomUUID().toString(); //过期时间 - this.expireTime = new Date(currentDate.getTime() + Constant.EXPIRE * 1000); + this.expireTime = new Date(currentDate.getTime() + Constant.EXPIRE); } return this.token; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index 4ff334779..c03ada1a2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -235,14 +235,15 @@ public class WxMerchantBUser implements Serializable { } } - public void createToken(Date currentDate) { - if (expireTime == null || expireTime.getTime() < currentDate.getTime()) { - //生成一个token + public String createToken(Date currentDate) { + if (expireTime == null || expireTime.getTime() - Constant.H_EXPIRE < currentDate.getTime()) { + //提前一小时, 新生成一个token String token = UUID.randomUUID().toString(); //过期时间 - Date expireTime = new Date(currentDate.getTime() + Constant.EXPIRE * 1000); + Date expireTime = new Date(currentDate.getTime() + Constant.EXPIRE); setToken(token); setExpireTime(expireTime); } + return this.token; } } diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index d5fb7b84c..42f7d2ec9 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -3,10 +3,10 @@ package com.iformall.utils; public class Constant { // 1小时过期, - public final static int C_EXPIRE = 3600000; + public final static int H_EXPIRE = 3600000; // TOKEN过期时间, 24小时后过期 - public final static int EXPIRE = 3600 * 24; + public final static int EXPIRE = H_EXPIRE * 24; // C端token public static final String LOGIN_USER_KEY = "LOGIN_USER_KEY";