From 63fa05b440dae23591bb81c4c884e0d50aab3b5a Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 24 Sep 2020 10:06:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=9B=E5=BB=BA=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=A8=A1=E6=9D=BF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeesite/common/io/FileUtils.java | 10 +- .../templates/modules/gen/cloud/client.xml | 2 +- .../templates/modules/gen/config.xml | 13 + .../modules/gen/module/bin/deploy.bat.xml | 28 + .../modules/gen/module/bin/package.bat.xml | 28 + .../templates/modules/gen/module/db/erm.xml | 3549 +++++++++++++++++ .../templates/modules/gen/module/pom.xml | 70 + .../gen/module/src/main/java/package.xml | 11 + .../src/main/resources/config/jeesite.xml | 15 + .../module/src/main/resources/db/versions.xml | 9 + .../src/main/resources/static/static.xml | 11 + 11 files changed, 3741 insertions(+), 5 deletions(-) create mode 100644 modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.bat.xml create mode 100644 modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml create mode 100644 modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml create mode 100644 modules/core/src/main/resources/templates/modules/gen/module/pom.xml create mode 100644 modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml create mode 100644 modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml create mode 100644 modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml create mode 100644 modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml diff --git a/common/src/main/java/com/jeesite/common/io/FileUtils.java b/common/src/main/java/com/jeesite/common/io/FileUtils.java index eeaf1a36..9ebc21ca 100644 --- a/common/src/main/java/com/jeesite/common/io/FileUtils.java +++ b/common/src/main/java/com/jeesite/common/io/FileUtils.java @@ -878,8 +878,9 @@ public class FileUtils extends org.apache.commons.io.FileUtils { if (f.exists()){ break; } - if (file.getParentFile() != null){ - file = file.getParentFile(); + File p = file.getParentFile(); + if (p != null){ + file = p; }else{ break; } @@ -916,8 +917,9 @@ public class FileUtils extends org.apache.commons.io.FileUtils { if (f.exists()){ return f.getPath(); } - if (file.getParentFile() != null){ - file = file.getParentFile(); + File p = file.getParentFile(); + if (p != null){ + file = p; }else{ break; } diff --git a/modules/core/src/main/resources/templates/modules/gen/cloud/client.xml b/modules/core/src/main/resources/templates/modules/gen/cloud/client.xml index 233e1187..43b9a45e 100644 --- a/modules/core/src/main/resources/templates/modules/gen/cloud/client.xml +++ b/modules/core/src/main/resources/templates/modules/gen/cloud/client.xml @@ -1,7 +1,7 @@