From 5fab97cf7e49636d446e063ee6e0eea80c124bd2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 15 三月 2023 19:05:56 +0800
Subject: [PATCH] 支持不同域的前后端分离部署
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
index 6ebb756..035f380 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.vmanager.user;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.conf.security.SecurityUtils;
import com.genersoft.iot.vmp.conf.security.dto.LoginUser;
import com.genersoft.iot.vmp.service.IRoleService;
@@ -11,24 +12,21 @@
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
-
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.util.DigestUtils;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.security.sasl.AuthenticationException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
@Tag(name = "鐢ㄦ埛绠＄悊")
-@CrossOrigin
@RestController
@RequestMapping("/api/user")
public class UserController {
@@ -47,8 +45,8 @@
@Operation(summary = "鐧诲綍")
@Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
@Parameter(name = "password", description = "瀵嗙爜锛�32浣峬d5鍔犲瘑锛�", required = true)
- public LoginUser login(@RequestParam String username, @RequestParam String password){
- LoginUser user = null;
+ public LoginUser login(HttpServletRequest request, HttpServletResponse response, @RequestParam String username, @RequestParam String password){
+ LoginUser user;
try {
user = SecurityUtils.login(username, password, authenticationManager);
} catch (AuthenticationException e) {
@@ -56,9 +54,31 @@
}
if (user == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
+ }else {
+ String jwt = JwtUtils.createToken(username, password);
+ response.setHeader(JwtUtils.getHeader(), jwt);
}
return user;
}
+
+// @GetMapping("/logout")
+// @PostMapping("/logout")
+// @Operation(summary = "鐧诲嚭")
+// public LoginUser logout(){
+// LoginUser user;
+// try {
+// user = SecurityUtils.login(username, password, authenticationManager);
+// } catch (AuthenticationException e) {
+// throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
+// }
+// if (user == null) {
+// throw new ControllerException(ErrorCode.ERROR100.getCode(), "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
+// }else {
+// String jwt = JwtUtils.createToken(username, password);
+// response.setHeader(JwtUtils.getHeader(), jwt);
+// }
+// return user;
+// }
@PostMapping("/changePassword")
@Operation(summary = "淇敼瀵嗙爜")
@@ -90,7 +110,7 @@
@PostMapping("/add")
- @Operation(summary = "鍋滄瑙嗛鍥炴斁")
+ @Operation(summary = "娣诲姞鐢ㄦ埛")
@Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
@Parameter(name = "password", description = "瀵嗙爜锛堟湭md5鍔犲瘑鐨勫瘑鐮侊級", required = true)
@Parameter(name = "roleId", description = "瑙掕壊ID", required = true)
--
Gitblit v1.8.0