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;
@@ -41,8 +41,11 @@ public class AccessToken implements Serializable {
 			expires_in = temp.getInteger("expires_in");
 
 
-			if (expires_in != null)
+			if (expires_in != null){
 				expiredTime = System.currentTimeMillis() + ((expires_in -5) * 1000);
+				System.out.println("----expiredTime==="+expiredTime);
+			}
+
 
 		} catch (Exception e) {
 			throw new RuntimeException(e);
@@ -68,18 +71,7 @@ public class AccessToken implements Serializable {
 			return false;
 		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;
@@ -89,14 +81,7 @@ public class AccessToken implements Serializable {
 		Number number = (Number) temp.get(key);
 		return number == null ? null : number.intValue();
 	}
-	
-	public String getAccessToken() {
-		return access_token;
-	}
-	
-	public Integer getExpiresIn() {
-		return expires_in;
-	}
+
 	
 	
 }

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

@@ -2,11 +2,7 @@ package com.xxfc.platform.summit.service;
 
 
 
-
-
-
 import com.xxfc.platform.summit.model.AccessToken;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.xxfc.platform.summit.util.HttpRequestUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -83,7 +79,7 @@ public class AccessTokenService {
 	 * @return String accessToken
 	 */
 	public  String getAccessTokenStr() {
-		return getAccessToken().getAccessToken();
+		return getAccessToken().getAccess_token();
 	}
 	
 	/**
@@ -96,17 +92,16 @@ 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;
 		}
-
 		// 三次请求如果仍然返回了不可用的 access token 仍然 put 进去，便于上层通过 AccessToken 中的属性判断底层的情况
 		JSONObject obj = new JSONObject();
 		obj.put(wy_appid, result);
 		Boolean suc=summbitRedisTemplate.opsForValue().setIfAbsent(wy_appid,  obj.toJSONString());
 		if (suc) {
-			summbitRedisTemplate.expire(wy_appid, result.getExpiresIn(), TimeUnit.MINUTES);
+			summbitRedisTemplate.expire(wy_appid, result.getExpires_in(), TimeUnit.MINUTES);
 		}
 	}
 }
\ No newline at end of file