Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

 src/main/java/com/moral/security/config/JwtSettings.java

@@ -4,7 +4,7 @@
import org.springframework.context.annotation.Configuration;

@Configuration
@ConfigurationProperties(prefix = "moral_security_jwt")
@ConfigurationProperties(prefix = "moral.security.jwt")
public class JwtSettings {
    /**
     * {@link JwtToken} will expire after this time.