diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java index 65ed8e04f..15be39226 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java @@ -30,6 +30,7 @@ import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.entity.Institutions; import org.dromara.maxkey.util.DateUtils; import org.dromara.maxkey.util.IdGenerator; +import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; @@ -521,4 +522,20 @@ public final class WebContext { public static ModelAndView forward(String forwardUrl) { return new ModelAndView("forward:" + forwardUrl); } + + public static String version() { + StringBuffer version = new StringBuffer(); + version.append("-----------------------------------------------------------"); + version.append("+ MaxKey Community Edition "); + version.append("+ Single Sign On ( SSO ) "); + version.append("+ Version {}".formatted( + WebContext.properties.getProperty("application.formatted-version"))); + version.append("+"); + version.append("+ {}Copyright 2018 - {} https://www.maxkey.top/", + (char)0xA9 , new DateTime().getYear() + ); + version.append("+ . All rights reserved . "); + version.append("-----------------------------------------------------------"); + return version.toString(); + } } diff --git a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java index 65dd7ce37..394b4f0b2 100644 --- a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java @@ -39,6 +39,7 @@ import org.dromara.maxkey.entity.apps.AppsJwtDetails; import org.dromara.maxkey.persistence.service.AppsJwtDetailsService; import org.dromara.maxkey.util.Instance; import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -142,6 +143,6 @@ public class JwtAuthorizeEndpoint extends AuthorizeBaseEndpoint{ return jwkSetKeyStore.toString(mediaType); } - return appId + " not exist. \n" + JpaWebContext.version(); + return appId + " not exist. \n" + WebContext.version(); } } diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java index 5cdd1d8dd..1cc55b1b8 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java @@ -22,6 +22,7 @@ import org.dromara.maxkey.constants.ContentType; import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore; import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; import org.dromara.maxkey.web.WebConstants; +import org.dromara.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -89,7 +90,7 @@ public class OauthJwksEndpoint extends AbstractEndpoint { return jwkSetKeyStore.toString(mediaType); } - return appId + " not exist . \n" + JpaWebContext.version(); + return appId + " not exist . \n" + WebContext.version(); } } diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostDecoder.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostDecoder.java index 34bf45cfa..56360e420 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostDecoder.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostDecoder.java @@ -17,7 +17,6 @@ package org.dromara.maxkey.authz.saml20.binding.decoder; -import javax.servlet.http.HttpServletRequest; import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.saml2.binding.decoding.HTTPPostDecoder; @@ -30,6 +29,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.web.util.UrlUtils; +import jakarta.servlet.http.HttpServletRequest; + public class OpenHTTPPostDecoder extends HTTPPostDecoder { private final Logger log = LoggerFactory.getLogger(OpenHTTPPostDecoder.class); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostSimpleSignDecoder.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostSimpleSignDecoder.java index d6d1486d2..244ec631b 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostSimpleSignDecoder.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPPostSimpleSignDecoder.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.authz.saml20.binding.decoder; -import javax.servlet.http.HttpServletRequest; - import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.saml2.binding.decoding.HTTPPostSimpleSignDecoder; import org.opensaml.ws.message.decoder.MessageDecodingException; @@ -30,6 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.web.util.UrlUtils; +import jakarta.servlet.http.HttpServletRequest; + public class OpenHTTPPostSimpleSignDecoder extends HTTPPostSimpleSignDecoder { private final Logger log = LoggerFactory.getLogger(OpenHTTPPostSimpleSignDecoder.class); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPRedirectDecoder.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPRedirectDecoder.java index 94bc12426..0496c87d6 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPRedirectDecoder.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/decoder/OpenHTTPRedirectDecoder.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.authz.saml20.binding.decoder; -import javax.servlet.http.HttpServletRequest; - import org.opensaml.common.binding.SAMLMessageContext; import org.opensaml.saml2.binding.decoding.HTTPRedirectDeflateDecoder; import org.opensaml.ws.message.decoder.MessageDecodingException; @@ -30,6 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.web.util.UrlUtils; +import jakarta.servlet.http.HttpServletRequest; + public class OpenHTTPRedirectDecoder extends HTTPRedirectDeflateDecoder { private final Logger log = LoggerFactory.getLogger(OpenHTTPRedirectDecoder.class); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java index 721e1de42..e06d16864 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java @@ -173,7 +173,7 @@ public class SamlMetadataEndpoint { return "" - + "" + JpaWebContext.version() + ""; + + "" + WebContext.version() + ""; } /**