From b7d76da855d35ad3723d6c3ecb9b7936f59fabaa Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Mon, 5 Dec 2022 14:55:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/config/saconfig/CorsFilter.java | 1 +
 .../modules/security/rest/AuthorizationController.java   | 1 -
 nladmin-ui/src/utils/request.js                          | 3 ++-
 nladmin-ui/src/views/login.vue                           | 9 +++++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/CorsFilter.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/CorsFilter.java
index 6a31e7a..f7b387c 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/CorsFilter.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/CorsFilter.java
@@ -32,6 +32,7 @@ public class CorsFilter implements Filter {
 		response.setHeader("Access-Control-Max-Age", "3600");
 		// 允许的header参数
 		response.setHeader("Access-Control-Allow-Headers", "x-requested-with,satoken");
+		response.setHeader("Access-Control-Allow-Credentials", "true");
 
 		// 如果是预检请求，直接返回
 		if (OPTIONS.equals(request.getMethod())) {
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/security/rest/AuthorizationController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
index b70bcd0..80b49f6 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
@@ -130,7 +130,6 @@ public class AuthorizationController {
             put("token", "Bearer " + StpUtil.getTokenValue());
             put("user", user);
         }};
-
         // 保存在线信息
 //        onlineUserService.save(userDto, StpUtil.getTokenValue(), request);
         return ResponseEntity.ok(authInfo);
diff --git a/nladmin-ui/src/utils/request.js b/nladmin-ui/src/utils/request.js
index 77833eb..4136273 100644
--- a/nladmin-ui/src/utils/request.js
+++ b/nladmin-ui/src/utils/request.js
@@ -11,7 +11,8 @@ const baseURLStr = window.g.prod.VUE_APP_BASE_API
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.NODE_ENV === 'production' ? baseURLStr : '/', // api 的 base_url
-  timeout: Config.timeout // 请求超时时间
+  timeout: Config.timeout, // 请求超时时间
+  withCredentials: true
 })
 
 // request拦截器
diff --git a/nladmin-ui/src/views/login.vue b/nladmin-ui/src/views/login.vue
index ba0c1ea..51d2a3a 100644
--- a/nladmin-ui/src/views/login.vue
+++ b/nladmin-ui/src/views/login.vue
@@ -2,7 +2,7 @@
   <div class="login" :style="'background-image:url('+ Background +');'">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-        {{title}}</h3>
+        {{ title }}</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -133,8 +133,13 @@ export default {
             Cookies.remove('rememberMe')
           }
           this.$store.dispatch('Login', user).then(() => {
+            debugger
             this.loading = false
-            this.$router.push({ path: this.redirect || '/' })
+            window.location.href = this.redirect
+            // if (this.redirect === 'http://localhost:8013/dashboard'){
+            //   window.location.href = this.redirect
+            // }
+            // this.$router.push({ path: this.redirect || '/' })
           }).catch(() => {
             this.loading = false
             this.getCode()