Commit a1cc067b by 墨竹

fix:bug修改

parent 784c1394
......@@ -218,7 +218,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
//登录和刷新token兼容
String headerToken = AuthRequestWellDoneUtil.getHeaderToken();
if (StringUtils.isNotBlank(headerToken)) {
return getRefreshToken();
return getRefreshTokenResult(getRefreshToken());
}
Map<String, String> map = new HashMap<>();
map.put("staffId", "-1");
......@@ -232,17 +232,25 @@ public class WxEnterpriseInfoController extends WebBaseController {
return RestResponse.successResult(token);
}
private RestResponse<String> getRefreshTokenResult(String refreshToken) {
if (StringUtils.isBlank(refreshToken)) {
return RestResponse.failure(String.valueOf(HaoBanErrCode.ERR_30010.getCode()), HaoBanErrCode.ERR_30010.getMsg());
}
return RestResponse.successResult(refreshToken);
}
/**
* 刷新token
*
* @return
*/
private RestResponse<String> getRefreshToken() {
private String getRefreshToken() {
String refreshToken = AuthRequestWellDoneUtil.refreshToken();
if (StringUtils.isBlank(refreshToken)) {
return RestResponse.failure(String.valueOf(HaoBanErrCode.ERR_30010.getCode()), HaoBanErrCode.ERR_30010.getMsg());
return null;
}
return RestResponse.successResult(refreshToken);
return refreshToken;
}
/**
......@@ -269,7 +277,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
//登录和刷新token兼容
String headerToken = AuthRequestWellDoneUtil.getHeaderToken();
if (StringUtils.isNotBlank(headerToken)) {
return getRefreshToken();
return getRefreshTokenResult(getRefreshToken());
}
Map<String, String> map = new HashMap<>();
map.put("staffId", staffId);
......@@ -295,8 +303,12 @@ public class WxEnterpriseInfoController extends WebBaseController {
* @date 2021-12-10 18:34:12
*/
@RequestMapping(value = "welldone-token-refresh", method = RequestMethod.GET)
public RestResponse<String> welldoneTokenRefresh() {
return getRefreshToken();
public HaobanResponse welldoneTokenRefresh() {
String refreshToken = getRefreshToken();
if (StringUtils.isBlank(refreshToken)) {
return resultResponse(HaoBanErrCode.ERR_30010);
}
return resultResponse(HaoBanErrCode.ERR_1, refreshToken);
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment