From 8874c90db2c238fa4c55df491675fe7fec9d93b2 Mon Sep 17 00:00:00 2001
From: fine <54142345+criver31@users.noreply.github.com>
Date: 星期二, 09 一月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java b/src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java
index 2064470..ab85c45 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java
@@ -1,37 +1,44 @@
package com.genersoft.iot.vmp.conf.security;
-import com.alibaba.fastjson.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.conf.security.dto.JwtUser;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import org.springframework.http.MediaType;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
/**
* 澶勭悊鍖垮悕鐢ㄦ埛璁块棶閫昏緫
+ * @author lin
*/
@Component
-public class AnonymousAuthenticationEntryPoint implements AuthenticationEntryPoint {
-
- private final static Logger logger = LoggerFactory.getLogger(DefaultUserDetailsServiceImpl.class);
+public class AnonymousAuthenticationEntryPoint implements AuthenticationEntryPoint {
@Override
public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) {
- logger.debug("鐢ㄦ埛闇�瑕佺櫥褰曪紝璁块棶[{}]澶辫触锛孉uthenticationException=[{}]", request.getRequestURI(), e.getMessage());
- // 鍏佽璺ㄥ煙
- response.setHeader("Access-Control-Allow-Origin", "*");
- // 鍏佽鑷畾涔夎姹傚ごtoken(鍏佽head璺ㄥ煙)
- response.setHeader("Access-Control-Allow-Headers", "token, Accept, Origin, X-Requested-With, Content-Type, Last-Modified");
- response.setHeader("Content-type", "application/json;charset=UTF-8");
+ String jwt = request.getHeader(JwtUtils.getHeader());
+ JwtUser jwtUser = JwtUtils.verifyToken(jwt);
+ String username = jwtUser.getUserName();
+ UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, jwtUser.getPassword() );
+ SecurityContextHolder.getContext().setAuthentication(token);
JSONObject jsonObject = new JSONObject();
- jsonObject.put("msg", e.getMessage());
- jsonObject.put("code", "-1");
+ jsonObject.put("code", ErrorCode.ERROR401.getCode());
+ jsonObject.put("msg", ErrorCode.ERROR401.getMsg());
+ String logUri = "api/user/login";
+ if (request.getRequestURI().contains(logUri)){
+ jsonObject.put("msg", e.getMessage());
+ }
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+ response.setCharacterEncoding(StandardCharsets.UTF_8.name());
try {
response.getWriter().print(jsonObject.toJSONString());
} catch (IOException ioException) {
--
Gitblit v1.8.0