public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-14 12:32:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

getAppDetails rename to get & cached load

Browse Source
This commit is contained in:
MaxKey
2026-04-09 21:26:36 +08:00
parent 82f5617775
commit 21231b58ec
25 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java
View File

@@ -22,5 +22,5 @@ import org.dromara.mybatis.jpa.service.IJpaService;
public interface AppsCasDetailsService extends IJpaService<AppsCasDetails>{ public interface AppsCasDetailsService extends IJpaService<AppsCasDetails>{
public AppsCasDetails getAppDetails(String id , boolean cached) ; public AppsCasDetails get(String id , boolean cached) ;
} }

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java
View File

@@ -22,5 +22,5 @@ import org.dromara.mybatis.jpa.service.IJpaService;
public interface AppsFormBasedDetailsService extends IJpaService<AppsFormBasedDetails>{ public interface AppsFormBasedDetailsService extends IJpaService<AppsFormBasedDetails>{
public AppsFormBasedDetails getAppDetails(String id,boolean cached) ; public AppsFormBasedDetails get(String id,boolean cached) ;
} }

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java
View File

@@ -22,5 +22,5 @@ import org.dromara.mybatis.jpa.service.IJpaService;
public interface AppsJwtDetailsService extends IJpaService<AppsJwtDetails>{ public interface AppsJwtDetailsService extends IJpaService<AppsJwtDetails>{
public AppsJwtDetails getAppDetails(String id , boolean cached) ; public AppsJwtDetails get(String id , boolean cached) ;
} }

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java
View File

@@ -22,5 +22,5 @@ import org.dromara.mybatis.jpa.service.IJpaService;
public interface AppsSaml20DetailsService extends IJpaService<AppsSAML20Details>{ public interface AppsSaml20DetailsService extends IJpaService<AppsSAML20Details>{
public AppsSAML20Details getAppDetails(String id , boolean cached); public AppsSAML20Details get(String id , boolean cached);
} }

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java
View File

@@ -22,5 +22,5 @@ import org.dromara.mybatis.jpa.service.IJpaService;
public interface AppsTokenBasedDetailsService extends IJpaService<AppsTokenBasedDetails>{ public interface AppsTokenBasedDetailsService extends IJpaService<AppsTokenBasedDetails>{
public AppsTokenBasedDetails getAppDetails(String id , boolean cached) ; public AppsTokenBasedDetails get(String id , boolean cached) ;
} }

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsCasDetailsServiceImpl.java
View File

@@ -37,7 +37,7 @@ public class AppsCasDetailsServiceImpl extends JpaServiceImpl<AppsCasDetailsMap
.maximumSize(200000) .maximumSize(200000)
.build(); .build();
public AppsCasDetails getAppDetails(String id , boolean cached) { public AppsCasDetails get(String id , boolean cached) {
AppsCasDetails details = null; AppsCasDetails details = null;
if(cached) { if(cached) {
details = detailsCache.getIfPresent(id); details = detailsCache.getIfPresent(id);

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsFormBasedDetailsServiceImpl.java
View File

@@ -37,7 +37,7 @@ public class AppsFormBasedDetailsServiceImpl extends JpaServiceImpl<AppsFormBas
.maximumSize(200000) .maximumSize(200000)
.build(); .build();
public AppsFormBasedDetails getAppDetails(String id,boolean cached) { public AppsFormBasedDetails get(String id,boolean cached) {
AppsFormBasedDetails details = null; AppsFormBasedDetails details = null;
if(cached) { if(cached) {
details = detailsCache.getIfPresent(id); details = detailsCache.getIfPresent(id);

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsJwtDetailsServiceImpl.java
View File

@@ -38,7 +38,7 @@ public class AppsJwtDetailsServiceImpl extends JpaServiceImpl<AppsJwtDetailsMap
.build(); .build();
public AppsJwtDetails getAppDetails(String id , boolean cached) { public AppsJwtDetails get(String id , boolean cached) {
AppsJwtDetails details = null; AppsJwtDetails details = null;
if(cached) { if(cached) {
details = detailsCache.getIfPresent(id); details = detailsCache.getIfPresent(id);

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsSaml20DetailsServiceImpl.java
View File

@@ -37,7 +37,7 @@ public class AppsSaml20DetailsServiceImpl extends JpaServiceImpl<AppsSaml20Deta
.maximumSize(200000) .maximumSize(200000)
.build(); .build();
public AppsSAML20Details getAppDetails(String id , boolean cached){ public AppsSAML20Details get(String id , boolean cached){
AppsSAML20Details details = null; AppsSAML20Details details = null;
if(cached) { if(cached) {
details = detailsCache.getIfPresent(id); details = detailsCache.getIfPresent(id);

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsTokenBasedDetailsServiceImpl.java
View File

@@ -37,7 +37,7 @@ public class AppsTokenBasedDetailsServiceImpl extends JpaServiceImpl<AppsTokenB
.maximumSize(200000) .maximumSize(200000)
.build(); .build();
public AppsTokenBasedDetails getAppDetails(String id , boolean cached) { public AppsTokenBasedDetails get(String id , boolean cached) {
AppsTokenBasedDetails details = null; AppsTokenBasedDetails details = null;
if(cached) { if(cached) {
details = detailsCache.getIfPresent(id); details = detailsCache.getIfPresent(id);

4
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java
View File

@@ -61,7 +61,7 @@ public class CasAuthorizeEndpoint extends CasBaseAuthorizeEndpoint{
){ ){
String queryService = HttpUtils.requestUrl(casService); String queryService = HttpUtils.requestUrl(casService);
_logger.debug("service {}" , queryService); _logger.debug("service {}" , queryService);
AppsCasDetails casDetails = casDetailsService.getAppDetails(queryService , true); AppsCasDetails casDetails = casDetailsService.get(queryService , true);
return buildCasModelAndView(request,response,casDetails,casService); return buildCasModelAndView(request,response,casDetails,casService);
} }
@@ -72,7 +72,7 @@ public class CasAuthorizeEndpoint extends CasBaseAuthorizeEndpoint{
HttpServletResponse response HttpServletResponse response
){ ){
AppsCasDetails casDetails = casDetailsService.getAppDetails(id , true); AppsCasDetails casDetails = casDetailsService.get(id , true);
return buildCasModelAndView(request,response,casDetails,casDetails == null ? id : casDetails.getCallbackUrl()); return buildCasModelAndView(request,response,casDetails,casDetails == null ? id : casDetails.getCallbackUrl());
} }

2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java
View File

@@ -121,7 +121,7 @@ public class CasRestV1Endpoint extends CasBaseAuthorizeEndpoint{
TicketGrantingTicketImpl ticketGrantingTicketImpl = TicketGrantingTicketImpl ticketGrantingTicketImpl =
(TicketGrantingTicketImpl) casTicketGrantingTicketServices.get(ticketGrantingTicket); (TicketGrantingTicketImpl) casTicketGrantingTicketServices.get(ticketGrantingTicket);
AppsCasDetails casDetails=casDetailsService.getAppDetails(casService , true); AppsCasDetails casDetails=casDetailsService.get(casService , true);
ServiceTicketImpl serviceTicket=new ServiceTicketImpl(ticketGrantingTicketImpl.getAuthentication(),casDetails); ServiceTicketImpl serviceTicket=new ServiceTicketImpl(ticketGrantingTicketImpl.getAuthentication(),casDetails);
String ticket = ticketServices.createTicket(serviceTicket); String ticket = ticketServices.createTicket(serviceTicket);

2
maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java
View File

@@ -65,7 +65,7 @@ public class FormBasedAuthorizeEndpoint extends AuthorizeBaseEndpoint{
@PathVariable String id, @PathVariable String id,
@CurrentUser UserInfo currentUser){ @CurrentUser UserInfo currentUser){
AppsFormBasedDetails formBasedDetails = formBasedDetailsService.getAppDetails(id , true); AppsFormBasedDetails formBasedDetails = formBasedDetailsService.get(id , true);
_logger.debug("formBasedDetails {}",formBasedDetails); _logger.debug("formBasedDetails {}",formBasedDetails);
Apps application = getApp(id); Apps application = getApp(id);
formBasedDetails.setAdapter(application.getAdapter()); formBasedDetails.setAdapter(application.getAdapter());

4
maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java
View File

@@ -75,7 +75,7 @@ public class JwtAuthorizeEndpoint extends AuthorizeBaseEndpoint{
@CurrentUser UserInfo currentUser){ @CurrentUser UserInfo currentUser){
ModelAndView modelAndView=new ModelAndView(); ModelAndView modelAndView=new ModelAndView();
Apps application = getApp(id); Apps application = getApp(id);
AppsJwtDetails jwtDetails = jwtDetailsService.getAppDetails(application.getId() , true); AppsJwtDetails jwtDetails = jwtDetailsService.get(application.getId() , true);
_logger.debug("jwtDetails {}",jwtDetails); _logger.debug("jwtDetails {}",jwtDetails);
jwtDetails.setAdapter(application.getAdapter()); jwtDetails.setAdapter(application.getAdapter());
jwtDetails.setIsAdapter(application.getIsAdapter()); jwtDetails.setIsAdapter(application.getIsAdapter());
@@ -111,7 +111,7 @@ public class JwtAuthorizeEndpoint extends AuthorizeBaseEndpoint{
HttpServletResponse response, HttpServletResponse response,
@PathVariable("appid") String appId, @PathVariable("appid") String appId,
@PathVariable String mediaType) { @PathVariable String mediaType) {
AppsJwtDetails jwtDetails = jwtDetailsService.getAppDetails(appId , true); AppsJwtDetails jwtDetails = jwtDetailsService.get(appId , true);
if(jwtDetails != null) { if(jwtDetails != null) {
String jwkSetString = ""; String jwkSetString = "";
if(!jwtDetails.getSignature().equalsIgnoreCase("none")) { if(!jwtDetails.getSignature().equalsIgnoreCase("none")) {

4
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java
View File

@@ -85,11 +85,11 @@ public class UserInfoEndpoint {
try{ try{
oAuth2Authentication = oauth20tokenServices.loadAuthentication(access_token); oAuth2Authentication = oauth20tokenServices.loadAuthentication(access_token);
String client_id= oAuth2Authentication.getOAuth2Request().getClientId(); String client_id = oAuth2Authentication.getOAuth2Request().getClientId();
ClientDetails clientDetails = ClientDetails clientDetails =
clientDetailsService.loadClientByClientId(client_id,true); clientDetailsService.loadClientByClientId(client_id,true);
Apps app = appsService.get(client_id); Apps app = appsService.get(client_id,true);
AbstractAuthorizeAdapter adapter; AbstractAuthorizeAdapter adapter;
if(ConstsBoolean.isTrue(app.getIsAdapter())){ if(ConstsBoolean.isTrue(app.getIsAdapter())){

2
maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java
View File

@@ -232,7 +232,7 @@ public class ConsumerEndpoint {
*/ */
private void initCredential(String appId) throws Exception { private void initCredential(String appId) throws Exception {
// 1. 获取 sp keyStore // 1. 获取 sp keyStore
AppsSAML20Details saml20Details = saml20DetailsService.get(appId); AppsSAML20Details saml20Details = saml20DetailsService.get(appId,true);
if (saml20Details == null) { if (saml20Details == null) {
logger.error("appId[" + appId + "] not exists"); logger.error("appId[" + appId + "] not exists");
throw new Exception(); throw new Exception();

2
maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java
View File

@@ -92,7 +92,7 @@ public class IdpInitEndpoint {
HttpServletResponse response, HttpServletResponse response,
@PathVariable("appid") String appId)throws Exception { @PathVariable("appid") String appId)throws Exception {
logger.debug("SAML IDP init , app id is "+appId); logger.debug("SAML IDP init , app id is "+appId);
AppsSAML20Details saml20Details = saml20DetailsService.getAppDetails(appId , true); AppsSAML20Details saml20Details = saml20DetailsService.get(appId , true);
WebContext.setAttribute(WebConstants.AUTHORIZE_SIGN_ON_APP, saml20Details); WebContext.setAttribute(WebConstants.AUTHORIZE_SIGN_ON_APP, saml20Details);
if (saml20Details == null) { if (saml20Details == null) {
logger.error("samlId[" + appId + "] Error ."); logger.error("samlId[" + appId + "] Error .");

2
maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java
View File

@@ -113,7 +113,7 @@ public class SingleSignOnEndpoint {
} }
public void extractSaml20Detail(ExtractBindingAdapter extractBindingAdapter,String samlId) throws Exception{ public void extractSaml20Detail(ExtractBindingAdapter extractBindingAdapter,String samlId) throws Exception{
AppsSAML20Details saml20Details = saml20DetailsService.getAppDetails(samlId , true); AppsSAML20Details saml20Details = saml20DetailsService.get(samlId , true);
WebContext.setAttribute(WebConstants.AUTHORIZE_SIGN_ON_APP, saml20Details); WebContext.setAttribute(WebConstants.AUTHORIZE_SIGN_ON_APP, saml20Details);
if (saml20Details == null) { if (saml20Details == null) {
logger.error("Request SAML APPID [" + samlId + "] is not exist ."); logger.error("Request SAML APPID [" + samlId + "] is not exist .");

2
maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java
View File

@@ -73,7 +73,7 @@ public class TokenBasedAuthorizeEndpoint extends AuthorizeBaseEndpoint{
AppsTokenBasedDetails tokenBasedDetails=null; AppsTokenBasedDetails tokenBasedDetails=null;
tokenBasedDetails=tokenBasedDetailsService.getAppDetails(id , true); tokenBasedDetails=tokenBasedDetailsService.get(id , true);
_logger.debug(""+tokenBasedDetails); _logger.debug(""+tokenBasedDetails);
Apps application= getApp(id); Apps application= getApp(id);

2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/SingleSignOnInterceptor.java
View File

@@ -86,7 +86,7 @@ public class SingleSignOnInterceptor implements AsyncHandlerInterceptor {
String requestURI = request.getRequestURI(); String requestURI = request.getRequestURI();
if(requestURI.contains("/authz/cas/login")) {//for CAS service if(requestURI.contains("/authz/cas/login")) {//for CAS service
app = casDetailsService.getAppDetails( app = casDetailsService.get(
request.getParameter(CasConstants.PARAMETER.SERVICE), true); request.getParameter(CasConstants.PARAMETER.SERVICE), true);
}else if(requestURI.contains("/authz/jwt/") }else if(requestURI.contains("/authz/jwt/")
||requestURI.contains("/authz/api/") ||requestURI.contains("/authz/api/")

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/CasDetailsController.java
View File

@@ -52,7 +52,7 @@ public class CasDetailsController extends BaseAppContorller {
@GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsCasDetails> get(@PathVariable String id) { public Message<AppsCasDetails> get(@PathVariable String id) {
AppsCasDetails casDetails=casDetailsService.getAppDetails(id , false); AppsCasDetails casDetails=casDetailsService.get(id , false);
super.decoderSecret(casDetails); super.decoderSecret(casDetails);
casDetails.transIconBase64(); casDetails.transIconBase64();
return new Message<>(casDetails); return new Message<>(casDetails);

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/FormBasedDetailsController.java
View File

@@ -57,7 +57,7 @@ public class FormBasedDetailsController extends BaseAppContorller {
@RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@PathVariable String id) { public Message<?> get(@PathVariable String id) {
AppsFormBasedDetails formBasedDetails=formBasedDetailsService.getAppDetails(id , false); AppsFormBasedDetails formBasedDetails=formBasedDetailsService.get(id , false);
decoderSecret(formBasedDetails); decoderSecret(formBasedDetails);
decoderSharedPassword(formBasedDetails); decoderSharedPassword(formBasedDetails);
formBasedDetails.transIconBase64(); formBasedDetails.transIconBase64();

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/JwtDetailsController.java
View File

@@ -58,7 +58,7 @@ public class JwtDetailsController extends BaseAppContorller {
@RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@PathVariable String id) { public Message<?> get(@PathVariable String id) {
AppsJwtDetails jwtDetails=jwtDetailsService.getAppDetails(id , false); AppsJwtDetails jwtDetails=jwtDetailsService.get(id , false);
decoderSecret(jwtDetails); decoderSecret(jwtDetails);
jwtDetails.transIconBase64(); jwtDetails.transIconBase64();
return new Message<AppsJwtDetails>(jwtDetails); return new Message<AppsJwtDetails>(jwtDetails);

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/SAML20DetailsController.java
View File

@@ -81,7 +81,7 @@ public class SAML20DetailsController extends BaseAppContorller {
@RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@PathVariable String id) { public Message<?> get(@PathVariable String id) {
AppsSAML20Details saml20Details=saml20DetailsService.getAppDetails(id , false); AppsSAML20Details saml20Details=saml20DetailsService.get(id , false);
decoderSecret(saml20Details); decoderSecret(saml20Details);
saml20Details.transIconBase64(); saml20Details.transIconBase64();
//modelAndView.addObject("authzURI",applicationConfig.getAuthzUri()); //modelAndView.addObject("authzURI",applicationConfig.getAuthzUri());

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/controller/TokenBasedDetailsController.java
View File

@@ -56,7 +56,7 @@ public class TokenBasedDetailsController extends BaseAppContorller {
@GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) @GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@PathVariable String id) { public Message<?> get(@PathVariable String id) {
AppsTokenBasedDetails tokenBasedDetails=tokenBasedDetailsService.getAppDetails(id , false); AppsTokenBasedDetails tokenBasedDetails=tokenBasedDetailsService.get(id , false);
decoderSecret(tokenBasedDetails); decoderSecret(tokenBasedDetails);
String algorithmKey=passwordReciprocal.decoder(tokenBasedDetails.getAlgorithmKey()); String algorithmKey=passwordReciprocal.decoder(tokenBasedDetails.getAlgorithmKey());
tokenBasedDetails.setAlgorithmKey(algorithmKey); tokenBasedDetails.setAlgorithmKey(algorithmKey);