From d7f56c6a49c2a5be1e71c9b3e126f2c38ef77a10 Mon Sep 17 00:00:00 2001 From: wangbing Date: Sat, 11 Apr 2020 17:32:05 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 82ae83653d32cf14376b5e3b17dc4be856a424ee --- .../dbtool/javafx/ctrl/MainController.java | 5 -- .../dbtool/javafx/manger/ProjectManager.java | 27 ----------- .../javafx/manger/callable/SBMDBCallable.java | 43 ------------------ .../wbsite/dbtool/javafx/po/SBMDBOption.java | 4 -- .../xyz/wbsite/dbtool/javafx/tool/Dialog.java | 20 -------- src/main/resources/fxml/main.fxml | 1 - .../modules/SpringBootMDB/SpringBootMDB.zip | Bin 5766 -> 0 bytes 7 files changed, 100 deletions(-) delete mode 100644 src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SBMDBCallable.java delete mode 100644 src/main/java/xyz/wbsite/dbtool/javafx/po/SBMDBOption.java delete mode 100644 src/main/resources/modules/SpringBootMDB/SpringBootMDB.zip 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 5e9056d1cc886f1f342eb421defbad2672398bb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5766 zcmbVP2Rzj8A3rNw_BboDS2krO63$&`7lpI8!zCf(NMwbO9XZK3!l9HXTK32$R7OK( zL|Om4D|H&b>VID6bKiSC&*%MqKF|9;0}3J`r2^nyjAt=s?D0 z%2>;Kna_X%O)ccXE74Ln*et1ajbEcqvd1|ClNmXaQ$Zgbo*2NMn!legM5J!Dt+co8 z5~aJ%Fn;^$b1g)6ZIsYgOh!VWy7RCNrAt>bsTH=`%p(t}63hb{+|_rV&42 zXVl^wZK1K!#EGEz@S_WiOICSu5%YGb0{%*S&j2AYs`0YV&UcVuHrRz$A}lhNZCP4_ zh;VWI5_8s|oiS(pDUQBAcKEpedi~FF$F28(xp@A^CazzC;5WI#{9ymFbI%`k+Ie~W z$8M3o*zMpC^MJb(N-Zw{10j3Ed|w7DvrrNMK=~iMXu{#{E_N`4i$WuZkmvFYg;!RKw>Z>Y5lF{mC&hEUNZhziv_uc0{G0gXKt8Jj#; zQM=_6K*43JA^>|^jogKid@^{`|18Oi1M3%6J_suh8Kdf9i$%3tq`z0{zJIs|J1L|yah-#a&#T+8%0-B^aBxMJnQ)aKsGj3jvoc2IUH$J1H%JJ<}S~aqGMiPTT z>4VbxeB_so^rq@7HBCQUR6%;Aa$N1Sf$@pAzrQ}!vXFWqJoI45XsL>>Q}Nxl95*ZE z_}G-o47DB@r5f4Mgm$tS8qTxol2@pgi?LYkoZ2vZ3%;9*ww6?K9@BU`&U$%3kz_Kq zL@U#Cg4@+~{6c8=s7B7Irn9-XFFD%4$01>SyI<_3JOVQSP1qJ9Dz|jnP=VIcr(>J7 z_??8WP98Kp-oybTW7itKBzNAUw6csT(AR2B z+T+N5p3jZv;n`?oo=R2E-fqpy)<6#wS@dmCx=sb1fn3PN_(Dl14X!1zc-L6oh2lDP zeRsqqb)IV~aT$ZwF4lR(wYiQElF#O#d5kX98*wyCVSh~gJ1I<_2Kn+ZCe>0axSu9v zpP2i>cjf6Xnl|(1Ap7Q5H-pKzT)T2e3(}D2Vn3$)DR!ubXA@nmg}K69Q*+ z8^^DXftL$1Up@9$oqG@;KiI$!RYFS;m=wy}rnjw=|2fT6X1d3KTC(&=y{n(O6kt7u#HmXHuu3B+KOr z9B&Jh>+Ie$Zgb9{2x&)qt|O7!)X_(QgD#TfxU&P7v13cvp@ByZR1gc#Zj0;s4gQ^M zZ$BzgTx*+oL1Pj$e;}T4_R;wNHVhtXra4Fh8!1hPlpkI_}z~-i1<0 zdZATwO)0tP>0MT$Gl3HoekV8&AI{cp&CRGWDb!Qc$a$9NUS&WQvWuMBlp`!5r7f-Y z7#9WUdVTvX62ybgtixSFEVU^gWrFBD)kuW} zP?Xlvdk<X>PeVp?l{$Dd4V1a2SCmhNc4vGZY8IqiNuT|!t*ZZ#&wQQ9 zEj+zc4gJ=7P-Y6z_|7GZvFfEar!YBxFb5(<^!P*g33k#WO{&Y}-m)$-^^;eQl0BV| zpA*aU6!Fcz>K_mk?){>pzOTIW=&|S#FY1Rx>xIqZiR4r&E3vUchi6u;TxdV<@0#h? z@sM0IrS7xR7O7had0c6;)rGjKG_P!Zmzbt@7D74&Iy9hJwz4JCtvvXkVS#&#Vqt`8 zY_jKp;bM|JQAiIH_q*I#e|cc77eaOFRN@gm**ODs0qy-;g`CV%OCRPnz9-xctQN8I z`}UH?e%jfNeJl0&s*S6?+tm|S%fWCTf?E8ew|`0B2(QySo&DIg@co{ekAtt*DIYrr zUxMu40%?Wx1m0DRBLx7usR00`zuAsW_uoo6+{X)>`w=b0FXs4@&Fb%fQDDw(-*?hC4mGV^yc7q@teMUcH+aQ)>?4Mb{?y1w<70-;3;e z-tbAx_e9rIStK8zT)%+$ZO5~-y%{{nu#1=2SFdLXNM(>ar*iALq8d%~6nlp^uU6HL ztiNu0)+%1co9h>^1j$`jR5v@Hbdr4f1HfHV?4q|E-E$V;6f$fwJGg4}Q}D~B^9d^T z;$?A|{(jd(7X+&G3Q81d)mT4Ga28T}DEe034Hl(lT`QHnZrFy3D}NlEB*ZPXCzf2h zOYeN7x&*L9D7*NEB2Nn|Pf+*Jnf}dJnrp4$)7{hS**7;WZithpV|YRaRD-h|DG#$S z_148YF2wid+CoVRN7IKm7nRnkoZZsRI!q|2^qVa!7{l(cSJbhZS!bcuy?8f9H`hn{ zr!Dp+tM|#z7^J`I)qW+P?(CQZ(ektYY*+2)w_?Hj_Ehkg>mC2d8ij#zH?@$S;RA}Y zuTdI$l3dk_A+BZb#uLRl@A%O zw!ZW&w`zS!8&s4*v7&jKuid;mi1r+n!O3ipM%aa0zza))WntA*_Let3Ha85;qWgkX zax$VdlGYV82D#^I(Tn1BakDV}0Lb%)&|KPznM$Gyw=`&0c)2!1o;;nU1q!;8U(TKf z`0|rJqF!5Sj$opgGbmW=tgaH1hDp3h0IyA+&WH8_97SLgbDnH!;fbLP(Wgu!HbjoW*{->t^zU% zRSDw!v0dtBc{ZPdr~Au-=wGA&8#&LH3i2QWtKcgsbDC$NLJaqNjclz`ZoyjOEMfE~ zB{FTzRg09O>&oihc#Dd}NE-?YHd=w%-4NNl#~5ET*cqfH^;Q~)RQWp}o;>vE^(4nB zm&;Y@m829=CzOpJZCqcR84u<1m^=l#w?PqD(sJW~;BufIS94%<$vvot$bB@LkG@S{ zujDO;)fmWp6~Nby5`*F-KH+=X`@Oa;+ksmmb;ulH|8t4e%yYp7kw(lS$$jF6wqY#v zM}5Ra#~B2cpwBN=_BJx_g&8FFvcFLheD0?Gd&0DJJ?69L!(rqh7|MZ2F8 zZQBO+;R&CKKJ3_t^Z&a6eA_?Hj|BF;)Bm?|oDfKN%L@_9a93&iaXf)JUX)D@4sZ56`_k-zBi=P7;r3UPW&`v>G7XLdp+olm3hqOf8@ z`or*yoL32%{8~)=cEo^(^v_Y>j=|Tlm5_i@g99FT+YWBc5M09VhFii=xcxhUUyizj ztg1&bqPX8!sggaOoqx>xpIH4o+7PlL!4Bbn65|hH`NC@FphHNC$~TG_M`}A%J{MOA zNPW4hAG=cN9e0&L`S+x@J6=Ktre<>VI0ivyo$+DWekM$BKQh>M2I?!(1)BgYp{fF5A