java110 5 år sedan
förälder
incheckning
84513aed4d

+ 2 - 2
service-job/src/main/java/com/java110/job/adapt/hcIot/GetToken.java

@@ -35,9 +35,9 @@ public class GetToken {
 
 
     @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();

+ 3 - 3
service-job/src/main/java/com/java110/job/adapt/hcIot/asyn/impl/IotSendAsynImpl.java

@@ -74,7 +74,7 @@ public class IotSendAsynImpl implements IIotSendAsyn {
      */
     private HttpHeaders getHeaders() {
         HttpHeaders httpHeaders = new HttpHeaders();
-        httpHeaders.add("access_token", GetToken.get(outRestTemplate));
+        httpHeaders.add("access_token", GetToken.get(outRestTemplate, false));
         //httpHeaders.add("Content-Type", "application/x-www-form-urlencoded");
         return httpHeaders;
     }
@@ -91,8 +91,8 @@ public class IotSendAsynImpl implements IIotSendAsyn {
         JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
 
         if (paramOut.getInteger("code") == ResultVo.CODE_UNAUTHORIZED) {
-            //重新刷新token
-            GetToken.get(outRestTemplate);
+            //删除token
+            GetToken.get(outRestTemplate, true);
         }
     }