Browse Source

[Token过期][修改]:整理token过期时间, 过期时间前1小时,重置token

release_toaliyun_real
Stormeye Wu 7 years ago
parent
commit
249134e449
6 changed files with 12 additions and 12 deletions
  1. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  2. +1
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java
  3. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java
  5. +5
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java
  6. +2
    -2
      mallinkService/src/main/java/com/iformall/utils/Constant.java

+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java View File

@@ -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);


+ 1
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java View File

@@ -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());


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java View File

@@ -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);
}


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java View File

@@ -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;
}


+ 5
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java View File

@@ -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;
}
}

+ 2
- 2
mallinkService/src/main/java/com/iformall/utils/Constant.java View File

@@ -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";


Loading…
Cancel
Save