Commit 222f4350 authored by hezhen's avatar hezhen

123

parent a3b2485f
...@@ -52,14 +52,11 @@ public class AccessToken implements Serializable { ...@@ -52,14 +52,11 @@ public class AccessToken implements Serializable {
} }
} }
public AccessToken(String json,String access_token,Integer expires_in) { public AccessToken(String json,String access_token,Integer expires_in,Long expiredTime) {
this.json = json; this.json = json;
this.access_token = access_token; this.access_token = access_token;
this.expires_in = expires_in; this.expires_in = expires_in;
this.expiredTime=expiredTime;
if (expires_in != null)
expiredTime = System.currentTimeMillis() + ((expires_in -5) * 1000);
} }
public String getJson() { public String getJson() {
......
...@@ -53,7 +53,7 @@ public class AccessTokenService { ...@@ -53,7 +53,7 @@ public class AccessTokenService {
if (StringUtils.isNotBlank(accessTokenRedis)) if (StringUtils.isNotBlank(accessTokenRedis))
{ {
JSONObject obj = JSONObject.parseObject(accessTokenRedis).getJSONObject(wy_appid); JSONObject obj = JSONObject.parseObject(accessTokenRedis).getJSONObject(wy_appid);
AccessToken accessToken = new AccessToken(obj.getString("json"),obj.getString("accessToken"),obj.getInteger("expiresIn")); AccessToken accessToken = new AccessToken(obj.getString("json"),obj.getString("accessToken"),obj.getInteger("expiresIn"),obj.getLong("expiredTime"));
if(accessToken.isAvailable()){ if(accessToken.isAvailable()){
return accessToken; return accessToken;
} }
...@@ -63,7 +63,7 @@ public class AccessTokenService { ...@@ -63,7 +63,7 @@ public class AccessTokenService {
refreshAccessToken(); refreshAccessToken();
accessTokenRedis = summbitRedisTemplate.opsForValue().get(wy_appid) == null ? "" : summbitRedisTemplate.opsForValue().get(wy_appid).toString(); accessTokenRedis = summbitRedisTemplate.opsForValue().get(wy_appid) == null ? "" : summbitRedisTemplate.opsForValue().get(wy_appid).toString();
JSONObject obj = JSONObject.parseObject(accessTokenRedis).getJSONObject(wy_appid); JSONObject obj = JSONObject.parseObject(accessTokenRedis).getJSONObject(wy_appid);
AccessToken accessToken = new AccessToken(obj.getString("json"),obj.getString("accessToken"),obj.getInteger("expiresIn")); AccessToken accessToken = new AccessToken(obj.getString("json"),obj.getString("accessToken"),obj.getInteger("expiresIn"),obj.getLong("expiredTime"));
return accessToken; return accessToken;
//return (AccessToken) ehcache.get(SystemConfig.WINXIN_AppID).getObjectValue(); //return (AccessToken) ehcache.get(SystemConfig.WINXIN_AppID).getObjectValue();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment