From c2cdad0a58d5a038acb4cdee5ca07c6f1e3d4edb Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 28 Nov 2019 14:22:10 +0800
Subject: [PATCH] 1

---
 server/tools/scripts/ci/wsproxy/boundle.sh | 8 +++++---
 server/tools/scripts/ci/wsproxy/reload.sh  | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/server/tools/scripts/ci/wsproxy/boundle.sh b/server/tools/scripts/ci/wsproxy/boundle.sh
index 815745a..ce9dee9 100644
--- a/server/tools/scripts/ci/wsproxy/boundle.sh
+++ b/server/tools/scripts/ci/wsproxy/boundle.sh
@@ -1,9 +1,11 @@
+source ./common.sh
+
 cd third_party/wsproxy/server/wsproxy
 python ../tools/scripts/construct/build_pb.py --nohooks 1
-cmake -DGAME_ID=2002 -DMASTER_MODE=1 .
+cmake -DGAME_ID=${GAME_ID} -DMASTER_MODE=1 .
 make clean
 make
-cp ../bin/wsproxy ../../../../bin/wsproxy${GAME_ID}
+cp ../bin/wsproxy ../../../../bin/${PROJECT_NAME}
 
 cd ../../../../
 
@@ -11,4 +13,4 @@ tag_name=`git status |grep '# On branch '|sed 's/# On branch //g'`
 dir_name=`basename $PWD`
 package_name=${dir_name}.tar.gz
 
-tar --exclude=*.git -chzf target/${package_name} bin reload.sh restart.sh start_instance.sh manage.py config
+tar --exclude=*.git -chzf target/${package_name} bin common.sh reload.sh restart.sh start_instance.sh manage.py config
diff --git a/server/tools/scripts/ci/wsproxy/reload.sh b/server/tools/scripts/ci/wsproxy/reload.sh
index e69de29..18a4745 100644
--- a/server/tools/scripts/ci/wsproxy/reload.sh
+++ b/server/tools/scripts/ci/wsproxy/reload.sh
@@ -0,0 +1,2 @@
+source ./common.sh
+echo ${PROJECT_NAME}