Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 01329695ebf6eea6576d76825181b2f3833297e8

 src/main/java/com/moral/security/WebSecurityConfiguration.java

@@ -49,10 +49,10 @@

    @Override
    protected void configure(HttpSecurity http) throws Exception {
      http
      .anonymous().disable()
        .authorizeRequests()
        .antMatchers("/oauth/token").permitAll();
      http.csrf().disable(); //TODO 暂时关闭CSRF
      http.anonymous().disable()
            .authorizeRequests()
            .antMatchers("/oauth/token").permitAll();
    }

    @Override