tieshengkeji/tiesheng-springboot
1
1
Fork 0
Code Pull Requests Actions Packages Releases Activity

perf：调整授权登录

Browse Source
This commit is contained in:
曾文豪
2023-01-11 15:46:02 +08:00
parent 82c8e3f474
commit 7d454e9c62
4 changed files with 51 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java
View File

@@ -54,8 +54,8 @@ public class LoginController {
@TokenIgnore
public void uniqueIndex(UniqueIndexDTO dto, HttpServletResponse response) {
TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo("unique_index_web",
dto.getNo(), "web", dto.getTo(), dto.getInfo()));
tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getTo(), dto.getExtra(), response);
dto.getNo(), "web", dto.getDefaultTo(), dto.getInfo()));
tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getDefaultTo(), dto.getExtra(), response);
}
@@ -69,7 +69,7 @@ public class LoginController {
@TokenIgnore
public ApiResp<String> uniqueIndex(@RequestBody UniqueIndexDTO dto) {
TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo("unique_index_web",
dto.getNo(), "web", dto.getTo(), dto.getInfo()));
dto.getNo(), "web", dto.getDefaultTo(), dto.getInfo()));
if (tokenBean == null) {
throw new ApiException("登录失败");
}
@@ -118,9 +118,9 @@ public class LoginController {
String ddUserId = platformDingConfig.getUserIdByCode(service, dto.getCode());
DingUserInfo dingUserInfo = platformDingConfig.topapiV2UserGet(service, ddUserId);
TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo(dingUserInfo.getAppId(),
dingUserInfo.getUserid(), "ding", dto.getTo(),
dingUserInfo.getUserid(), "ding", dto.getDefaultTo(),
JSON.toJSONString(dingUserInfo)));
tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getTo(), dto.getExtra(), response);
tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getDefaultTo(), dto.getExtra(), response);
}
@@ -168,8 +168,8 @@ public class LoginController {
public void wxmpOauth2(@PathVariable String service, CodeExtraDTO dto, HttpServletResponse response) {
WxUserInfo wxUserInfo = platformWxmpConfig.getOAuth2AccessToken(service, dto.getCode());
TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo(wxUserInfo.getAppId(),
wxUserInfo.getOpenid(), "wxmp", dto.getTo(), JSON.toJSONString(wxUserInfo)));
tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getTo(), dto.getExtra(), response);
wxUserInfo.getOpenid(), "wxmp", dto.getDefaultTo(), JSON.toJSONString(wxUserInfo)));
tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getDefaultTo(), dto.getExtra(), response);
}

10
springboot-login/src/main/java/com/tiesheng/login/pojos/CodeExtraDTO.java
View File

@@ -1,10 +1,9 @@
package com.tiesheng.login.pojos;
public class CodeExtraDTO {
public class CodeExtraDTO extends LoginToInfo {
private String code;
private String extra;
private String to;
///////////////////////////////////////////////////////////////////////////
// setter\getter
@@ -26,11 +25,4 @@ public class CodeExtraDTO {
this.extra = extra;
}
public String getTo() {
return to;
}
public void setTo(String to) {
this.to = to;
}
}

42
springboot-login/src/main/java/com/tiesheng/login/pojos/LoginToInfo.java Normal file
View File

@@ -0,0 +1,42 @@
package com.tiesheng.login.pojos;
import cn.hutool.core.util.StrUtil;
public class LoginToInfo {
private String to;
/**
* 获取默认的去往目的地
*
* @param def
* @return
*/
public String getDefaultTo(String def) {
if (StrUtil.isEmpty(getTo())) {
return def;
}
return getTo();
}
/**
* 获取默认的去往目的地
*
* @return
*/
public String getDefaultTo() {
return getDefaultTo("mobile");
}
///////////////////////////////////////////////////////////////////////////
// setter\getter
///////////////////////////////////////////////////////////////////////////
public String getTo() {
return to;
}
public void setTo(String to) {
this.to = to;
}
}

11
springboot-login/src/main/java/com/tiesheng/login/pojos/UniqueIndexDTO.java
View File

@@ -2,10 +2,9 @@ package com.tiesheng.login.pojos;
import cn.hutool.core.util.StrUtil;
public class UniqueIndexDTO {
public class UniqueIndexDTO extends LoginToInfo {
private String no;
private String to;
private String extra;
private String info;
@@ -21,14 +20,6 @@ public class UniqueIndexDTO {
this.no = no;
}
public String getTo() {
return to;
}
public void setTo(String to) {
this.to = to;
}
public String getExtra() {
if (StrUtil.isEmpty(extra)) {
extra = "";