diff --git a/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java b/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java index baa5927cf9..d6ed61d1f0 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java @@ -119,7 +119,7 @@ public class XDingtalkServer { LogUtil.error(e); Cookie cookie_error = new Cookie("DingtalkError", msg); cookie_error.setPath("/"); - + response.addCookie(cookie_error); return modelAndView; } catch (UnsupportedEncodingException e1) { e.printStackTrace(); diff --git a/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java b/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java index c6ce08472d..16c3d6a687 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java @@ -123,7 +123,7 @@ public class XLarkServer { LogUtil.error(e); Cookie cookie_error = new Cookie("LarkError", msg); cookie_error.setPath("/"); - + response.addCookie(cookie_error); return modelAndView; } catch (UnsupportedEncodingException e1) { e.printStackTrace(); diff --git a/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java b/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java index 2741d6d5b9..b50ee487e8 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java @@ -124,7 +124,7 @@ public class XWecomServer { LogUtil.error(e); Cookie cookie_error = new Cookie("WecomError", msg); cookie_error.setPath("/"); - + response.addCookie(cookie_error); return modelAndView; } catch (UnsupportedEncodingException e1) { e.printStackTrace(); diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue index eb28fbd5df..d3c2f3d42f 100644 --- a/frontend/src/views/login/index.vue +++ b/frontend/src/views/login/index.vue @@ -233,6 +233,24 @@ export default { this.$error(msg) } this.clearOidcMsg() + + if (Cookies.get('WecomError')) { + this.$error(Cookies.get('WecomError')) + this.switchCodeIndex(4) + } + this.clearWecomMsg() + + if (Cookies.get('DingtalkError')) { + this.$error(Cookies.get('DingtalkError')) + this.switchCodeIndex(5) + } + this.clearDingtalkMsg() + + if (Cookies.get('LarkError')) { + this.$error(Cookies.get('LarkError')) + this.switchCodeIndex(6) + } + this.clearLarkMsg() }, methods: { @@ -254,6 +272,15 @@ export default { Cookies.remove('OidcError') Cookies.remove('IdToken') }, + clearWecomMsg() { + Cookies.remove('WecomError') + }, + clearDingtalkMsg() { + Cookies.remove('DingtalkError') + }, + clearLarkMsg() { + Cookies.remove('LarkError') + }, showLoginImage(uiInfo) { this.uiInfo = getSysUI() if (!this.uiInfo || Object.keys(this.uiInfo).length === 0) { @@ -287,6 +314,9 @@ export default { handleLogin() { this.initCache() this.clearOidcMsg() + this.clearWecomMsg() + this.clearDingtalkMsg() + this.clearLarkMsg() this.$refs.loginForm.validate(valid => { if (valid) { this.loading = true