From 9df4f4f2fd895638730cbe8417649a301c9f0794 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 16 Sep 2022 11:18:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=99=BB=E5=BD=95):=20=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A4=B1=E8=B4=A5=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/server/XDingtalkServer.java       |  2 +-
 .../dataease/plugins/server/XLarkServer.java  |  2 +-
 .../dataease/plugins/server/XWecomServer.java |  2 +-
 frontend/src/views/login/index.vue            | 30 +++++++++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

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