Merge branch 'main' of https://github.com/dromara/MaxKey

build.gradle

@@ -143,6 +143,7 @@ subprojects {
         //implementation group: 'org.apache.commons', name: 'commons-digester3', version: "${commonsdigester3Version}"
         //implementation group: 'commons-digester', name: 'commons-digester', version: "${commonsdigesterVersion}"
         implementation group: 'commons-io', name: 'commons-io', version: "${commonsioVersion}"
+        implementation group: 'commons-logging', name: 'commons-logging', version: "${commonsloggingVersion}"
         implementation group: 'commons-lang', name: 'commons-lang', version: "${commonslangVersion}"
         implementation group: 'org.apache.commons', name: 'commons-lang3', version: "${commonslang3Version}"
         implementation group: 'commons-logging', name: 'commons-logging', version: "${commonsloggingVersion}"

gradle.properties

@@ -64,7 +64,7 @@ commonsdigesterVersion          =2.1
 commonsioVersion                =2.16.1
 commonslangVersion              =2.6
 commonslang3Version             =3.14.0
-commonsloggingVersion           =1.3.1
+commonsloggingVersion           =1.3.5
 commonspool2Version             =2.12.0
 commonshttpclientVersion        =3.1
 commonsfileuploadVersion        =1.5

maxkey-commons/maxkey-core/src/main/java/org/dromara/maxkey/web/ProductEnvironment.java

@@ -48,9 +48,11 @@ public class ProductEnvironment {
             keyValueSet.add(key);
         }
         // out
-        for (Iterator<String> it = keyValueSet.iterator(); it.hasNext();) {
-            String key = it.next();
-            logger.trace("{}   =   {}" , key , map.get(key));
+        if(logger.isTraceEnabled()) {
+	        for (Iterator<String> it = keyValueSet.iterator(); it.hasNext();) {
+	            String key = it.next();
+	            logger.trace("{}   =   {}" , key , map.get(key));
+	        }
         }
         logger.info("APP_HOME" + "   =   {}" , PathUtils.getInstance().getAppPath());
 
@@ -84,5 +86,7 @@ public class ProductEnvironment {
         logger.info(WebConstants.DELIMITER);
         //WARN No Root logger was configured, creating default ERROR-level Root logger with Console appender
         System.setProperty("nacos.logging.default.config.enabled", "false");
+        //freemarker use slf4j
+        System.setProperty(freemarker.log.Logger.SYSTEM_PROPERTY_NAME_LOGGER_LIBRARY, freemarker.log.Logger.LIBRARY_NAME_SLF4J);
     }
 }

maxkey-starter/maxkey-starter-web-static/build.gradle

@@ -0,0 +1,7 @@
+
+description = "maxkey-starter-web-static"
+
+
+dependencies {
+   
+}

maxkey-webs/maxkey-gataway/build.gradle

@@ -6,6 +6,7 @@ apply plugin: 'java'
 
 dependencies {
          implementation project(":maxkey-commons:maxkey-common")
+         implementation project(":maxkey-starter:maxkey-starter-web-static")
          
          //spring-cloud gateway server
          implementation group: 'org.springframework.cloud', name: 'spring-cloud-gateway-server', version: "${springcloudVersion}"

maxkey-webs/maxkey-web-maxkey/build.gradle

@@ -46,6 +46,7 @@ dependencies {
 	implementation project(":maxkey-starter:maxkey-starter-sms")
 	implementation project(":maxkey-starter:maxkey-starter-social")
 	implementation project(":maxkey-starter:maxkey-starter-web")
+	implementation project(":maxkey-starter:maxkey-starter-web-static")
 	
    	implementation project(":maxkey-authentications:maxkey-authentication-core")
 	implementation project(":maxkey-authentications:maxkey-authentication-provider")

maxkey-webs/maxkey-web-maxkey/src/main/resources/application-maxkey.properties

@@ -268,11 +268,11 @@ maxkey.saml.v20.sp.issuing.entity.id                            =client.maxkey.o
 ############################################################################
 #Management endpoints configuration                                        #
 ############################################################################
-management.security.enabled                     =false
+management.endpoints.enabled-by-default=false
 #management.endpoints.jmx.exposure.include=health,info
 #management.endpoints.web.exposure.include=metrics,health,info,env,prometheus
-management.endpoints.web.exposure.include       =*
-management.endpoint.health.show-details         =ALWAYS
+#management.endpoints.web.exposure.include       =*
+#management.endpoint.health.show-details         =ALWAYS
 management.health.redis.enabled                 =false
 management.health.mail.enabled                  =false
 

maxkey-webs/maxkey-web-mgt/build.gradle

@@ -44,6 +44,7 @@ dependencies {
 	implementation project(":maxkey-starter:maxkey-starter-otp")
 	implementation project(":maxkey-starter:maxkey-starter-sms")
 	implementation project(":maxkey-starter:maxkey-starter-web")
+	implementation project(":maxkey-starter:maxkey-starter-web-static")
 	
 	implementation project(":maxkey-authentications:maxkey-authentication-core")
 	implementation project(":maxkey-authentications:maxkey-authentication-provider-mgt")

maxkey-webs/maxkey-web-mgt/src/main/resources/application-maxkey-mgt.properties

@@ -197,11 +197,11 @@ maxkey.job.cron.enable                          =true
 ############################################################################
 #Management endpoints configuration                                        #
 ############################################################################
-management.security.enabled                     =false
+management.endpoints.enabled-by-default=false
 #management.endpoints.jmx.exposure.include=health,info
 #management.endpoints.web.exposure.include=metrics,health,info,env,prometheus
-management.endpoints.web.exposure.include       =*
-management.endpoint.health.show-details         =ALWAYS
+#management.endpoints.web.exposure.include       =*
+#management.endpoint.health.show-details         =ALWAYS
 management.health.redis.enabled                 =false
 management.health.mail.enabled                  =false
 

maxkey-webs/maxkey-web-openapi/build.gradle

@@ -43,6 +43,7 @@ dependencies {
 	implementation project(":maxkey-starter:maxkey-starter-otp")
 	implementation project(":maxkey-starter:maxkey-starter-sms")
 	implementation project(":maxkey-starter:maxkey-starter-web")
+	implementation project(":maxkey-starter:maxkey-starter-web-static")
 	
 	implementation project(":maxkey-authentications:maxkey-authentication-core")
 	implementation project(":maxkey-authentications:maxkey-authentication-provider")

maxkey-webs/maxkey-web-openapi/src/main/resources/application-maxkey-openapi.properties

@@ -195,11 +195,11 @@ maxkey.job.cron.enable                          =true
 ############################################################################
 #Management endpoints configuration                                        #
 ############################################################################
-management.security.enabled                     =false
+management.endpoints.enabled-by-default=false
 #management.endpoints.jmx.exposure.include=health,info
 #management.endpoints.web.exposure.include=metrics,health,info,env,prometheus
-management.endpoints.web.exposure.include       =*
-management.endpoint.health.show-details         =ALWAYS
+#management.endpoints.web.exposure.include       =*
+#management.endpoint.health.show-details         =ALWAYS
 management.health.redis.enabled                 =false
 management.health.mail.enabled                  =false
 

settings.gradle

@@ -37,6 +37,7 @@ include ('maxkey-starter:maxkey-starter-otp')
 include ('maxkey-starter:maxkey-starter-sms')
 include ('maxkey-starter:maxkey-starter-social')
 include ('maxkey-starter:maxkey-starter-web')
+include ('maxkey-starter:maxkey-starter-web-static')
 include ('maxkey-starter:maxkey-starter-passkey')
 
 //authentications