diff --git a/de-xpack b/de-xpack index 7e46266484..1c6bacf00a 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 7e46266484070b6c2e2825668a884089fa5b3ec2 +Subproject commit 1c6bacf00aaa84ec09d4a0cceab08bba46a3b533 diff --git a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java index d365c9e0fa..0f5ae6b230 100644 --- a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java @@ -73,4 +73,15 @@ public class WhitelistUtils { || StringUtils.startsWithAny(requestURI, "/communicate/image/") || StringUtils.startsWithAny(requestURI, "/communicate/down/"); } + + public static String getBaseApiUrl(String redirect_uri) { + if (StringUtils.endsWith(redirect_uri, "/")) { + redirect_uri = redirect_uri.substring(0, redirect_uri.length() - 1); + } + String contextPath = WhitelistUtils.getContextPath(); + if (StringUtils.isNotBlank(contextPath)) { + redirect_uri += contextPath; + } + return redirect_uri + AuthConstant.DE_API_PREFIX + "/"; + } }