fix: 优化字典的并行执行和树结构转换 (#321)

Author: kyouji

hsweb-system/hsweb-system-dictionary/src/main/java/org/hswebframework/web/dictionary/configuration/DictionaryProperties.java

@@ -35,35 +35,30 @@ public Stream<Class<?>> doScanEnum() {
         CachingMetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory();
         ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
 
-        return packages
-            .parallelStream()
-            .flatMap(enumPackage -> {
-                String path = "classpath*:" + ClassUtils.convertClassNameToResourcePath(enumPackage) + "/**/*.class";
-                log.info("scan enum dict package:{}", path);
-                Resource[] resources;
+        List<Class<?>> classes = new ArrayList<>();
+        for (String enumPackage : packages) {
+            String path = "classpath*:" + ClassUtils.convertClassNameToResourcePath(enumPackage) + "/**/*.class";
+            log.info("scan enum dict package:{}", path);
+            Resource[] resources;
+            try {
+                resources = resourcePatternResolver.getResources(path);
+            } catch (IOException e) {
+                log.warn("scan enum dict package:{} error:", path, e);
+                return Stream.empty();
+            }
+            for (Resource resource : resources) {
                 try {
-                    resources = resourcePatternResolver.getResources(path);
-                } catch (IOException e) {
-                    log.warn("scan enum dict package:{} error:", path, e);
-                    return Stream.empty();
-                }
-                return Stream
-                    .of(resources)
-                    .map(resource -> {
-                        try {
-                            MetadataReader reader = metadataReaderFactory.getMetadataReader(resource);
-                            String name = reader.getClassMetadata().getClassName();
-                            Class<?> clazz = ClassUtils.forName(name, null);
-                            if (clazz.isEnum() && EnumDict.class.isAssignableFrom(clazz)) {
-                                return clazz;
-                            }
-                        } catch (Throwable ignore) {
-
-                        }
-                        return null;
-                    })
-                    .filter(Objects::nonNull);
-            });
+                    MetadataReader reader = metadataReaderFactory.getMetadataReader(resource);
+                    String name = reader.getClassMetadata().getClassName();
+                    Class<?> clazz = ClassUtils.forName(name, null);
+                    if (clazz.isEnum() && EnumDict.class.isAssignableFrom(clazz)) {
+                        classes.add(clazz);
+                    }
+                } catch (Throwable ignore) {
 
+                }
+            }
+        }
+        return classes.stream();
     }
 }