From 40c4d82f818594c2693d04a700bd4f02a4a77b46 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 14 Apr 2022 23:18:59 +0800
Subject: [PATCH] 1

---
 .gitmodules       | 3 +++
 bin/web3service   | 1 -
 boundle.sh        | 7 -------
 common.sh         | 3 +++
 reload.sh         | 0
 restart.sh        | 9 ---------
 third_party/tools | 1 +
 7 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 120000 bin/web3service
 delete mode 100755 boundle.sh
 create mode 100644 common.sh
 delete mode 100644 reload.sh
 delete mode 100755 restart.sh
 create mode 160000 third_party/tools

diff --git a/.gitmodules b/.gitmodules
index 314cf25..1daf4a6 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 "third_party/tools"]
+	path = third_party/tools
+	url = git@git.kingsome.cn:server_common/tools.git
diff --git a/bin/web3service b/bin/web3service
deleted file mode 120000
index 0a32384..0000000
--- a/bin/web3service
+++ /dev/null
@@ -1 +0,0 @@
-../thrid_party/game2006market/server/bin/web3service/web3service
\ No newline at end of file
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/common.sh b/common.sh
new file mode 100644
index 0000000..fe13858
--- /dev/null
+++ b/common.sh
@@ -0,0 +1,3 @@
+PROJECT_NAME=web3service
+SCRIPT=web3service/app
+EXT_PKG_FILES=web3service
diff --git a/reload.sh b/reload.sh
deleted file mode 100644
index e69de29..0000000
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/third_party/tools b/third_party/tools
new file mode 160000
index 0000000..2de5a66
--- /dev/null
+++ b/third_party/tools
@@ -0,0 +1 @@
+Subproject commit 2de5a661bdd4cdee42c08c17dbd5a1885d487b23