Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

 src/main/resources/application.yml

@@ -4,9 +4,6 @@
  session-timeout: 30
  tomcat.max-threads: 0
  tomcat.uri-encoding: UTF-8
  jsp-servlet:
    init-parameters:
            development: true

spring:
  thymeleaf:
@@ -65,6 +62,7 @@
      min-idle: 0



#  data:
#    mongodb:
#      uri: mongodb://47.96.171.62:27017/monitor