From 95dc030ad8e77303207a1a42a3afd9a7a6612d75 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 03 Jun 2025 18:43:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java b/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
index fed5323..da9d9b8 100644
--- a/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
+++ b/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
@@ -10,6 +10,7 @@
import com.oying.modules.security.service.UserDetailsServiceImpl;
import com.oying.modules.security.service.dto.AuthUserDto;
import com.oying.modules.security.service.dto.JwtUserDto;
+import com.oying.utils.*;
import com.wf.captcha.base.Captcha;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,10 +22,6 @@
import com.oying.annotation.rest.AnonymousPostMapping;
import com.oying.config.properties.RsaProperties;
import com.oying.exception.BadRequestException;
-import com.oying.utils.RsaUtils;
-import com.oying.utils.RedisUtils;
-import com.oying.utils.SecurityUtils;
-import com.oying.utils.StringUtils;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -34,6 +31,7 @@
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
@@ -98,7 +96,7 @@
// 保存在线信息
onlineUserService.save(jwtUser, token, request);
// 返回登录信息
- return ResponseEntity.ok(authInfo);
+ return ResponseEntity.ok(R.success(authInfo));
}
@ApiOperation("临时授权")
@@ -118,14 +116,14 @@
// 保存在线信息
onlineUserService.save(jwtUser, token, request);
// 返回登录信息
- return ResponseEntity.ok(authInfo);
+ return ResponseEntity.ok(R.success(authInfo));
}
@ApiOperation("获取用户信息")
@GetMapping(value = "/info")
- public ResponseEntity<UserDetails> getUserInfo() {
+ public ResponseEntity<Object> getUserInfo() {
JwtUserDto jwtUser = (JwtUserDto) SecurityUtils.getCurrentUser();
- return ResponseEntity.ok(jwtUser);
+ return ResponseEntity.ok(R.success(jwtUser));
}
@ApiOperation("获取验证码")
@@ -146,7 +144,7 @@
put("img", captcha.toBase64());
put("uuid", uuid);
}};
- return ResponseEntity.ok(imgResult);
+ return ResponseEntity.ok(R.success(imgResult));
}
@ApiOperation("退出登录")
@@ -154,6 +152,6 @@
public ResponseEntity<Object> logout(HttpServletRequest request) {
String token = tokenProvider.getToken(request);
onlineUserService.logout(token);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
--
Gitblit v1.9.3