瀏覽代碼

删除测试代码

wangyu 6 年之前
父節點
當前提交
dd13dbd0ee

+ 0 - 3
diagbotman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -28,9 +28,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/druid.*", "/actuator.*", "/hystrix.*"
                         , "/service_filter/getAll", "/serviceToken/hasPermission").permitAll()
                 .antMatchers("/getDiagbotManEnumsData").permitAll()
-                .antMatchers("/diagLantoneProduct/selectProduct").permitAll()
-                .antMatchers("/morServices/addOrder").permitAll()
-                .antMatchers("/diagLantoneProduct/opendedProduct").permitAll()
                 .antMatchers("/productOrder/getInformationAvailableAll").permitAll()
                 .antMatchers("/**").authenticated();
         //        .antMatchers("/**").permitAll();

+ 1 - 4
diagbotman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -25,7 +25,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
     public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes) throws AccessDeniedException, InsufficientAuthenticationException {
         HttpServletRequest request = ((FilterInvocation) object).getHttpRequest();
         String url, method;
-        if ("anonymousUser".equals(authentication.getPrincipal())) {
+        if ("anonymousUser".equals(authentication.getPrincipal())){
             if (matchers("/swagger/**", request)
                     || matchers("/v2/**", request)
                     || matchers("/swagger-ui.html/**", request)
@@ -38,9 +38,6 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                     || matchers("/service_filter/getAll", request)
                     || matchers("/serviceToken/hasPermission", request)
                     || matchers("/productOrder/getInformationAvailableAll", request)
-                    || matchers("/diagLantoneProduct/selectProduct", request)
-                    || matchers("/morServices/addOrder", request)
-                    || matchers("/diagLantoneProduct/opendedProduct", request)
                     || matchers("/", request)) {
                 return;
             } else {

+ 2 - 2
diagbotman-service/src/main/java/com/diagbot/facade/OrderDetailsFacade.java

@@ -126,10 +126,10 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
         OrderDetailsIndex orderDetailsIndex =new OrderDetailsIndex();
         Long curren = orderDetialsVO.getCurrent();
         Long size =orderDetialsVO.getSize();
-        if(curren==null){
+        if(curren==null || curren==0){
             orderDetialsVO.setCurrent(1L);
         }
-        if (size==null){
+        if (size==null || size==0){
             orderDetialsVO.setSize(10L);
         }
         BeanUtil.copyProperties(orderDetialsVO, orderDetailsIndex);