Merge remote-tracking branch 'origin/master'

沈斌

2018-02-02 f2b0c39642daf84c37b728d8d5553e866908faf1

Merge remote-tracking branch 'origin/master'

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

@@ -38,7 +38,7 @@
    public static final String AUTHENTICATION_HEADER_NAME = "X-Authorization";
    public static final String AUTHENTICATION_URL = "/auth/login";
    public static final String REFRESH_TOKEN_URL = "/auth/token";
    public static final String API_ROOT_URL = "/*/**";
    public static final String API_ROOT_URL = "/**/*";

    @Autowired
    private RestAuthenticationEntryPoint authenticationEntryPoint;