diff --git a/.gitmodules b/.gitmodules index 314cf25..02dfb81 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "thrid_party/game2006market"] path = thrid_party/game2006market url = git@git.kingsome.cn:aozhiwei/game2006market.git +[submodule "thrid_party/tools"] + path = thrid_party/tools + url = git@git.kingsome.cn:server_common/tools.git diff --git a/boundle.sh b/boundle.sh deleted file mode 100755 index f6651ec..0000000 --- a/boundle.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -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 config bin web3service reload.sh restart.sh diff --git a/boundle.sh b/boundle.sh new file mode 120000 index 0000000..0b7edac --- /dev/null +++ b/boundle.sh @@ -0,0 +1 @@ +thrid_party/tools/scripts/publish_nodejs/boundle.sh \ No newline at end of file diff --git a/ecosystem.config.js b/ecosystem.config.js new file mode 120000 index 0000000..a71bd39 --- /dev/null +++ b/ecosystem.config.js @@ -0,0 +1 @@ +thrid_party/tools/scripts/publish_nodejs/ecosystem.config.js \ No newline at end of file diff --git a/reload.sh b/reload.sh deleted file mode 100644 index e69de29..0000000 diff --git a/reload.sh b/reload.sh new file mode 120000 index 0000000..69de3f1 --- /dev/null +++ b/reload.sh @@ -0,0 +1 @@ +thrid_party/tools/scripts/publish_nodejs/reload.sh \ No newline at end of file diff --git a/restart.sh b/restart.sh deleted file mode 100755 index f251a06..0000000 --- a/restart.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -ps -ef|grep node|grep web3service|grep -v grep -if [ $? -eq 0 ]; then - ps -ef|grep node|grep web3service|grep -v grep|awk '{print $2}'|xargs kill -9 -fi - -cd bin -nohup node ../web3service/app.js >> web3service.out 2>&1 & diff --git a/restart.sh b/restart.sh new file mode 120000 index 0000000..562a2e2 --- /dev/null +++ b/restart.sh @@ -0,0 +1 @@ +thrid_party/tools/scripts/publish_nodejs/restart.sh \ No newline at end of file diff --git a/thrid_party/tools b/thrid_party/tools new file mode 160000 index 0000000..b94810b --- /dev/null +++ b/thrid_party/tools @@ -0,0 +1 @@ +Subproject commit b94810b53dbe81d609bf5f859bd7e77214d38963