From 9b33e93fccddea356c3d686684fc58ceb176ff39 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 30 Mar 2018 15:01:26 +0800
Subject: [PATCH] 增加 省市区 查询条件

---
 src/main/resources/application.yml |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 01a9aae..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
@@ -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
-  config-location: classpath:/mapper/mybatis-config.xml
\ No newline at end of file
+  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