diff --git a/springboot/src/main/java/com/sincre/springboot/ApiModel/YinShiResResult.java b/springboot/src/main/java/com/sincre/springboot/ApiModel/YinShiResResult.java index faf86ec..482565a 100644 --- a/springboot/src/main/java/com/sincre/springboot/ApiModel/YinShiResResult.java +++ b/springboot/src/main/java/com/sincre/springboot/ApiModel/YinShiResResult.java @@ -33,29 +33,31 @@ public class YinShiResResult { private String code; private String msg; -} -class YinShiToken{ + public class YinShiToken{ - private String accessToken; + private String accessToken; + /** + * 精确到毫秒的时间戳 + */ + private Long expireTime; - private Long expireTime; + public String getAccessToken() { + return accessToken; + } - public String getAccessToken() { - return accessToken; - } + public void setAccessToken(String accessToken) { + this.accessToken = accessToken; + } - public void setAccessToken(String accessToken) { - this.accessToken = accessToken; - } + public Long getExpireTime() { + return expireTime; + } - public Long getExpireTime() { - return expireTime; - } - - public void setExpireTime(Long expireTime) { - this.expireTime = expireTime; + public void setExpireTime(Long expireTime) { + this.expireTime = expireTime; + } } +} -} diff --git a/springboot/src/main/java/com/sincre/springboot/controller/YinShiController.java b/springboot/src/main/java/com/sincre/springboot/controller/YinShiController.java index e3fbe0b..2ef51f1 100644 --- a/springboot/src/main/java/com/sincre/springboot/controller/YinShiController.java +++ b/springboot/src/main/java/com/sincre/springboot/controller/YinShiController.java @@ -3,6 +3,7 @@ package com.sincre.springboot.controller; import com.sincre.springboot.common.MD5; import com.sincre.springboot.utils.ApiHelper; +import com.sincre.springboot.utils.CacheHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; @@ -21,21 +22,6 @@ import com.sincre.springboot.ApiPlatform.YinShiServiceConfig; public class YinShiController { private static String AccessToken = "at.2scte32926nu6q7j6adhlabg28emicz6-58f6w0596w-1ppubtz-uxh6dnv5x"; - @ApiOperation(value = "用于管理员获取accessToken") - @GetMapping("/token") - public String GetYinShiToken(){ - String appKey = YinShiServiceConfig.appKey; - String appSecret = YinShiServiceConfig.appSecret; - - String url = YinShiServiceConfig.HostUrl + "lapp/token/get"; - Map map = new HashMap<>(); - - map.put("appKey",appKey); - map.put("appSecret",appSecret); - String result = ApiHelper.doPost(url,new HashMap(),map); - - return result; - } @ApiOperation(value = "增加子账号") @GetMapping("/addChildAccount") diff --git a/springboot/src/main/java/com/sincre/springboot/utils/CacheHelper.java b/springboot/src/main/java/com/sincre/springboot/utils/CacheHelper.java index 5e93b06..16cd361 100644 --- a/springboot/src/main/java/com/sincre/springboot/utils/CacheHelper.java +++ b/springboot/src/main/java/com/sincre/springboot/utils/CacheHelper.java @@ -4,7 +4,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.sincre.springboot.ApiModel.TuYaResResult; import com.sincre.springboot.ApiModel.TuYaResTokenObj; +import com.sincre.springboot.ApiModel.YinShiResResult; import com.sincre.springboot.ApiPlatform.TuYaCloudService; +import com.sincre.springboot.ApiPlatform.YinShiServiceConfig; import com.sincre.springboot.common.EhcacheUtil; import org.apache.commons.lang3.StringUtils; @@ -16,6 +18,7 @@ public class CacheHelper { static EhcacheUtil ehcacheUtil = new EhcacheUtil(); static String TuYaTokenKey = "TuYa_Token"; static String TuYaRefreshTokenKey = "TuYa_Re_Token"; + private static void setTuYaToken(){ String apiUrl = "/v1.0/token?grant_type=1"; @@ -91,4 +94,5 @@ public class CacheHelper { System.out.println(ex.getMessage()); } } + } -- libgit2 0.21.0