作者 RuoYi

修复匿名注解Anonymous空指针问题(I683DT)

@@ -3,6 +3,7 @@ package com.ruoyi.framework.config.properties; @@ -3,6 +3,7 @@ package com.ruoyi.framework.config.properties;
3 import java.util.ArrayList; 3 import java.util.ArrayList;
4 import java.util.List; 4 import java.util.List;
5 import java.util.Map; 5 import java.util.Map;
  6 +import java.util.Objects;
6 import java.util.Optional; 7 import java.util.Optional;
7 import java.util.regex.Pattern; 8 import java.util.regex.Pattern;
8 import org.apache.commons.lang3.RegExUtils; 9 import org.apache.commons.lang3.RegExUtils;
@@ -44,12 +45,12 @@ public class PermitAllUrlProperties implements InitializingBean, ApplicationCont @@ -44,12 +45,12 @@ public class PermitAllUrlProperties implements InitializingBean, ApplicationCont
44 45
45 // 获取方法上边的注解 替代path variable 为 * 46 // 获取方法上边的注解 替代path variable 为 *
46 Anonymous method = AnnotationUtils.findAnnotation(handlerMethod.getMethod(), Anonymous.class); 47 Anonymous method = AnnotationUtils.findAnnotation(handlerMethod.getMethod(), Anonymous.class);
47 - Optional.ofNullable(method).ifPresent(anonymous -> info.getPatternsCondition().getPatterns() 48 + Optional.ofNullable(method).ifPresent(anonymous -> Objects.requireNonNull(info.getPatternsCondition().getPatterns())
48 .forEach(url -> urls.add(RegExUtils.replaceAll(url, PATTERN, ASTERISK)))); 49 .forEach(url -> urls.add(RegExUtils.replaceAll(url, PATTERN, ASTERISK))));
49 50
50 // 获取类上边的注解, 替代path variable 为 * 51 // 获取类上边的注解, 替代path variable 为 *
51 Anonymous controller = AnnotationUtils.findAnnotation(handlerMethod.getBeanType(), Anonymous.class); 52 Anonymous controller = AnnotationUtils.findAnnotation(handlerMethod.getBeanType(), Anonymous.class);
52 - Optional.ofNullable(controller).ifPresent(anonymous -> info.getPatternsCondition().getPatterns() 53 + Optional.ofNullable(controller).ifPresent(anonymous -> Objects.requireNonNull(info.getPatternsCondition().getPatterns())
53 .forEach(url -> urls.add(RegExUtils.replaceAll(url, PATTERN, ASTERISK)))); 54 .forEach(url -> urls.add(RegExUtils.replaceAll(url, PATTERN, ASTERISK))));
54 }); 55 });
55 } 56 }