Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-02 57cb796b40a983afcff66edf967e2a1eb513b870

Merge remote-tracking branch 'origin/master'

 src/main/java/com/moral/security/model/token/JwtTokenFactory.java

@@ -58,7 +58,7 @@
          .setIssuer(settings.getTokenIssuer())
          .setIssuedAt(Date.from(currentTime.atZone(ZoneId.systemDefault()).toInstant()))
          .setExpiration(Date.from(currentTime
              .plusMinutes(settings.getTokenExpirationTime())
              .plusMinutes(15)
              .atZone(ZoneId.systemDefault()).toInstant()))
          .signWith(SignatureAlgorithm.HS512, settings.getTokenSigningKey())
        .compact();