From 28e7d3937f819a3486b22bfa1c84aee172aaccb4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 17:46:42 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/adapt/hcIot/GetToken.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/GetToken.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/GetToken.java
old mode 100644
new mode 100755
index 647a646..78829bc
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/GetToken.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/GetToken.java
@@ -25,6 +25,8 @@
/**
* 鑾峰彇token
+ * <p>
+ * 鎺ュ彛鍗忚鍦板潃锛� https://gitee.com/java110/MicroCommunityThings/blob/master/back/docs/api.md
*
* @desc add by 鍚村鏂� 9:46
*/
@@ -33,14 +35,15 @@
@Java110Synchronized(value = "hc_get_token")
- public static String get(RestTemplate restTemplate) {
+ public static String get(RestTemplate restTemplate,boolean refreshAccessToken) {
String token = CommonCache.getValue(IotConstant.HC_TOKEN);
- if (!StringUtil.isEmpty(token)) {
+ if (!StringUtil.isEmpty(token) && !refreshAccessToken) {
return token;
}
HttpHeaders headers = new HttpHeaders();
HttpEntity httpEntity = new HttpEntity(headers);
- ResponseEntity<String> tokenRes = restTemplate.exchange(IotConstant.GET_TOKEN_URL, HttpMethod.GET, httpEntity, String.class);
+ String url = IotConstant.getUrl(IotConstant.GET_TOKEN_URL.replace("APP_ID", IotConstant.getAppId()).replace("APP_SECRET", IotConstant.getAppSecret()));
+ ResponseEntity<String> tokenRes = restTemplate.exchange(url, HttpMethod.GET, httpEntity, String.class);
if (tokenRes.getStatusCode() != HttpStatus.OK) {
throw new IllegalArgumentException("鑾峰彇token澶辫触" + tokenRes.getBody());
@@ -51,8 +54,8 @@
throw new IllegalArgumentException("鑾峰彇token澶辫触" + tokenRes.getBody());
}
- token = tokenObj.getJSONObject("data").getString("accessToken");
- int expiresIn = tokenObj.getJSONObject("data").getInteger("expiresIn");
+ token = tokenObj.getJSONObject("data").getString("access_token");
+ int expiresIn = tokenObj.getJSONObject("data").getInteger("expires_in");
CommonCache.setValue(IotConstant.HC_TOKEN, token, expiresIn - 200);
--
Gitblit v1.8.0