只在controller层用reactive

spring5-auth/spring5-auth-server/src/main/java/com/yaozhitech/spring5/controller/LoginController.java

@@ -1,6 +1,5 @@
 package com.yaozhitech.spring5.controller;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.shiro.SecurityUtils;
@@ -10,18 +9,19 @@ import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.yaozhitech.spring5.dto.UserDto;
 import com.yaozhitech.spring5.service.UserService;
 
 import lombok.extern.slf4j.Slf4j;
+import reactor.core.publisher.Mono;
 
 @Slf4j
-@Controller
+@RestController
 public class LoginController {
 
 	@Autowired
@@ -34,18 +34,18 @@ public class LoginController {
 	 * @return token
 	 */
 	@PostMapping(value = "/login")
-	public ResponseEntity<Void> login(@RequestBody UserDto loginInfo, HttpServletRequest request,
-			HttpServletResponse response) {
+	public ResponseEntity<Mono<UserDto>> login(@RequestBody UserDto loginInfo, HttpServletResponse response) {
 		Subject subject = SecurityUtils.getSubject();
 		try {
 			UsernamePasswordToken token = new UsernamePasswordToken(loginInfo.getUsername(), loginInfo.getPassword());
 			subject.login(token);
-
 			UserDto user = (UserDto) subject.getPrincipal();
-			String newToken = userService.generateJwtToken(user.getUsername());
-			response.setHeader("x-auth-token", newToken);
-
-			return ResponseEntity.ok().build();
+			
+			Mono<UserDto> userMono = Mono.just(user).map(u -> {return userService.generateJwtToken(user.getUsername());})
+						   .doOnNext(u -> {response.setHeader("x-auth-token", u);})
+						   .map(u -> {return userService.getJwtTokenInfo(loginInfo.getUsername());});
+			
+			return ResponseEntity.ok(userMono);
 		} catch (AuthenticationException e) {
 			log.error("User {} login fail, Reason:{}", loginInfo.getUsername(), e.getMessage());
 			return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
@@ -60,13 +60,14 @@ public class LoginController {
 	 * @return
 	 */
 	@GetMapping(value = "/logout")
-	public ResponseEntity<Void> logout() {
+	public Mono<String> logout() {
 		Subject subject = SecurityUtils.getSubject();
 		if (subject.getPrincipals() != null) {
 			UserDto user = (UserDto) subject.getPrincipals().getPrimaryPrincipal();
 			userService.deleteLoginInfo(user.getUsername());
 		}
 		SecurityUtils.getSubject().logout();
-		return ResponseEntity.ok().build();
+		return Mono.empty();
 	}
+	
 }

spring5-auth/spring5-auth-server/src/main/java/com/yaozhitech/spring5/service/UserService.java

@@ -7,14 +7,12 @@ import java.util.List;
 import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import com.yaozhitech.spring5.dto.UserDto;
 import com.yaozhitech.spring5.utils.JwtUtils;
 
-import reactor.core.publisher.Mono;
-
 @Service
 public class UserService {
 
@@ -22,7 +20,7 @@ public class UserService {
 	private String encryptSalt;
 
 	@Autowired
-	private ReactiveStringRedisTemplate redisTemplate;
+	private StringRedisTemplate redisTemplate;
 
 	/**
 	 * 保存user登录信息，返回token
@@ -31,7 +29,7 @@ public class UserService {
 	 */
 	public String generateJwtToken(String username) {
 		String salt = JwtUtils.generateSalt();
-		redisTemplate.opsForValue().set("token:"+username, salt, Duration.ofSeconds(3600)).block();
+		redisTemplate.opsForValue().set("token:"+username, salt, Duration.ofSeconds(3600));
 		return JwtUtils.sign(username, salt, 3600); // 生成jwt token，设置过期时间为1小时
 	}
 
@@ -42,9 +40,9 @@ public class UserService {
 	 * @return
 	 */
 	public UserDto getJwtTokenInfo(String username) {
-		Mono<String> salt = redisTemplate.opsForValue().get("token:"+username);
+		String salt = redisTemplate.opsForValue().get("token:"+username);
 		UserDto user = getUserInfo(username);
-		user.setSalt(salt.block());
+		user.setSalt(salt);
 		return user;
 	}