From 9742e7a70ac6e74d114e68ce1bc8f46670b55453 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 25 Jun 2018 16:39:48 +0800
Subject: [PATCH] 组织配置单位和页面布局

---
 src/main/resources/application.yml |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index dfe775d..b5a49fb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,21 +1,18 @@
+
 server:
-  port: 8001
+  port: 8080
   session-timeout: 30
   tomcat.max-threads: 0
   tomcat.uri-encoding: UTF-8
-spring.profiles: default
-moral:
-  security:
-    jwt:
-      tokenExpirationTime: 15 # Number of minutes
-      refreshTokenExpTime: 60 # Minutes
-      tokenIssuer: http://monitor.7drlb.com
-      tokenSigningKey: xm9EV6Hy5RAFL8EEACIDAwQus
+  jsp-servlet:
+    init-parameters:
+            development: true
+
 spring:
   thymeleaf:
     cache: false
   datasource:
-    url: jdbc:mysql://47.96.19.115:3306/monitor_db?characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+    url: jdbc:mysql://47.96.26.152:3306/monitor_db?characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
     username: root
     password: xOlx8z9L7Pt6y9YI
     #driver-class-name: com.mysql.cj.jdbc.Driver
@@ -55,10 +52,10 @@
 
 
   redis:
-    host: 47.96.19.115
+    host: 47.100.8.247
     port: 6379
-    password: redis_pass
-    database: 0
+    password:
+    database: 1
     timeout: 0
     pool:
       max-active: 8
@@ -67,11 +64,19 @@
       min-idle: 0
 
 
-  data:
-    mongodb:
-      uri: mongodb://47.96.171.62:27017/monitor
+#  data:
+#    mongodb:
+#      uri: mongodb://47.96.171.62:27017/monitor
 
 mybatis:
   mapper-locations: classpath*:/mapper/*Mapper.xml
   config-location: classpath:/mapper/mybatis-config.xml
 
+spring.profiles: default
+
+moral.security.jwt:
+  tokenExpirationTime: 5 # Number of minutes
+  refreshTokenExpTime: 60 # Minutes
+  tokenIssuer: http://monitor.7drlb.com
+  tokenSigningKey: xm9EV6Hy5RAFL8EEACIDAwQus
+

--
Gitblit v1.8.0