From 006a6c63cd9e6009a12cf6438bd139c4720c46e1 Mon Sep 17 00:00:00 2001 From: smallbun <2689170096@qq.com> Date: Wed, 8 Feb 2023 16:03:40 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20CAS=E5=8D=8F=E8=AE=AE=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CasStandardApplicationServiceImpl.java | 39 +++++++++---------- .../cas/pojo/AppCasProtocolEndpoint.java | 7 ++-- .../pojo/AppCasStandardConfigGetResult.java | 5 +-- .../pojo/AppCasStandardSaveConfigParam.java | 28 +++++++------ 4 files changed, 37 insertions(+), 42 deletions(-) diff --git a/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/CasStandardApplicationServiceImpl.java b/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/CasStandardApplicationServiceImpl.java index 1cb0b4e6..f0b45ffd 100644 --- a/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/CasStandardApplicationServiceImpl.java +++ b/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/CasStandardApplicationServiceImpl.java @@ -49,25 +49,7 @@ import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKN */ @Component public class CasStandardApplicationServiceImpl extends AbstractCasApplicationService { - private final Logger logger = LoggerFactory - .getLogger(CasStandardApplicationServiceImpl.class); - - /** - * AppCasConfigRepository - */ - protected final AppCasConfigRepository appCasConfigRepository; - - public CasStandardApplicationServiceImpl(AppCertRepository appCertRepository, - AppAccountRepository appAccountRepository, - AppAccessPolicyRepository appAccessPolicyRepository, - AppRepository appRepository, - AppCasConfigRepository appCasConfigRepository, - AppCasStandardConfigConverter casStandardConfigConverter) { - super(appCertRepository, appAccountRepository, appAccessPolicyRepository, appRepository, - appCasConfigRepository); - this.appCasConfigRepository = appCasConfigRepository; - this.casStandardConfigConverter = casStandardConfigConverter; - } + private final Logger logger = LoggerFactory.getLogger(CasStandardApplicationServiceImpl.class); /** * 更新应用配置 @@ -114,7 +96,7 @@ public class CasStandardApplicationServiceImpl extends AbstractCasApplicationSer throw new AppNotExistException(); } AppCasConfigEntity entity = cas.get(); - entity.setClientServiceUrl(model.getClientServerUrl()); + entity.setClientServiceUrl(model.getClientServiceUrl()); entity.setUserIdentityType(model.getUserIdentityType()); entity.setServiceTicketExpireTime(model.getServiceTicketExpireTime()); appCasConfigRepository.save(entity); @@ -237,4 +219,21 @@ public class CasStandardApplicationServiceImpl extends AbstractCasApplicationSer private final AppCasStandardConfigConverter casStandardConfigConverter; + /** + * AppCasConfigRepository + */ + protected final AppCasConfigRepository appCasConfigRepository; + + public CasStandardApplicationServiceImpl(AppCertRepository appCertRepository, + AppAccountRepository appAccountRepository, + AppAccessPolicyRepository appAccessPolicyRepository, + AppRepository appRepository, + AppCasConfigRepository appCasConfigRepository, + AppCasStandardConfigConverter casStandardConfigConverter) { + super(appCertRepository, appAccountRepository, appAccessPolicyRepository, appRepository, + appCasConfigRepository); + this.appCasConfigRepository = appCasConfigRepository; + this.casStandardConfigConverter = casStandardConfigConverter; + } + } diff --git a/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/pojo/AppCasProtocolEndpoint.java b/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/pojo/AppCasProtocolEndpoint.java index adf3b497..7f6e4653 100644 --- a/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/pojo/AppCasProtocolEndpoint.java +++ b/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/pojo/AppCasProtocolEndpoint.java @@ -17,12 +17,11 @@ */ package cn.topiam.employee.application.cas.pojo; -import java.io.Serial; -import java.io.Serializable; - +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; +import java.io.Serial; +import java.io.Serializable; /** * 协议端点域 diff --git a/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/pojo/AppCasStandardConfigGetResult.java b/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/pojo/AppCasStandardConfigGetResult.java index b33aca7a..807ce0e8 100644 --- a/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/pojo/AppCasStandardConfigGetResult.java +++ b/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/pojo/AppCasStandardConfigGetResult.java @@ -20,11 +20,9 @@ package cn.topiam.employee.application.cas.pojo; import cn.topiam.employee.common.enums.app.AuthorizationType; import cn.topiam.employee.common.enums.app.CasUserIdentityType; import cn.topiam.employee.common.enums.app.InitLoginType; - import io.swagger.v3.oas.annotations.Parameter; -import lombok.Data; - import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; /** * @author TopIAM @@ -73,6 +71,7 @@ public class AppCasStandardConfigGetResult { /** * serviceTicket 过期时间（秒） */ + @Schema(name = "serviceTicket 过期时间（秒）") private Integer serviceTicketExpireTime; /** * CAS 协议端点 diff --git a/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/pojo/AppCasStandardSaveConfigParam.java b/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/pojo/AppCasStandardSaveConfigParam.java index 6c457c73..89581305 100644 --- a/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/pojo/AppCasStandardSaveConfigParam.java +++ b/eiam-application/eiam-application-cas/src/main/java/cn/topiam/employee/application/cas/pojo/AppCasStandardSaveConfigParam.java @@ -17,16 +17,14 @@ */ package cn.topiam.employee.application.cas.pojo; -import java.io.Serial; -import java.io.Serializable; - import cn.topiam.employee.common.enums.app.AuthorizationType; import cn.topiam.employee.common.enums.app.CasUserIdentityType; import cn.topiam.employee.common.enums.app.InitLoginType; - +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; +import java.io.Serial; +import java.io.Serializable; /** * @author TopIAM @@ -56,20 +54,20 @@ public class AppCasStandardSaveConfigParam implements Serializable { private String initLoginUrl; /** - * CAS 用户身份类型 + * 客户端服务URL */ - @Schema(name = "CAS 用户身份类型") + @Schema(name = "客户端服务URL") + private String clientServiceUrl; + + /** + * 用户身份类型标识 + */ + @Schema(name = "用户身份类型标识") private CasUserIdentityType userIdentityType; /** - * 单点登录 SP 回调地址 + * serviceTicket 过期时间（秒） */ - @Schema(name = "客户端服务URL") - private String clientServerUrl; - - /** - * serviceTicket过期时间 - */ - @Schema(name = "serviceTicket过期时间") + @Schema(name = "serviceTicket 过期时间（秒）") private Integer serviceTicketExpireTime; }