Revert "修改编译脚本"

This reverts commit f63a55b4.

build/cmd/build-console.sh

@@ -12,7 +12,7 @@ OUTPATH="${BasePath}/out/console-${VERSION}"
 buildApp console $VERSION
 
 mkdir  ${OUTPATH}/static
-
+cp -a ${BasePath}/app/console/static/*  ${OUTPATH}/static/
 cp -a ${BasePath}/build/console/resources/*  ${OUTPATH}/
 
 chmod +x ${OUTPATH}/install.sh ${OUTPATH}/run.sh

build/console/.gitignore

-/static/

build/console/resources/sql/goku_ce.sql

@@ -166,7 +166,6 @@ CREATE TABLE "goku_gateway_api" (
                                   "projectID" integer(11) NOT NULL,
                                   "requestURL" text(255) NOT NULL,
                                   "apiName" text(255) NOT NULL,
-    "alias" text(255),
                                   "requestMethod" text(255) NOT NULL,
                                   "targetServer" text(255),
                                   "targetURL" text(255),
@@ -428,17 +427,17 @@ UPDATE "sqlite_sequence" SET seq = 1 WHERE name = 'goku_admin';
 -- Indexes structure for table goku_balance
 -- ----------------------------
 CREATE INDEX "balanceName"
-ON "goku_balance" (
+  ON "goku_balance" (
                      "balanceName" ASC
-);
+    );
 
 -- ----------------------------
 -- Indexes structure for table goku_cluster
 -- ----------------------------
 CREATE INDEX "name"
-ON "goku_cluster" (
+  ON "goku_cluster" (
                      "name" ASC
-);
+    );
 
 -- ----------------------------
 -- Auto increment value for goku_config_log

build/node/resources/run.sh

@@ -26,21 +26,16 @@ start() {
 
     ADMIN=$1
     INSTANCE=$2
-    CONFIG_PATH=$WORK_PATH/goku-node.json
-    RUN_MODEL="console"
-    if [ -f "$CONFIG_PATH" ]; then
-	RUN_MODEL="config"  
+
+    if [[ "INSTANCE" = "" ]] ;then
+        PORT=${ENV_INSTANCE}
     fi
 
     if [[ "$ADMIN" = "" ]] ; then
         ADMIN=${ENV_ADMIN}
     fi
 
-    if [[ "$INSTANCE" = "" ]]; then
-	INSTANCE = ${ENV_INSTANCE}
-    fi
-
-    if [[ "$ADMIN" == "" && "$RUN_MODEL" == "console" ]] ; then
+    if [[ "$ADMIN" = "" ]] ; then
         echo "start fail :need admin url"
         exit 1
     fi
@@ -48,10 +43,17 @@ start() {
     mkdir -p $WORK_PATH/logs
     echo -e "ENV_PORT=$PORT\nENV_ADMIN=$ADMIN" > $WORK_PATH/$PROG.env
 
-    if [[ "$ADMIN" != "NULL" ]]; then
-    	$PROG_PATH/$PROG --admin=$ADMIN --instance=$INSTANCE
+    if [[ -e "$WORK_PATH/$PROG.pid" ]]; then
+        ## Program is running, exit with error.
+        echo "Error! $PROG is currently running!" 1>&2
+        exit 1
     else
-	$PROG_PATH/$PROG --config=$CONFIG_PATH
+        time=$(date "+%Y%m%d-%H%M%S")
+        ## Change from /dev/null to something like /var/log/$PROG if you want to save output.
+        nohup $PROG_PATH/$PROG --instance=$INSTANCE --admin=$ADMIN 2>&1 >"$WORK_PATH/logs/stdout-$PROG-$time.log" &  pid=$!
+
+        echo "$PROG started"
+        echo $pid > "$WORK_PATH/$PROG.pid"
     fi
 }
  
@@ -102,4 +104,3 @@ case "$1" in
         exit 1
     ;;
 esac
-