wangwei 7 jaren geleden
bovenliggende
commit
11f9605a6e

+ 4 - 0
examcloud-core-basic-starter/assembly.xml

@@ -12,7 +12,11 @@
 		</fileSet>
 		<fileSet>
 			<directory>${project.basedir}/shell</directory>
+			<excludes>
+				<exclude>jvm.conf</exclude>
+			</excludes>
 			<outputDirectory>/</outputDirectory>
+			<fileMode>0777</fileMode>
 		</fileSet>
 	</fileSets>
 	<dependencySets>

+ 1 - 0
examcloud-core-basic-starter/shell/jvm.conf

@@ -0,0 +1 @@
+-server -Xms2g -Xmx2g --spring.profiles.active=test

+ 0 - 22
examcloud-core-basic-starter/shell/start-prod.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-APP_MAIN_JAR="examcloud-core-basic-starter-2.0-SNAPSHOT.jar"
-
-JAVA_OPTS="-server -Xms4g -Xmx4g"
-
-FILE_PATH=$(cd `dirname $0`; pwd)
-
-PID_LIST=`ps -ef|grep $APP_MAIN_JAR|grep java|awk '{print $2}'`
-
-if [ ! -z "$PID_LIST" ]; then
-    echo "APP is already running!"
-    echo "Runnable jar is $APP_MAIN_JAR."
-    echo "PID is"
-    echo "$PID_LIST"
-else
-	nohup java $JAVA_OPTS -jar $FILE_PATH/lib/$APP_MAIN_JAR --spring.profiles.active=prod >/dev/null 2>&1 &
-    echo "starting......"
-fi 
-
-exit 0
-

+ 21 - 13
examcloud-core-basic-starter/shell/start.sh

@@ -2,25 +2,33 @@
 
 APP_MAIN_JAR="examcloud-core-basic-starter-2.0-SNAPSHOT.jar"
 
-JAVA_OPTS="-server -Xms2g -Xmx2g"
-
 FILE_PATH=$(cd `dirname $0`; pwd)
 
+JAVA_OPTS=`cat $FILE_PATH/jvm.conf`
+
+echo "java options:"
+echo "$JAVA_OPTS"
+
 PID_LIST=`ps -ef|grep $APP_MAIN_JAR|grep java|awk '{print $2}'`
 
 if [ ! -z "$PID_LIST" ]; then
-    echo "APP is already running!"
-    echo "Runnable jar is $APP_MAIN_JAR."
-    echo "PID is"
-    echo "$PID_LIST"
+    echo "[ERROR] : APP is already running!"
+    exit -1
+fi
+    
+if [ -z "$1" ]; then
+    echo "[ERROR] :first param must be ['dev','test','prod']"
+    exit -1
+fi
+
+if [ ! -z "$1" ]; then
+  nohup java $JAVA_OPTS -jar $FILE_PATH/lib/$APP_MAIN_JAR --spring.profiles.active=$1 >/dev/null 2>&1 &
 else
-    if [ ! -z "$1" ]; then
-	  nohup java $JAVA_OPTS -jar $FILE_PATH/lib/$APP_MAIN_JAR --spring.profiles.active=$1 >/dev/null 2>&1 &
-    else
-	  nohup java $JAVA_OPTS -jar $FILE_PATH/lib/$APP_MAIN_JAR >/dev/null 2>&1 &
-    fi
-    echo "starting......"
-fi 
+  nohup java $JAVA_OPTS -jar $FILE_PATH/lib/$APP_MAIN_JAR >/dev/null 2>&1 &
+fi
+echo "starting......"
+
+
 
 exit 0