Merge remote-tracking branch 'origin/master'

src/main/java/com/zzsn/knowbase/service/impl/LocalFileServiceImpl.java

@@ -112,6 +112,7 @@ public class LocalFileServiceImpl implements ILocalFileService {
             return result;  // create user metadata and return it
         } catch (Exception e) {
             e.printStackTrace();
+            log.error(e.getMessage());
         }
         // if the operation of file uploading is unsuccessful, an error occurs
         Result result = Result.error("上传文件时出现问题！");

src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
           requiredAcks: 1
   redis:
     database: 0
-    host: 114.115.236.206
+    host: 114.116.90.53
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -32,7 +32,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    port: 6379
+    port: 6380
     password: clbzzsn
 
   thymeleaf:
@@ -58,11 +58,14 @@ know:
 document:
   server:
     host: http://114.116.116.241:9088
+#    host: http://192.168.1.71:9088
 files:
   storage: /storage/know/
+#  storage: C:/know/
   docservice:
     url:
       site: http://114.116.116.241:80/
+#      site: http://192.168.1.216:80/
       converter: ConvertService.ashx
       command: coauthoring/CommandService.ashx
       api: web-apps/apps/api/documents/api.js