From ee882eaee39adcc73898b8b14c4501ae7d89dbcf Mon Sep 17 00:00:00 2001
From: zhaozx <zhaozx@shicaidai.com>
Date: Fri, 24 Aug 2018 22:22:54 +0800
Subject: [PATCH 1/2] fix mac bug

---
 .../main/java/com/power/generator/builder/ConfigBuilder.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-power/src/main/java/com/power/generator/builder/ConfigBuilder.java b/application-power/src/main/java/com/power/generator/builder/ConfigBuilder.java
index 9674854..c10056b 100644
--- a/application-power/src/main/java/com/power/generator/builder/ConfigBuilder.java
+++ b/application-power/src/main/java/com/power/generator/builder/ConfigBuilder.java
@@ -321,11 +321,11 @@ public class ConfigBuilder {
      */
     private String joinJavaFilePath(String packageName, String postfix) {
         String javaDir = projectPath.getJavaSrcPath();
-        return PathUtil.joinPath(javaDir, packageName) + "\\%s" + postfix;
+        return PathUtil.joinPath(javaDir, packageName) + ConstVal.FILE_SEPARATOR + "%s" + postfix;
     }
 
     private String joinFinalPath(String parentDir, String packageName, String postfix) {
-        return PathUtil.joinPath(parentDir, packageName) + "\\%s" + postfix;
+        return PathUtil.joinPath(parentDir, packageName) + ConstVal.FILE_SEPARATOR + "%s" + postfix;
     }
 
     /**
-- 
Gitee


From 9678128ab0d0b0a55f35ff66060b1f63e5fb4baa Mon Sep 17 00:00:00 2001
From: zhaozx <zhaozx@shicaidai.com>
Date: Sat, 25 Aug 2018 08:53:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20if=20[=20"$SERVER=5FPO?=
 =?UTF-8?q?RT=5FCOUNT"=20=3D=3D=20""=20];=20then=20=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/template/assembly/bin/start.sh        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/application-power/src/main/resources/template/assembly/bin/start.sh b/application-power/src/main/resources/template/assembly/bin/start.sh
index 7948e54..92e3eec 100644
--- a/application-power/src/main/resources/template/assembly/bin/start.sh
+++ b/application-power/src/main/resources/template/assembly/bin/start.sh
@@ -77,7 +77,10 @@ if [ -n "$SERVER_PORT" ]; then
     else
         SERVER_PORT_COUNT=$(netstat -tln | grep $SERVER_PORT | wc -l)
     fi
-    if [ "$SERVER_PORT_COUNT" -gt 0 ]; then
+
+    if [ "$SERVER_PORT_COUNT" == "" ]; then
+    	echo "starting"
+    elif [ $SERVER_PORT_COUNT -gt 0 ]; then
         echo "ERROR: The $SERVER_NAME port $SERVER_PORT already used!"
         exit 1
     fi
-- 
Gitee