Merge remote-tracking branch 'origin/dev/one' into dev/one

user-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -31,7 +31,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/userver/getSmsWithRegister").permitAll()
                 .antMatchers("/userver/getSmsWithResetPassword").permitAll()
                 .antMatchers("/userver/verifySmsVerification").permitAll()
-                .antMatchers("/user/resetPassword").permitAll()
                 .antMatchers("/getUserEnumsData").permitAll()
                 .antMatchers("/userInfo/getUserInfoPag").permitAll()
                 .antMatchers("/user/getPermission").permitAll()

user-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -33,9 +33,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                     || matchers("/webjars/**", request)
                     || matchers("/user/login/**", request)
                     || matchers("/user/registry/**", request)
-                    || matchers("/user/resetPassword", request)
                     || matchers("/user/test/**", request)
-                    || matchers("/user/resetPassword", request)
                     || matchers("/druid/**", request)
                     || matchers("/actuator/**", request)
                     || matchers("/hystrix/**", request)