Browse Source

第三方登陆代码微调

dev
jianjun 5 years ago
parent
commit
cbcd65cb08
  1. 2
      epmet-auth/src/main/java/com/epmet/controller/SsoController.java
  2. 10
      epmet-auth/src/main/java/com/epmet/dto/form/SsoLoginOperFormDTO.java
  3. 3
      epmet-auth/src/main/java/com/epmet/service/SsoService.java
  4. 2
      epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java
  5. 11
      epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/pyld/PyldApiService.java

2
epmet-auth/src/main/java/com/epmet/controller/SsoController.java

@ -51,7 +51,7 @@ public class SsoController {
@PostMapping("oper/third/login") @PostMapping("oper/third/login")
public Result<UserTokenResultDTO> thirdLoginOper(@RequestBody SsoLoginOperFormDTO formDTO) { public Result<UserTokenResultDTO> thirdLoginOper(@RequestBody SsoLoginOperFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, SsoLoginOperFormDTO.ThirdPlatformLoginForm.class); ValidatorUtils.validateEntity(formDTO, SsoLoginOperFormDTO.ThirdPlatformLoginForm.class);
return new Result<UserTokenResultDTO>().ok(ssoService.thirdLoginOper(formDTO)); return new Result<UserTokenResultDTO>().ok(ssoService.thirdLoginOperWork(formDTO));
} }
@PostMapping("test") @PostMapping("test")

10
epmet-auth/src/main/java/com/epmet/dto/form/SsoLoginOperFormDTO.java

@ -3,17 +3,15 @@ package com.epmet.dto.form;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/** /**
* @Author zxc * @Author zxc
* @DateTime 2021/1/18 下午4:43 * @DateTime 2021/1/18 下午4:43
*/ */
@Data @Data
public class SsoLoginOperFormDTO extends LoginCommonFormDTO implements Serializable { public class SsoLoginOperFormDTO extends LoginCommonFormDTO {
private static final long serialVersionUID = -4215746830030486659L;
private static final long serialVersionUID = 8711491709544498082L;
public interface ThirdPlatformLoginForm { public interface ThirdPlatformLoginForm {
} }
@ -25,10 +23,10 @@ public class SsoLoginOperFormDTO extends LoginCommonFormDTO implements Serializa
private String thirdToken; private String thirdToken;
/** /**
* 上游系统token * 上游系统标识
* *
* @see com.epmet.enums.ThirdPlatformEnum * @see com.epmet.enums.ThirdPlatformEnum
*/ */
@NotBlank(message = "token不能为空", groups = {ThirdPlatformLoginForm.class}) @NotBlank(message = "平台标识不能为空", groups = {ThirdPlatformLoginForm.class})
private String platform; private String platform;
} }

3
epmet-auth/src/main/java/com/epmet/service/SsoService.java

@ -33,6 +33,7 @@ public interface SsoService {
* @Description 4自动进入组织-返回token * @Description 4自动进入组织-返回token
**/ **/
UserTokenResultDTO enterOrg(SsoEnteOrgFormDTO formDTO); UserTokenResultDTO enterOrg(SsoEnteOrgFormDTO formDTO);
/** /**
* desc: sso登陆运营端 * desc: sso登陆运营端
* *
@ -41,5 +42,5 @@ public interface SsoService {
* @author LiuJanJun * @author LiuJanJun
* @date 2021/2/24 1:28 下午 * @date 2021/2/24 1:28 下午
*/ */
UserTokenResultDTO thirdLoginOper(SsoLoginOperFormDTO formDTO); UserTokenResultDTO thirdLoginOperWork(SsoLoginOperFormDTO formDTO);
} }

2
epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java

@ -133,7 +133,7 @@ public class SsoServiceImpl implements SsoService {
} }
@Override @Override
public UserTokenResultDTO thirdLoginOper(SsoLoginOperFormDTO formDTO) { public UserTokenResultDTO thirdLoginOperWork(SsoLoginOperFormDTO formDTO) {
ThirdPlatUserInfo thirdUser; ThirdPlatUserInfo thirdUser;
try { try {
ThirdPlatformEnum platformEnum = ThirdPlatformEnum.getEnum(formDTO.getPlatform()); ThirdPlatformEnum platformEnum = ThirdPlatformEnum.getEnum(formDTO.getPlatform());

11
epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/pyld/PyldApiService.java

@ -22,6 +22,12 @@ import java.nio.charset.StandardCharsets;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
/**
* desc: 平阴联动指挥平台sso登陆服务类 接入文档http://note.youdao.com/noteshare?id=167ad65365f9eccf7925e8c2629d2021&sub=555AE50510344CB5AACD5C06B9AA3B3B
*
* @author LiuJanJun
* @date 2021/2/25 1:43 下午
*/
@Service @Service
public class PyldApiService extends AbstractApiService { public class PyldApiService extends AbstractApiService {
@ -59,9 +65,7 @@ public class PyldApiService extends AbstractApiService {
buildHeaders()); buildHeaders());
logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口返回:{}", result.getData()); logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口返回:{}", result.getData());
logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口结束<<<<<<<<<<<<"); logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口结束<<<<<<<<<<<<");
PyldUserInfoResultDTO resultDTO = this.parseResult(result); PyldUserInfoResultDTO resultDTO = this.parseResult(result);
ThirdPlatUserInfo userInfo = new ThirdPlatUserInfo(); ThirdPlatUserInfo userInfo = new ThirdPlatUserInfo();
@ -71,7 +75,6 @@ public class PyldApiService extends AbstractApiService {
} }
/** /**
* 构建请求头信息 * 构建请求头信息
* *
@ -117,6 +120,4 @@ public class PyldApiService extends AbstractApiService {
} }
return userInfo; return userInfo;
} }
} }

Loading…
Cancel
Save