Merge branch 'master' into feature/normalBattle

pushdocker.sh

@@ -1,2 +1,17 @@
 #!/bin/sh
-rsync -av --include '.babelrc' --include '.eslintrc.js' --exclude '.*' --exclude './game-server/node_modules' --exclude './game-server/node_modules' --exclude 'node_modules' --exclude 'bower_components' --exclude 'dist' --progress --inplace --no-owner --no-group --rsh='ssh -p22' . root@ltctest:/root/zyz/
+#if [ $# != 1  ] ; then
+#  echo "需要1个参数"
+#  echo "pro: 同步代码到 pro 服务器上，作为正式服使用"
+#  echo "dev: 同步代码到 dev 服务器上，作为测试服供服务开发使用"
+#  exit 1;
+#fi
+#
+#if [ ${1} == 'pro' ] ; then
+#  destUrl="root@zyz:/root/zyz/"
+#elif [ ${1} == 'dev' ] ; then
+destUrl="root@zyztest:/root/zyz/"
+#else
+#  echo "需要一个参数指明服务器"
+#  exit 1;
+#fi
+rsync -av --include '.babelrc' --include '.eslintrc.js' --exclude '.*' --exclude './game-server/node_modules' --exclude './game-server/node_modules' --exclude 'node_modules' --exclude 'bower_components' --exclude 'dist' --progress --inplace --no-owner --no-group --rsh='ssh -p22' . ${destUrl}

pushdocker_zyz_test.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-rsync -av --include '.babelrc' --include '.eslintrc.js' --exclude '.*' --exclude './game-server/node_modules' --exclude './game-server/node_modules' --exclude 'node_modules' --exclude 'bower_components' --exclude 'dist' --progress --inplace --no-owner --no-group --rsh='ssh -p22' . root@zyz_test:/root/zyz/