Merge remote-tracking branch 'origin/dev-opt' into dev-opt
This commit is contained in:
commit
7dcb551b18
|
|
@ -239,6 +239,7 @@ public class TokenController {
|
|||
result.put("token_type", tokenJson.getString("token_type"));
|
||||
result.put("expires_in", tokenJson.getInteger("expires_in"));
|
||||
result.put("scope", tokenJson.getString("scope"));
|
||||
result.put("redirectUrl", casdoorRedirectUri);
|
||||
|
||||
if (uapUse && userInfo.getSysUser() != null) {
|
||||
result.put("uapLogoutUri", uapUrl + logoutUrl);
|
||||
|
|
@ -328,7 +329,7 @@ public class TokenController {
|
|||
result.put("authorizeUrl", signinUrl);
|
||||
result.put("state", state);
|
||||
result.put("clientId", casdoorClientId);
|
||||
result.put("redirectUri", casdoorRedirectUri);
|
||||
result.put("redirectUrl", casdoorRedirectUri);
|
||||
result.put("logoutUri", casdoorEndpoint + "/api/logout");
|
||||
return R.ok(result);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue