From 0ed851173578dd973b542a1aa6a5999fda6121e7 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Wed, 14 Apr 2021 22:11:27 +0800
Subject: [PATCH] v 2.7.0 GA

---
 ReleaseNotes.txt                              |  5 +--
 gradle.properties                             |  4 +--
 .../src/main/resources/log4j2.xml             | 32 ++++++++-----------
 .../resources/application-http.properties     |  2 +-
 .../src/main/resources/application.properties |  1 -
 .../src/main/resources/log4j2.xml             | 31 ++++++++----------
 6 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index dab6bbdf4..c108c727b 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,4 +1,4 @@
-MaxKey v 2.7.0 GA	2021/04/**
+MaxKey v 2.7.0 GA	2021/04/15
     *(MAXKEY-210301)  加入Dromara开源组织，官方网站的优化，文档优化
     *(MAXKEY-210302)  BootJar，Docker，Standard三种打包方式的配置优化
     *(MAXKEY-210303)  openldap,activedirectory密码验证支持
@@ -34,8 +34,9 @@
     *(MAXKEY-210333)  SDK优化
     *(MAXKEY-210334)  依赖jar引用、更新和升级
     	log4j 		2.14.1
-		spring		5.3.5
+		spring		5.3.6
 		springBoot  2.4.4
+		springSecurity 5.4.6
 		tomcat		9.0.44
 	
 MaxKey v 2.6.0 GA	2021/03/05
diff --git a/gradle.properties b/gradle.properties
index 6200b1ff9..1c6b5e790 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,9 +6,9 @@ author	=maxkeyTop
 
 #Version For use jar
 log4jVersion         	=2.14.1
-springVersion        	=5.3.5
+springVersion        	=5.3.6
 springBootVersion    	=2.4.4
-springSecurityVersion	=5.4.5
+springSecurityVersion	=5.4.6
 springDataVersion    	=2.4.1
 springSessionVersion    =2.4.1
 hibernateVersion	 	=6.2.0.Final
diff --git a/maxkey-web-manage/src/main/resources/log4j2.xml b/maxkey-web-manage/src/main/resources/log4j2.xml
index c7bd9a7f1..9ce9f649e 100644
--- a/maxkey-web-manage/src/main/resources/log4j2.xml
+++ b/maxkey-web-manage/src/main/resources/log4j2.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>  
-<!--DOCTYPE log4j:configuration SYSTEM "log4j.dtd" -->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
-	 status="INFO"  monitorInterval="300"
->   
-    <appenders>  
-    	
+<Configuration status="INFO"  monitorInterval="300">  
+    <Appenders>      	
         <Console name="consolePrint" target="SYSTEM_OUT">  
             <PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss,SSS} %-5level [%t] %logger{36}:%L - %msg%n" />  
         </Console>
@@ -21,17 +17,17 @@
 		     </Policies>
 		     <DefaultRolloverStrategy max="100"/>
 		</RollingFile>
-	 </appenders>  
+	 </Appenders>  
 	 
-    <loggers>  
-    	<Logger name="org.springframework" level="INFO"></Logger>
-    	<Logger name="org.apache.logging" level="INFO"></Logger>
-    	<Logger name="org.maxkey" level="DEBUG"></Logger>
-    	<Logger name="org.apache.mybatis.jpa" level="DEBUG"></Logger>
+    <Loggers>  
+    	<Logger level="INFO" 	name="org.springframework" ></Logger>
+    	<Logger level="INFO" 	name="org.apache.logging" ></Logger>
+    	<Logger level="DEBUG" 	name="org.maxkey" ></Logger>
+    	<Logger level="DEBUG"	name="org.apache.mybatis.jpa" ></Logger>
     	
-        <root level="INFO">  
-            <appender-ref ref="consolePrint" />
-            <appender-ref ref="RollingFile" /> 
-        </root>  
-    </loggers>  
-</log4j:configuration>
\ No newline at end of file
+        <Root level="INFO">  
+            <AppenderRef ref="consolePrint" />
+            <AppenderRef ref="RollingFile" /> 
+        </Root>  
+    </Loggers>  
+</Configuration>
\ No newline at end of file
diff --git a/maxkey-web-maxkey/src/main/resources/application-http.properties b/maxkey-web-maxkey/src/main/resources/application-http.properties
index d9e61a67e..1e47d1f23 100644
--- a/maxkey-web-maxkey/src/main/resources/application-http.properties
+++ b/maxkey-web-maxkey/src/main/resources/application-http.properties
@@ -16,7 +16,7 @@
 #spring.profiles.active=http                                               #
 ############################################################################
 #server port
-server.port=80
+server.port=8080
 #session default 1800
 server.servlet.session.timeout=1800
 #web app context path
diff --git a/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-web-maxkey/src/main/resources/application.properties
index 1dc46b85d..51749d255 100644
--- a/maxkey-web-maxkey/src/main/resources/application.properties
+++ b/maxkey-web-maxkey/src/main/resources/application.properties
@@ -23,5 +23,4 @@ application.formatted-version=v2.7.0 GA
 #spring.profiles.active https/http; default https                          #
 ############################################################################
 spring.profiles.active=https
-#spring.profiles.active=http
 
diff --git a/maxkey-web-maxkey/src/main/resources/log4j2.xml b/maxkey-web-maxkey/src/main/resources/log4j2.xml
index dfb480698..9987fcc7e 100644
--- a/maxkey-web-maxkey/src/main/resources/log4j2.xml
+++ b/maxkey-web-maxkey/src/main/resources/log4j2.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>  
-<!--DOCTYPE log4j:configuration SYSTEM "log4j.dtd" -->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
-	 status="INFO"  monitorInterval="300"
->  
-    <appenders>  
-    	
+<Configuration status="INFO"  monitorInterval="300">  
+    <Appenders>  
         <Console name="consolePrint" target="SYSTEM_OUT">  
             <PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss,SSS} %-5level [%t] %logger{36}:%L - %msg%n" />  
         </Console>
@@ -21,17 +17,16 @@
 		     </Policies>
 		     <DefaultRolloverStrategy max="100"/>
 		</RollingFile>
-	 </appenders>  
+	 </Appenders>  
 	 
-    <loggers>  
-    	<Logger name="org.springframework" level="INFO"></Logger>
-    	<Logger name="org.apache.logging" level="INFO"></Logger>
-    	<Logger name="org.maxkey" level="DEBUG"></Logger>
+    <Loggers>  
+    	<Logger level="INFO"	name="org.springframework" ></Logger>
+    	<Logger level="INFO"	name="org.apache.logging" ></Logger>
+    	<Logger level="DEBUG"	name="org.maxkey" ></Logger>
     	
-    	
-        <root level="INFO">  
-            <appender-ref ref="consolePrint" />
-            <appender-ref ref="RollingFile" /> 
-        </root>  
-    </loggers>  
-</log4j:configuration>
\ No newline at end of file
+        <Root  level="INFO">  
+            <AppenderRef  ref="consolePrint" />
+            <AppenderRef  ref="RollingFile" /> 
+        </Root >  
+    </Loggers>  
+</Configuration>
\ No newline at end of file