diff --git a/framework/sdk-parent/frontend/src/plugins/request.js b/framework/sdk-parent/frontend/src/plugins/request.js index 9de840af49..744b7e59f4 100644 --- a/framework/sdk-parent/frontend/src/plugins/request.js +++ b/framework/sdk-parent/frontend/src/plugins/request.js @@ -23,11 +23,6 @@ if (window.location.pathname.startsWith('/' + packageJSON.name)) { } let urlParams = getUrlParams(window.location.href); -// OIDC 返回三方登录地址的话保存到本地,下次可以直接跳转 -let oidcLoginUrl = urlParams['oidcLoginUrl'] -if (oidcLoginUrl) { - localStorage.setItem('oidcLoginUrl', oidcLoginUrl); -} const instance = axios.create({ baseURL, // url = base url + request url diff --git a/framework/sdk-parent/frontend/src/utils/index.js b/framework/sdk-parent/frontend/src/utils/index.js index 0466f7c6be..825aed3b5a 100644 --- a/framework/sdk-parent/frontend/src/utils/index.js +++ b/framework/sdk-parent/frontend/src/utils/index.js @@ -370,14 +370,19 @@ export function checkMicroMode() { } export function getUrlParams(url) { - const arrSearch = url.split("?").pop().split("#").shift().split("&"); + if (!url) url = window.location.href; + // 通过 ? 分割获取后面的参数字符串 + let urlStr = url.split('?')[1] + // 创建空对象存储参数 let obj = {}; - arrSearch.forEach((item) => { - const [k, v] = item.split("="); - obj[k] = v; - return obj; - }); - return obj; + // 再通过 & 将每一个参数单独分割出来 + let paramsArr = urlStr?.split('&') + for(let i = 0,len = paramsArr?.length;i < len;i++){ + // 再通过 = 将每一个参数分割为 key:value 的形式 + let arr = paramsArr[i].split('=') + obj[arr[0]] = arr[1]; + } + return obj } /** diff --git a/lombok.config b/lombok.config new file mode 100644 index 0000000000..e997f3165a --- /dev/null +++ b/lombok.config @@ -0,0 +1,2 @@ +lombok.addLombokGeneratedAnnotation = true +lombok.equalsAndHashCode.callSuper=call diff --git a/system-setting/frontend/src/business/system/setting/MxAuth.vue b/system-setting/frontend/src/business/system/setting/MxAuth.vue index 7a876a75b9..1e195d26f9 100644 --- a/system-setting/frontend/src/business/system/setting/MxAuth.vue +++ b/system-setting/frontend/src/business/system/setting/MxAuth.vue @@ -182,13 +182,13 @@ - +