diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java index 936777b9..f52cdd2f 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java @@ -192,9 +192,4 @@ public class MainController { public void generateAndroid(ActionEvent actionEvent) { Dialog.showAndroid(); } - - @FXML - public void generateSBMDB(ActionEvent actionEvent) { - Dialog.showSBMDB(); - } } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java index 6aca3bec..ab09a31a 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java @@ -4,7 +4,6 @@ import org.springframework.boot.system.ApplicationHome; import xyz.wbsite.dbtool.javafx.enums.FieldType; import xyz.wbsite.dbtool.javafx.manger.callable.AndroidCallable; import xyz.wbsite.dbtool.javafx.manger.callable.ApiCallable; -import xyz.wbsite.dbtool.javafx.manger.callable.SBMDBCallable; import xyz.wbsite.dbtool.javafx.manger.callable.SpringBootCallable; import xyz.wbsite.dbtool.javafx.manger.callable.VueCallable; import xyz.wbsite.dbtool.javafx.po.AbstractDBmapper; @@ -15,7 +14,6 @@ import xyz.wbsite.dbtool.javafx.po.Module; import xyz.wbsite.dbtool.javafx.po.MySQLDBmapper; import xyz.wbsite.dbtool.javafx.po.OracleDBmapper; import xyz.wbsite.dbtool.javafx.po.Project; -import xyz.wbsite.dbtool.javafx.po.SBMDBOption; import xyz.wbsite.dbtool.javafx.po.Table; import xyz.wbsite.dbtool.javafx.po.VueOption; import xyz.wbsite.dbtool.javafx.tool.Dialog; @@ -430,31 +428,6 @@ public class ProjectManager { }.start(); } - public void generate(final String path, SBMDBOption option) { - Dialog.showProgress("生成中..."); - new Thread() { - @Override - public void run() { - SBMDBCallable callable = new SBMDBCallable(path, option); - - Future submit = service.submit(callable); - try { - Boolean b = (Boolean) submit.get(); - if (!b) { - Dialog.showError("请确认目录结构是否存在或正确!"); - } - } catch (InterruptedException e) { - e.printStackTrace(); - } catch (ExecutionException e) { - e.printStackTrace(); - } - - Dialog.stopPopup(); - Dialog.showSuccess("生成完毕."); - } - }.start(); - } - /** * 初始化模型树,当存在多个时,默认第一个 */ diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SBMDBCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SBMDBCallable.java deleted file mode 100644 index 9cb6adf1..00000000 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SBMDBCallable.java +++ /dev/null @@ -1,43 +0,0 @@ -package xyz.wbsite.dbtool.javafx.manger.callable; - -import xyz.wbsite.dbtool.javafx.manger.FreeMarkerManager; -import xyz.wbsite.dbtool.javafx.manger.ManagerFactory; -import xyz.wbsite.dbtool.javafx.po.SBMDBOption; -import xyz.wbsite.dbtool.javafx.tool.Tool; -import xyz.wbsite.dbtool.web.frame.utils.ZipUtil; - -import javax.validation.constraints.NotNull; -import java.io.File; -import java.util.concurrent.Callable; - -public class SBMDBCallable implements Callable { - - private String path; - private SBMDBOption option; - - private FreeMarkerManager freeMarkerManager; - - public SBMDBCallable(@NotNull String path, SBMDBOption option) { - this.path = path; - this.option = option; - this.freeMarkerManager = ManagerFactory.getFreeMarkerManager(); - } - - public Boolean call() throws Exception { - // 文件输出文件 - File zipFile = new File(path, "SpringBootMDB.zip"); - // 文件输出目录 - File dir = new File(path, "SpringBootMDB"); - // 清空输出目录 - Tool.clear(dir); - System.out.println("清空文件" + dir.getAbsolutePath()); - // 输出文件 - Tool.outputResource("SpringBootMDB/SpringBootMDB.zip", zipFile); - // 解压文件 - new ZipUtil().unZip(zipFile, new File(path)); - // 删除文件 - zipFile.delete(); - System.out.println("删除文件" + zipFile.getAbsolutePath()); - return true; - } -} diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/SBMDBOption.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/SBMDBOption.java deleted file mode 100644 index d5825d5c..00000000 --- a/src/main/java/xyz/wbsite/dbtool/javafx/po/SBMDBOption.java +++ /dev/null @@ -1,4 +0,0 @@ -package xyz.wbsite.dbtool.javafx.po; - -public class SBMDBOption { -} diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java b/src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java index daf24c63..a198cfa3 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java @@ -571,26 +571,6 @@ public class Dialog { popup.show(); } - public static void showSBMDB() { - ProjectManager dBmanger = ManagerFactory.getProjectManager(); - DirectoryChooser directoryChooser = new DirectoryChooser(); - directoryChooser.setInitialDirectory(dBmanger.getPath()); - Stage stage = new Stage(); - File file = directoryChooser.showDialog(stage); - if (file != null) { - System.out.println("生成目录:" + file.getAbsolutePath()); - SBMDBOption option = new SBMDBOption(); - - dBmanger.generate(file.getAbsolutePath(), option); - Platform.runLater(new Runnable() { - @Override - public void run() { - stage.close(); - } - }); - } - } - public static void showVue() { FXMLLoader dbdetailloader = new FXMLLoader(Application.class.getResource("../../../fxml/vueOption.fxml")); try { diff --git a/src/main/resources/fxml/main.fxml b/src/main/resources/fxml/main.fxml index 110fe714..b810090f 100644 --- a/src/main/resources/fxml/main.fxml +++ b/src/main/resources/fxml/main.fxml @@ -36,7 +36,6 @@ - diff --git a/src/main/resources/modules/SpringBootMDB/SpringBootMDB.zip b/src/main/resources/modules/SpringBootMDB/SpringBootMDB.zip deleted file mode 100644 index 5e9056d1..00000000 Binary files a/src/main/resources/modules/SpringBootMDB/SpringBootMDB.zip and /dev/null differ