From 26406ebc388da12b98554806dbe47fed9a014080 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 06 May 2024 21:32:49 +0800
Subject: [PATCH] 关闭security 配置修改,登录页面跳转调整

---
 blade-auth/src/main/java/org/springblade/auth/config/SecurityConfiguration.java |    4 ++--
 blade-auth/src/main/resources/application.yml                                   |    1 +
 blade-auth/src/main/java/org/springblade/auth/endpoint/BladeTokenEndPoint.java  |    8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/blade-auth/src/main/java/org/springblade/auth/config/SecurityConfiguration.java b/blade-auth/src/main/java/org/springblade/auth/config/SecurityConfiguration.java
index ec68cc2..6289dd8 100644
--- a/blade-auth/src/main/java/org/springblade/auth/config/SecurityConfiguration.java
+++ b/blade-auth/src/main/java/org/springblade/auth/config/SecurityConfiguration.java
@@ -53,8 +53,8 @@
 	@Override
 	@SneakyThrows
 	protected void configure(HttpSecurity http) {
-//		http.headers().frameOptions().disable();
-//		http.httpBasic().and().csrf().disable();
+		http.headers().frameOptions().disable();
+		http.csrf().disable();
 		http.formLogin().loginPage("/oauth/login").loginProcessingUrl("/oauth/form");
 	}
 
diff --git a/blade-auth/src/main/java/org/springblade/auth/endpoint/BladeTokenEndPoint.java b/blade-auth/src/main/java/org/springblade/auth/endpoint/BladeTokenEndPoint.java
index bbdeccb..0068bca 100644
--- a/blade-auth/src/main/java/org/springblade/auth/endpoint/BladeTokenEndPoint.java
+++ b/blade-auth/src/main/java/org/springblade/auth/endpoint/BladeTokenEndPoint.java
@@ -18,6 +18,7 @@
 
 import com.wf.captcha.SpecCaptcha;
 import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.cache.CacheNames;
 import org.springblade.core.cache.utils.CacheUtil;
@@ -43,6 +44,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.time.Duration;
 
@@ -67,10 +69,10 @@
 	/**
 	 * 登录页面
 	 */
+	@SneakyThrows
 	@GetMapping("/oauth/login")
-	public ModelAndView require(ModelAndView model) {
-		model.setViewName("login");
-		return model;
+	public void require(HttpServletResponse response) {
+		response.sendRedirect("http://localhost:1888/");
 	}
 
 	/**
diff --git a/blade-auth/src/main/resources/application.yml b/blade-auth/src/main/resources/application.yml
index da4351d..6f7264b 100644
--- a/blade-auth/src/main/resources/application.yml
+++ b/blade-auth/src/main/resources/application.yml
@@ -145,6 +145,7 @@
       - /menu/top-menu
       - /blade-auth/**
       - /tenant/info
+      - /oauth/form
     #授权认证配置
     auth:
       - method: ALL

--
Gitblit v1.9.3