Merge branch 'master' into master

TongchengOpenSource · Jan 21, 2024 · c3929bc · c3929bc
2 parents 1612f8f + 37e4ac7
commit c3929bc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/ly/doc/builder/ProjectDocConfigBuilder.java b/src/main/java/com/ly/doc/builder/ProjectDocConfigBuilder.java
@@ -254,7 +254,7 @@ private void initClassFilesMap() {
                         enumClass = classLoader.loadClass(cls.getFullyQualifiedName());
                     }
                     enumClassMap.put(cls.getFullyQualifiedName(), enumClass);
-                } catch (ClassNotFoundException e) {
+                } catch (ClassNotFoundException | NoClassDefFoundError e) {
                     continue;
                 }
             }

diff --git a/src/main/java/com/ly/doc/template/IRestDocTemplate.java b/src/main/java/com/ly/doc/template/IRestDocTemplate.java
@@ -955,7 +955,7 @@ default ApiRequestExample buildReqJson(DocJavaMethod javaMethod, ApiMethodDoc ap
                 if (!JavaClassValidateUtil.isPrimitive(gicName)
                         && !configBuilder.getJavaProjectBuilder().getClassByName(gicName).isEnum()) {
                     throw new RuntimeException("can't support binding Collection on method "
-                            + method.getName() + "Check it in " + method.getDeclaringClass().getCanonicalName());
+                            + method.getName() + " Check it in " + method.getDeclaringClass().getCanonicalName());
                 }
                 String value;
                 JavaClass javaClass1 = configBuilder.getClassByName(gicName);

diff --git a/src/main/java/com/ly/doc/utils/TornaUtil.java b/src/main/java/com/ly/doc/utils/TornaUtil.java
@@ -57,7 +57,7 @@ public static void pushToTorna(TornaApi tornaApi, ApiConfig apiConfig, JavaProje
             return;
         }
         // Push all documents
-        if (null != apiConfig.getApiUploadNums()) {
+        if(apiConfig.getApiUploadNums() == null){
             pushToTornaAll(tornaApi, apiConfig, builder);
             return;
         }