From b62bbbd8e608b033f796fbaa9af50baf4547c685 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 2 Jun 2020 13:45:49 +0800
Subject: [PATCH] update

---
 .../src/main/resources/config/logger-core.xml  | 18 ++++++++++++++++++
 web/bin/docker/Dockerfile                      |  2 +-
 .../main/resources/config/logback-spring.xml   | 18 ------------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/modules/core/src/main/resources/config/logger-core.xml b/modules/core/src/main/resources/config/logger-core.xml
index 98d893a9..fbc0d3dd 100644
--- a/modules/core/src/main/resources/config/logger-core.xml
+++ b/modules/core/src/main/resources/config/logger-core.xml
@@ -39,4 +39,22 @@
 	<logger name="com.jeesite.common.reflect.ReflectUtils" level="INFO" />
 	<logger name="com.jeesite.common.io.FileUtils" level="INFO" />
 	
+	<!-- Production profile -->
+	<springProfile name="prod">
+		<logger name="org.mybatis" level="WARN" />
+		<logger name="org.mybatis.spring.transaction" level="WARN" />
+		<logger name="com.atomikos" level="ERROR" />
+		<logger name="org.flowable" level="WARN" />
+		<logger name="com.jeesite" level="WARN" />
+		<logger name="com.jeesite.common.i18n" level="WARN" />
+		<logger name="com.jeesite.common.shiro" level="WARN" />
+		<logger name="com.jeesite.common.beetl" level="WARN" />
+		<logger name="com.jeesite.common.cache" level="WARN" />
+		<logger name="com.jeesite.common.j2cache" level="WARN" />
+		<logger name="com.jeesite.common.mybatis" level="WARN" />
+		<logger name="com.jeesite.common.mybatis.mapper" level="WARN" />
+		<logger name="com.jeesite.common.reflect.ReflectUtils" level="WARN" />
+		<logger name="com.jeesite.common.io.FileUtils" level="WARN" />
+	</springProfile>
+	
 </included>
\ No newline at end of file
diff --git a/web/bin/docker/Dockerfile b/web/bin/docker/Dockerfile
index 44cdb9ef..76ea8155 100644
--- a/web/bin/docker/Dockerfile
+++ b/web/bin/docker/Dockerfile
@@ -10,7 +10,7 @@ RUN jar -xvf web.war
 # RUN chmod -R 755 ./*
 
 WORKDIR /app/WEB-INF
-ENV JAVA_OPTS "-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
+ENV JAVA_OPTS "-Xms256m -Xmx1024m"
 ENV JAVA_OPTS "$JAVA_OPTS -Dspring.profiles.active=prod"
 
 ADD application-prod.yml ./classes/config
diff --git a/web/src/main/resources/config/logback-spring.xml b/web/src/main/resources/config/logback-spring.xml
index afbd3bfb..5da47616 100644
--- a/web/src/main/resources/config/logback-spring.xml
+++ b/web/src/main/resources/config/logback-spring.xml
@@ -57,23 +57,5 @@
 		<appender-ref ref="debug" />
 		<appender-ref ref="error" />
 	</root>
-	
-	<!-- Production profile -->
-	<springProfile name="prod">
-		<logger name="org.mybatis" level="WARN" />
-		<logger name="org.mybatis.spring.transaction" level="WARN" />
-		<logger name="com.atomikos" level="ERROR" />
-		<logger name="org.flowable" level="WARN" />
-		<logger name="com.jeesite" level="WARN" />
-		<logger name="com.jeesite.common.i18n" level="WARN" />
-		<logger name="com.jeesite.common.shiro" level="WARN" />
-		<logger name="com.jeesite.common.beetl" level="WARN" />
-		<logger name="com.jeesite.common.cache" level="WARN" />
-		<logger name="com.jeesite.common.j2cache" level="WARN" />
-		<logger name="com.jeesite.common.mybatis" level="WARN" />
-		<logger name="com.jeesite.common.mybatis.mapper" level="WARN" />
-		<logger name="com.jeesite.common.reflect.ReflectUtils" level="WARN" />
-		<logger name="com.jeesite.common.io.FileUtils" level="WARN" />
-	</springProfile>
 
 </configuration>
\ No newline at end of file