fix
This commit is contained in:
parent
a8c8682920
commit
7886ec3267
@ -1,6 +1,7 @@
|
|||||||
package com.knowledge.base.infrastructure.north.controller;
|
package com.knowledge.base.infrastructure.north.controller;
|
||||||
|
|
||||||
import com.knowledge.base.application.service.UserAppService;
|
import com.knowledge.base.application.service.UserAppService;
|
||||||
|
import com.knowledge.base.infrastructure.config.ConstantConfig;
|
||||||
import com.knowledge.base.infrastructure.north.dto.role.UserRoleDTO;
|
import com.knowledge.base.infrastructure.north.dto.role.UserRoleDTO;
|
||||||
import com.knowledge.base.infrastructure.north.dto.user.UserDTO;
|
import com.knowledge.base.infrastructure.north.dto.user.UserDTO;
|
||||||
import com.knowledge.base.infrastructure.north.dto.user.UserTokenDTO;
|
import com.knowledge.base.infrastructure.north.dto.user.UserTokenDTO;
|
||||||
@ -21,7 +22,7 @@ public class UserQueryController {
|
|||||||
|
|
||||||
@GetMapping("/check")
|
@GetMapping("/check")
|
||||||
public ResponseEntity<?> check(
|
public ResponseEntity<?> check(
|
||||||
@CookieValue(value = "token", required = false) String cookieToken,
|
@CookieValue(value = ConstantConfig.COOKIE_KEY, required = false) String cookieToken,
|
||||||
@RequestHeader(value = "Authorization", required = false) String headerToken
|
@RequestHeader(value = "Authorization", required = false) String headerToken
|
||||||
) {
|
) {
|
||||||
String token = headerToken != null ? headerToken : cookieToken;
|
String token = headerToken != null ? headerToken : cookieToken;
|
||||||
@ -33,7 +34,7 @@ public class UserQueryController {
|
|||||||
|
|
||||||
@GetMapping("/username")
|
@GetMapping("/username")
|
||||||
public ResponseEntity<?> getUsernameByToken(
|
public ResponseEntity<?> getUsernameByToken(
|
||||||
@CookieValue(value = "token", required = false) String cookieToken,
|
@CookieValue(value = ConstantConfig.COOKIE_KEY, required = false) String cookieToken,
|
||||||
@RequestHeader(value = "Authorization", required = false) String headerToken
|
@RequestHeader(value = "Authorization", required = false) String headerToken
|
||||||
) {
|
) {
|
||||||
String token = headerToken != null ? headerToken : cookieToken;
|
String token = headerToken != null ? headerToken : cookieToken;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user