From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 13 Mar 2018 16:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/resources/application.yml | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index dfe775d..0580053 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
@@ -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