Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -8,16 +8,16 @@ package com.xxfc.platform.summit.model;
 
 import java.io.Serializable;
 import java.util.Map;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import lombok.Data;
+
+
 
 
 /**
  * 封装 access_token
  */
-
-@Data
 public class AccessToken implements Serializable {
 	
 	private static final long serialVersionUID = -822464425433824314L;
@@ -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() {
@@ -72,6 +69,18 @@ public class AccessToken implements Serializable {
 		return access_token != null;
 	}
 
+	public void setAccess_token(String access_token) {
+		this.access_token = access_token;
+	}
+
+	public void setExpires_in(Integer expires_in) {
+		this.expires_in = expires_in;
+	}
+
+	public void setExpiredTime(Long expiredTime) {
+		this.expiredTime = expiredTime;
+	}
+
 
 	public void setJson(String json) {
 		this.json = json;
@@ -82,6 +91,17 @@ public class AccessToken implements Serializable {
 		return number == null ? null : number.intValue();
 	}
 
+	public String getAccessToken() {
+		return access_token;
+	}
+
+	public Integer getExpiresIn() {
+		return expires_in;
+	}
+
+	public Long getExpiredTime() {
+		return expiredTime;
+	}
 	
 	
 }

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();
 	}
@@ -79,7 +79,7 @@ public class AccessTokenService {
 	 * @return String accessToken
 	 */
 	public  String getAccessTokenStr() {
-		return getAccessToken().getAccess_token();
+		return getAccessToken().getAccessToken();
 	}
 	
 	/**
@@ -92,7 +92,6 @@ public class AccessTokenService {
 			String json =  HttpRequestUtil.httpGet(url+"&appid="+wy_appid+"&secret="+wy_secret);
 			log.info("---json===="+json);
 			result = new AccessToken(json);
-			log.info("---result===="+result.toString());
 			if (result.isAvailable())
 				break;
 		}
@@ -101,7 +100,7 @@ public class AccessTokenService {
 		obj.put(wy_appid, result);
 		Boolean suc=summbitRedisTemplate.opsForValue().setIfAbsent(wy_appid,  obj.toJSONString());
 		if (suc) {
-			summbitRedisTemplate.expire(wy_appid, result.getExpires_in(), TimeUnit.MINUTES);
+			summbitRedisTemplate.expire(wy_appid, result.getExpiresIn(), TimeUnit.MINUTES);
 		}
 	}
 }
\ No newline at end of file