Merge branch 'master_activity' into base-modify

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/model/AccessToken.java

@@ -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.access_token =  access_token;
 		this.expires_in = expires_in;
-
-
-		if (expires_in != null)
-			expiredTime = System.currentTimeMillis() + ((expires_in -5) * 1000);
+		this.expiredTime=expiredTime;
 	}
 
 	public String getJson() {

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/service/AccessTokenService.java

@@ -53,7 +53,7 @@ public class AccessTokenService {
 		if (StringUtils.isNotBlank(accessTokenRedis))
 		{
 			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()){
 				return accessToken;
 			}
@@ -63,7 +63,7 @@ public class AccessTokenService {
 		refreshAccessToken();
 		accessTokenRedis = summbitRedisTemplate.opsForValue().get(wy_appid) == null ? "" : summbitRedisTemplate.opsForValue().get(wy_appid).toString();
 		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) ehcache.get(SystemConfig.WINXIN_AppID).getObjectValue();
 	}