|
|
@@ -12,6 +12,8 @@ import com.xunmei.common.security.auth.AuthUtil;
|
|
|
import com.xunmei.common.security.service.TokenService;
|
|
|
import com.xunmei.common.security.utils.SecurityUtils;
|
|
|
import com.xunmei.system.api.model.LoginUser;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
@@ -19,6 +21,7 @@ import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.validation.constraints.NotEmpty;
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* token 控制
|
|
|
@@ -36,6 +39,7 @@ public class TokenController {
|
|
|
@Autowired
|
|
|
private FJNXLoginService fjnxLoginService;
|
|
|
|
|
|
+ private static final Logger logger = LoggerFactory.getLogger(TokenController.class);
|
|
|
@PostMapping("login")
|
|
|
public R<?> login(@RequestBody LoginBody form) {
|
|
|
|
|
|
@@ -137,6 +141,7 @@ public class TokenController {
|
|
|
public R<?> tokenLogin(@RequestParam @NotEmpty String token, @RequestParam @NotNull String loginType) {
|
|
|
|
|
|
try {
|
|
|
+ logger.info("token登录:1、请求进入。token:{}",token);
|
|
|
String username = "";
|
|
|
if(Constants.LOGIN_TYPE_0.equals(loginType)){
|
|
|
username = fjnxLoginService.getUserByAppToken(token);
|
|
|
@@ -145,14 +150,15 @@ public class TokenController {
|
|
|
if(Constants.LOGIN_TYPE_1.equals(loginType)){
|
|
|
username = fjnxLoginService.getUserByWebToken(token);
|
|
|
}
|
|
|
-
|
|
|
+ logger.info("token登录:4、token验证且返回账号。token:{}",token);
|
|
|
if(StringUtils.isNotEmpty(username)){
|
|
|
LoginUser userInfo = loginService.loginToken(username, loginType);
|
|
|
if(userInfo == null){
|
|
|
return R.fail("无效的用户数据");
|
|
|
}
|
|
|
-
|
|
|
- return R.ok(tokenService.createToken(userInfo));
|
|
|
+ Map<String, Object> systemToken = tokenService.createToken(userInfo);
|
|
|
+ logger.info("token登录:5、生成系统自身Token完成,token:{}",token);
|
|
|
+ return R.ok(systemToken);
|
|
|
}else{
|
|
|
return R.fail("无效的token");
|
|
|
}
|