From 7be408b1ce28b70005cdf147f9c41065ddc43dea Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 08 May 2018 16:48:18 +0800
Subject: [PATCH] 设备信息修改

---
 src/main/resources/application.yml |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index aa91078..0580053 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,12 +1,18 @@
+
 server:
-  port: 8001
+  port: 8080
   session-timeout: 30
   tomcat.max-threads: 0
   tomcat.uri-encoding: UTF-8
+  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
@@ -36,6 +42,7 @@
     # ������������DruidDataSource���������������
     useGlobalDataSourceStat: true
 
+
   rabbitmq:
     host: 116.62.12.115
     port: 5672
@@ -45,7 +52,7 @@
 
 
   redis:
-    host: 101.37.22.173
+    host: 47.96.19.115
     port: 6379
     password: redis_pass
     database: 0
@@ -57,10 +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
-#  type-aliases-package: com.moral.entity
\ No newline at end of file
+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