From b1011e5c6b18beab6431b598e0923d8cabc687a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= <fjy8018@qq.com>
Date: Tue, 1 May 2018 14:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E6=89=8D=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                  |  2 +-
 src/main/resources/application.yml       |  2 +-
 src/main/resources/logback-spring.xml    | 16 ++++++++--------
 src/main/resources/static/js/homepage.js |  4 +---
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index e7844ae..151d593 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.fjy</groupId>
 	<artifactId>spring</artifactId>
-	<version>V2.9.6</version>
+	<version>V2.9.7</version>
 	<packaging>jar</packaging>
 
 	<name>spring</name>
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 9530fc7..362427e 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -25,13 +25,13 @@
         <!--滚动策略-->
         <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>-->
-        </rollingPolicy>
-    </appender>
+            <!--<fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>-->
+        <fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>
+    </rollingPolicy>
+</appender>
 
-    <appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!--根据范围过滤ERROR等级以下的日志-->
+<appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!--根据范围过滤ERROR等级以下的日志-->
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>ERROR</level>
         </filter>
@@ -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/js/homepage.js b/src/main/resources/static/js/homepage.js
index b7e5b8d..2e53cd2 100644
--- a/src/main/resources/static/js/homepage.js
+++ b/src/main/resources/static/js/homepage.js
@@ -301,6 +301,7 @@ var Main = {
             let that = this;
             if (file.status==="success"){
                 that.openNotiSuccess("成功", file.name+"上传成功！");
+                that.getFileList();
             }else{
                 that.openNotiError("失败", file.name+"上传失败！");
             }
@@ -312,9 +313,6 @@ var Main = {
         submitUpload() {
             let that = this;
             this.$refs.upload.submit();
-            setTimeout(function () {
-                that.getFileList();
-            }, 1000);
         },
         handleRemove(file, fileList) {
             console.log(file, fileList);