Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

 src/main/resources/application.yml

@@ -3,14 +3,7 @@
  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

spring:
  thymeleaf:
    cache: false
@@ -75,3 +68,10 @@
  mapper-locations: classpath*:/mapper/*Mapper.xml
  config-location: classpath:/mapper/mybatis-config.xml

spring.profiles: default

moral.security.jwt:
  tokenExpirationTime: 15 # Number of minutes
  refreshTokenExpTime: 60 # Minutes
  tokenIssuer: http://monitor.7drlb.com
  tokenSigningKey: xm9EV6Hy5RAFL8EEACIDAwQus