diff --git a/pom.xml b/pom.xml
index 6456dac..b839ac1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.fjy
spring
- V2.6.1
+ V2.6.2
jar
spring
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 @@
- F:\JAVA Workspace\Temp\log\%d\info.%d.log
-
+
+ /www/cmsfile/%d/info.%d.log
@@ -44,8 +44,8 @@
- F:\JAVA Workspace\Temp\log\error.%d.log
-
+
+ /www/cmsfile/%d/error.%d.log
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 @@
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 @@
+