From 0530d7745baf43157a82482dc60699efd1f14459 Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Thu, 3 May 2018 11:38:27 +0800
Subject: [PATCH] merge

---
 boot-web/src/main/resources/application.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot-web/src/main/resources/application.yml b/boot-web/src/main/resources/application.yml
index c90465e..9a1ee5c 100644
--- a/boot-web/src/main/resources/application.yml
+++ b/boot-web/src/main/resources/application.yml
@@ -2,7 +2,7 @@
 server:
   port: 8088
   session:
-    timeout: 3600 #单位秒
+    timeout: 3600 #秒
   context-path: /
 
 #spring
@@ -53,7 +53,7 @@ spring:
      username: guest
      password: guest
      virtual-host: /
-     connection-timeout: 5
+     connection-timeout: 60000 #毫秒
      publisher-confirms: true
      publisher-returns: true
 #log