MaxKey 1 year ago
parent
commit
b9e9441b89

+ 17 - 0
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();
+    }
 }

+ 2 - 1
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();
 	}
 }

+ 2 - 1
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();
 	}
 
 }

+ 2 - 1
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);
 

+ 2 - 2
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);
 

+ 2 - 2
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);
 

+ 1 - 1
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 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" 
-					+ "<root>" + JpaWebContext.version() + "</root>";
+					+ "<root>" + WebContext.version() + "</root>";
 	}
 
 	/**