From c9edf6a418bfdecd22b4375830be1295b5d2c5d5 Mon Sep 17 00:00:00 2001 From: efren <79289982@qq.com> Date: Thu, 19 Jun 2025 13:59:42 +0800 Subject: [PATCH] IAM --- .../mall/ebtp/extend/iam/client/IamClient.java | 10 +++++----- .../extend/iam/controller/IamAuthController.java | 12 ++++++------ .../iam/entity/{IamToken.java => IamTokenDTO.java} | 2 +- .../data/{IamEmployee.java => IamEmployeeDTO.java} | 2 +- .../entity/data/{IamUser.java => IamUserDTO.java} | 2 +- .../mall/ebtp/extend/iam/service/IamAuthService.java | 10 +++++----- 6 files changed, 19 insertions(+), 19 deletions(-) rename src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/{IamToken.java => IamTokenDTO.java} (93%) rename src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/{IamEmployee.java => IamEmployeeDTO.java} (94%) rename src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/{IamUser.java => IamUserDTO.java} (96%) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/client/IamClient.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/client/IamClient.java index 5891de2..600f9e9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/client/IamClient.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/client/IamClient.java @@ -1,8 +1,8 @@ package com.chinaunicom.mall.ebtp.extend.iam.client; import com.chinaunicom.mall.ebtp.extend.iam.entity.*; -import com.chinaunicom.mall.ebtp.extend.iam.entity.data.IamEmployee; -import com.chinaunicom.mall.ebtp.extend.iam.entity.data.IamUser; +import com.chinaunicom.mall.ebtp.extend.iam.entity.data.IamEmployeeDTO; +import com.chinaunicom.mall.ebtp.extend.iam.entity.data.IamUserDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; @@ -56,7 +56,7 @@ public interface IamClient { * } */ @GetMapping("/sign/login/jwt/employee") - IamAuthResponseDTO employee(@RequestParam("jwt") String jwt); + IamAuthResponseDTO employee(@RequestParam("jwt") String jwt); /** * 获取用户信息接口 @@ -64,7 +64,7 @@ public interface IamClient { * @return IamUserDTO 用户信息 */ @GetMapping("/sign/api/oauth/v20/me") - IamUser me(@RequestHeader("Authorization") String authorization); + IamUserDTO me(@RequestHeader("Authorization") String authorization); /** * code换token @@ -83,6 +83,6 @@ public interface IamClient { * } */ @GetMapping("/sign/authz/oauth/v20/token") - IamToken token(@RequestHeader("Authorization") String authorization, IamTokenRequestDTO request); + IamTokenDTO token(@RequestHeader("Authorization") String authorization, IamTokenRequestDTO request); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/controller/IamAuthController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/controller/IamAuthController.java index 9475136..12a5211 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/controller/IamAuthController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/controller/IamAuthController.java @@ -4,8 +4,8 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.iam.client.BidRatioClient; import com.chinaunicom.mall.ebtp.extend.iam.constant.IamEnum; import com.chinaunicom.mall.ebtp.extend.iam.entity.*; -import com.chinaunicom.mall.ebtp.extend.iam.entity.data.IamEmployee; -import com.chinaunicom.mall.ebtp.extend.iam.entity.data.IamUser; +import com.chinaunicom.mall.ebtp.extend.iam.entity.data.IamEmployeeDTO; +import com.chinaunicom.mall.ebtp.extend.iam.entity.data.IamUserDTO; import com.chinaunicom.mall.ebtp.extend.iam.service.IamAuthService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -73,8 +73,8 @@ public class IamAuthController { */ @ApiOperation("IAM单点登陆 - jwt使用员工号免密登录") @GetMapping("/jwt") - public BaseResponse employee(@RequestParam("jwt") String jwt) { - IamAuthResponseDTO response = iamAuthService.employee(jwt); + public BaseResponse employee(@RequestParam("jwt") String jwt) { + IamAuthResponseDTO response = iamAuthService.employee(jwt); if (Objects.equals(response.getStatusCodeValue(), IamEnum.IAM_RESP_SUCCESS_CODE.getCode())) { return BaseResponse.success(response.getMsg(), response.getData()); } else { @@ -90,7 +90,7 @@ public class IamAuthController { */ @ApiOperation("IAM单点登陆 - 获取用户信息接口") @GetMapping("/getUser") - public BaseResponse getUser(@RequestParam("token") String token){ + public BaseResponse getUser(@RequestParam("token") String token){ return BaseResponse.success(iamAuthService.me(token)); } @@ -102,7 +102,7 @@ public class IamAuthController { */ @ApiOperation("IAM单点登陆 - code换token") @GetMapping("/getTokenByCode") - public BaseResponse getTokenByCode(IamTokenRequestDTO request) { + public BaseResponse getTokenByCode(IamTokenRequestDTO request) { String authorization = ""; return BaseResponse.success(iamAuthService.getToken(authorization, request)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/IamToken.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/IamTokenDTO.java similarity index 93% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/IamToken.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/IamTokenDTO.java index 9161f0e..dfcdc47 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/IamToken.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/IamTokenDTO.java @@ -6,7 +6,7 @@ import lombok.Data; * IAM单点登陆Token令牌实体类 */ @Data -public class IamToken { +public class IamTokenDTO { // 访问令牌 private String access_token; // 刷新令牌 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/IamEmployee.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/IamEmployeeDTO.java similarity index 94% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/IamEmployee.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/IamEmployeeDTO.java index 79a47d1..166112f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/IamEmployee.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/IamEmployeeDTO.java @@ -3,7 +3,7 @@ package com.chinaunicom.mall.ebtp.extend.iam.entity.data; import lombok.Data; @Data -public class IamEmployee { +public class IamEmployeeDTO { private String[] authorities; private String displayName; private String email; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/IamUser.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/IamUserDTO.java similarity index 96% rename from src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/IamUser.java rename to src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/IamUserDTO.java index 48e3b76..b50e70d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/IamUser.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/entity/data/IamUserDTO.java @@ -12,7 +12,7 @@ import java.io.Serializable; @Data @Accessors(chain = true) @ApiModel(value = "IamUser对象", description = "人员基本信息表") -public class IamUser implements Serializable { +public class IamUserDTO implements Serializable { private static final long serialVersionUID = 1L; /** 生日 */ private String birthday; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/service/IamAuthService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/service/IamAuthService.java index 580dd54..fa06277 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/service/IamAuthService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/iam/service/IamAuthService.java @@ -2,8 +2,8 @@ package com.chinaunicom.mall.ebtp.extend.iam.service; import com.chinaunicom.mall.ebtp.extend.iam.client.IamClient; import com.chinaunicom.mall.ebtp.extend.iam.entity.*; -import com.chinaunicom.mall.ebtp.extend.iam.entity.data.IamEmployee; -import com.chinaunicom.mall.ebtp.extend.iam.entity.data.IamUser; +import com.chinaunicom.mall.ebtp.extend.iam.entity.data.IamEmployeeDTO; +import com.chinaunicom.mall.ebtp.extend.iam.entity.data.IamUserDTO; import org.springframework.stereotype.Service; @Service @@ -30,15 +30,15 @@ public class IamAuthService { return iamClient.authorize(request); } - public IamAuthResponseDTO employee(String jwt) { + public IamAuthResponseDTO employee(String jwt) { return iamClient.employee(jwt); } - public IamUser me(String token){ + public IamUserDTO me(String token){ return iamClient.me(token); } - public IamToken getToken(String authorization, IamTokenRequestDTO request) { + public IamTokenDTO getToken(String authorization, IamTokenRequestDTO request) { return iamClient.token(authorization, request); } }