From f55f6e05bae945d275101592782fb3b8980d77cf Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Sun, 28 Jun 2020 15:26:47 +0800
Subject: [PATCH] update风速风向显示设置

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

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index dfe775d..ccef0eb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,29 +1,28 @@
+
 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
+    #url: jdbc:mysql://192.168.99.100:3306/monitor_db?characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
     username: root
     password: xOlx8z9L7Pt6y9YI
+    #password: root123
     #driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     # ���������������������������������������������������������������������
     # ���������������������������������
-    initialSize: 1
-    minIdle: 3
+    initialSize: 10
+    minIdle: 10
     maxActive: 20
     # ���������������������������������������
     maxWait: 60000
@@ -35,6 +34,7 @@
     testWhileIdle: true
     testOnBorrow: false
     testOnReturn: false
+    keepAlive: true
     # ������PSCache������������������������������PSCache���������
     poolPreparedStatements: true
     maxPoolPreparedStatementPerConnectionSize: 20
@@ -52,14 +52,12 @@
     username: guest
     password: guest
     channelCacheSize: 10
-
-
   redis:
-    host: 47.96.19.115
+    host: 47.100.8.247
     port: 6379
-    password: redis_pass
-    database: 0
-    timeout: 0
+    password: moral_2018
+    database: 1
+    timeout: 5000
     pool:
       max-active: 8
       max-wait: -1
@@ -67,11 +65,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: 129600 # Number of minutes
+  refreshTokenExpTime: 60 # Minutes
+  tokenIssuer: http://monitor.7drlb.com
+  tokenSigningKey: xm9EV6Hy5RAFL8EEACIDAwQus
+

--
Gitblit v1.8.0