1、Api生成BUG

src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java

@@ -403,19 +403,20 @@ public class Dialog {
                     }
                     modulePath.setText(file.getAbsolutePath());
 
-                    String absolutePath = file.getAbsolutePath();
+                    String projectName = "";
-
+                    // 尝试查找Windows下的项目名称
-                    String s = absolutePath.replaceAll(File.separator, "#");
+                    String path = file.getAbsolutePath();
-                    Pattern compile = Pattern.compile("#project#(.*)#src#main#java#");
+                    String pathReplace = path.replaceAll("\\\\", "#");
-                    Matcher matcher = compile.matcher(s);
+                    if (pathReplace.equals(path)) {
-                    File api = new File(apiPath.getText());
+                        pathReplace = path.replaceAll("/", "#");
-                    if (!matcher.find()) {
-                        apiPath.setText(new File(api.getParentFile().getAbsolutePath(), "api").getAbsolutePath());
-                    } else {
-                        String group = matcher.group(1);
-                        apiPath.setText(new File(api.getParentFile().getAbsolutePath(), group + "-api").getAbsolutePath());
                     }
-                    System.out.println(file.getAbsolutePath());
+                    Pattern compile = Pattern.compile("#([^#]*)#src#main#java#");
+                    Matcher matcher = compile.matcher(pathReplace);
+                    if (matcher.find()) {
+                        projectName = matcher.group(1);
+                    }
+
+                    apiPath.setText(new File(ProjectManager.getPath(), projectName + "-api").getAbsolutePath());
                 }
             });
 
@@ -514,7 +515,6 @@ public class Dialog {
                     } else {
                         modulePath.setText(modul.getAbsolutePath());
 
-
                         String projectName = "";
                         // 尝试查找Windows下的项目名称
                         String path = modul.getAbsolutePath();
@@ -522,7 +522,7 @@ public class Dialog {
                         if (pathReplace.equals(path)) {
                             pathReplace = path.replaceAll("/", "#");
                         }
-                        Pattern compile = Pattern.compile("#project#(.*)#src#main#java#");
+                        Pattern compile = Pattern.compile("#([^#]*)#src#main#java#");
                         Matcher matcher = compile.matcher(pathReplace);
                         if (matcher.find()) {
                             projectName = matcher.group(1);

src/main/java/xyz/wbsite/dbtool/javafx/tool/JavaClassReader.java

@@ -128,10 +128,10 @@ public class JavaClassReader {
                 break;
             }
         }
-        if ("".equals(body.get(0))){
+        if (body.size() > 1 && "".equals(body.get(0))) {
             body.remove(0);
         }
-        if ("".equals(body.get(body.size()-1))){
+        if (body.size() > 1 && "".equals(body.get(body.size() - 1))) {
             body.remove(body.size() - 1);
         }