From 73bb17700fc5daf3ee490d2bc5196841e0675fd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= <fjy8018@qq.com>
Date: Thu, 15 Mar 2018 19:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8nginx=E5=81=9A=E5=8F=8D?=
 =?UTF-8?q?=E5=90=91=E4=BB=A3=E7=90=86=E5=92=8C=E8=B4=9F=E8=BD=BD=E5=9D=87?=
 =?UTF-8?q?=E8=A1=A1=E3=80=81=E5=8A=A0=E5=85=A5SSL=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=EF=BC=8C=E5=90=AF=E5=8A=A8https=E3=80=81=E5=8A=A0=E5=85=A5ICP?=
 =?UTF-8?q?=E5=A4=87=E6=A1=88=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                 | 2 +-
 src/main/resources/application-prod.yml                 | 7 ++++++-
 src/main/resources/application.yml                      | 2 +-
 src/main/resources/logback-spring.xml                   | 8 ++++----
 src/main/resources/static/css/style.css                 | 4 ++++
 src/main/resources/templates/dist/thymeleaf/layout.html | 2 ++
 src/main/resources/templates/login.html                 | 3 +++
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6456dac..b839ac1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.fjy</groupId>
 	<artifactId>spring</artifactId>
-	<version>V2.6.1</version>
+	<version>V2.6.2</version>
 	<packaging>jar</packaging>
 
 	<name>spring</name>
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 2d0daef..6fc34e7 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -5,6 +5,11 @@ server:
     session:
       timeout: 1440s
   port: 8085
+  tomcat:
+    remote-ip-header: x-forwarded-for
+    protocol-header: x-forwarded-proto
+    port-header: X-Forwarded-Port
+  use-forward-headers: true
 serverproperties:
   port_num: 8085
   filePath: /www/cmsfile/
@@ -31,4 +36,4 @@ spring:
     show-sql: false
   #resources:
   #  static-locations: classpath:/templates/
-debug: false
+debug: false
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9efaa1c..7ef289a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 #控制配置文件调用
 spring:
   profiles:
-    active: dev
\ No newline at end of file
+    active: prod
\ No newline at end of file
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 71c159c..83a471d 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -25,8 +25,8 @@
         <!--滚动策略-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--路径文件名，文件名包含时间-->
-        <fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>
-            <!--<fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>-->
+            <!--<fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>-->
+            <fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>
         </rollingPolicy>
     </appender>
 
@@ -44,8 +44,8 @@
         <!--滚动策略-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--路径文件名，文件名包含时间-->
-            <fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>
-            <!--<fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>-->
+            <!--<fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>-->
+            <fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>
         </rollingPolicy>
     </appender>
 
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index bc079a1..d47b051 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -55,6 +55,10 @@ a{
     width: 50%;
 }
 .footer{
+    width:100%;
+    font-size:14px;
+    position:fixed;
+    bottom:20px;
     text-align: center;
 }
 
diff --git a/src/main/resources/templates/dist/thymeleaf/layout.html b/src/main/resources/templates/dist/thymeleaf/layout.html
index cd3ca6c..8b77ddb 100644
--- a/src/main/resources/templates/dist/thymeleaf/layout.html
+++ b/src/main/resources/templates/dist/thymeleaf/layout.html
@@ -109,6 +109,8 @@
     <el-footer th:fragment="footer">
         <div class="footer">
             © 2018 作业提交系统
+            <br>
+            <a href="http://gdcainfo.miitbeian.gov.cn/">©fjy8018.xin 粤ICP备18026008号 	粤ICP备18026008号-1 </a>
         </div>
     </el-footer>
 </body>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 413a4a9..09774fa 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -151,6 +151,9 @@
             </div>
         </el-col>
     </el-row>
+    <el-row>
+    <el-footer th:include="dist/thymeleaf/layout :: footer"></el-footer>
+    </el-row>
 </div>
 <script th:src="@{js/loginstyle.js}"></script>
 <!--<body>