Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-02 57cb796b40a983afcff66edf967e2a1eb513b870

 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;