diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java index 86a15111a..3dd34c7e7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java @@ -9,8 +9,10 @@ import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mq.util.HttpRestTemplateService; import com.cool.store.utils.RedisUtilPool; +import com.cool.store.utils.RestTemplateUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -50,12 +52,17 @@ public class WechatRest { requestMap.put("secret", secret); requestMap.put("js_code", jsCode); requestMap.put("grant_type","authorization_code"); - CodeSessionDTO codeSessionDTO = null; + ResponseEntity responseEntity = null; try { - codeSessionDTO = httpRestTemplateService.getForObject(url, CodeSessionDTO.class, requestMap); - log.info("WechatRest#miniProgramJsCodeSession, url:{}, response:{}", url, JSONObject.toJSONString(codeSessionDTO)); + responseEntity = RestTemplateUtil.loadGet(url, CodeSessionDTO.class); + log.info("WechatRest#miniProgramJsCodeSession, url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); + if(Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()){ + return responseEntity.getBody(); + } + } catch (Exception e) { - log.error("调用微信服务异常", e); + log.info("调用微信服务异常{}", e); + throw new ServiceException(ErrorCodeEnum.WX_SERVICE_ERROR); } return null; } @@ -75,7 +82,7 @@ public class WechatRest { if (StringUtils.isBlank(token)) { throw new ServiceException(ErrorCodeEnum.GET_ACCESSTOKEN_ERROR); } - + redisUtilPool.setString(cacheAccessToken, token, 7000); accessToken = token; } catch (Exception e) {