From 19a45446ef54c06948f4182ffc4113803503da44 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Wed, 2 Mar 2022 22:00:31 +0800
Subject: [PATCH] v 3.3.3 GA
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加SERVER_PROFILES，SERVER_PORT，SERVER_SESSION_TIMEOUT的环境参数
---
 ReleaseNotes.txt                                             | 5 +++--
 .../src/main/resources/application-http.properties           | 4 ++--
 .../src/main/resources/application-https.properties          | 4 ++--
 .../src/main/resources/application.properties                | 2 +-
 .../src/main/resources/application-http.properties           | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 7ebeaaf3..c2dc9bff 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -19,8 +19,9 @@
     *(MAXKEY-220418) Metadatas功能优化
     *(MAXKEY-220419) 头像保存出错BUG修复 #I4VQDD(无双的英雄peerless_hero)
     *(MAXKEY-220420) 用户资料空值问题修复 #I4VNPO(无双的英雄peerless_hero)
-    *(MAXKEY-220421) 认证缓存的优化
-    *(MAXKEY-220422) 依赖项引用、更新和升级
+    *(MAXKEY-220421) 增加SERVER_PROFILES，SERVER_PORT，SERVER_SESSION_TIMEOUT的环境参数
+    *(MAXKEY-220422) 认证缓存的优化
+    *(MAXKEY-220423) 依赖项引用、更新和升级
         spring                   5.3.16
         springBoot               2.6.4
         springSecurity           5.6.2
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties
index 4d9b7d9a..98d53032 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties
@@ -16,11 +16,11 @@
 #spring.profiles.active=http                                               #
 ############################################################################
 #server port
-server.port                                     =8080
+server.port                                     =${SERVER_PORT:8080}
 #session default 1800
 #1800s =30m
 #28800s=8h
-server.servlet.session.timeout                  =1800
+server.servlet.session.timeout                  =${SERVER_SESSION_TIMEOUT:1800}
 #server context path
 server.servlet.context-path                     =/maxkey
 #nacos discovery
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties
index 63fda03d..a2d67981 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties
@@ -16,11 +16,11 @@
 #spring.profiles.active=http                                               #
 ############################################################################
 #server port
-server.port                                     =443
+server.port                                     =${SERVER_PORT:443}
 #session default 1800
 #1800s =30m
 #28800s=8h
-server.servlet.session.timeout                  =1800
+server.servlet.session.timeout                  =${SERVER_SESSION_TIMEOUT:1800}
 #server context path
 server.servlet.context-path                     =/maxkey
 #nacos discovery
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties
index 09d53081..76ce690b 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties
@@ -27,5 +27,5 @@ spring.main.banner-mode                     =log
 ############################################################################
 #spring.profiles.active https/http; default https                          #
 ############################################################################
-spring.profiles.active                      =https
+spring.profiles.active                      =${SERVER_PROFILES:https}
 
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties
index fd3964a1..e90816eb 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties
@@ -16,7 +16,7 @@
 #MaxKey Server  configuration                                              #
 ############################################################################
 #server port
-server.port                                     =9527
+server.port                                     =${SERVER_PORT:9527}
 #server context path
 server.servlet.context-path                     =/maxkey-mgt
 #nacos discovery