From 005eca6eb2402d787644b9f186806dc82dd643a6 Mon Sep 17 00:00:00 2001
From: 王家文 <wangjiawen@puchigames.com>
Date: Wed, 10 Apr 2024 12:01:52 +0800
Subject: [PATCH] faet: 测试服配置和脚本

---
 sh/pre/api-game.sh | 91 -------------------------------------------------------------------------------------------
 sh/pre/apigame.sh  | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sh/pre/auto.sh     | 17 +++++------------
 3 files changed, 96 insertions(+), 103 deletions(-)
 delete mode 100644 sh/pre/api-game.sh
 create mode 100644 sh/pre/apigame.sh

diff --git a/sh/pre/api-game.sh b/sh/pre/api-game.sh
deleted file mode 100644
index 2c3689f..0000000
--- a/sh/pre/api-game.sh
+++ /dev/null
@@ -1,91 +0,0 @@
- # !/bin/bash
-if [ ! -n "$1" ]; then
-   echo "params error"
-   exit 1
-elif [ $1 != "start" -a $1 != "restart" -a $1 != "stop" ]; then
-   echo "please input start|stop|restart"
-   exit 2
-fi
-env=pre
-nowdate=`date +"%Y%m%d%H%M"`
-execdir=/home/exec/apigame/api/$nowdate
-codedir=/home/code/go/apigame/src
-execname=apigame
-execnewname=API_GAME_$nowdate
-ports=(39080)
-codeport=80
-echo "${execname} script is begin...."
-sleep 1s
-# cd $codedir
-for i in ${ports[@]};
-do
-    if [ $1 == "start" ];then
-        userport=`netstat -antp | grep ":${i}"`
-        if [ ${#userport} -gt 3 ]; then
-                echo "port ${i} is busy..."
-                break
-        fi
-    fi
-    if [ $1 == "start" -o $1 == "restart" ];then
-        #copy new main 
-        cd $codedir
-        if [ $? -ne 0 ]; then
-                echo "cd ${codedir} error,port:${i}"
-                break
-        fi
-        execdirpath=$execdir/$i
-        if [ ! -d $execdirpath ]; then
-                mkdir -p $execdirpath
-                if [ $? -ne 0 ]; then
-                echo "mkdir ${execdirpath} error"
-                 break
-                fi
-                cp $execname $execdirpath/${execnewname}_${i}
-                cp -r conf $execdirpath/
-                #cp -r ../conf $execdirpath/../
-                sed -i "s#httpport = ${codeport}#httpport = ${i}#g" $execdirpath/conf/${env}.conf
-                if [ $? -ne 0 ]; then
-                        echo "sed httpport ${codeport},i:${i} error"
-                        break
-                fi
-                sed -i "s#appname = ${execname}#appname = ${execnewname}_${i}#g" $execdirpath/conf/${env}.conf
-                if [ $? -ne 0 ]; then
-                        echo "sed appname ${execname},i:${i} error"
-                        break
-                fi  
-                rm -rf app.conf
-                if [ $? -ne 0 ]; then
-                        echo "delete app.conf i:${i} error"
-                        break
-                fi  
-                echo "include \"${env}.conf\"" > $execdirpath/conf/app.conf
-        fi
-    fi
-    #kill old port main
-    if [ $1 == "stop" -o $1 == "restart" ];then
-        userport=`netstat -antp | grep ":${i}"`
-        if [ ${#userport} -gt 3 ]; then
-                kill -9 $(netstat -nlp | grep :${i} | awk '{print $7}' | awk -F"/" '{ print $1 }')
-                if [ $? -ne 0 ]; then
-                        echo "kill port ${i} success"
-                        break
-                else
-                        echo "kill port ${i} success"
-                fi  
-        fi
-    fi
-    #start new maini
-    if [ $1 == "start" -o $1 == "restart" ];then
-        cd $execdirpath/
-        nohup ./${execnewname}_${i} >/dev/null 2>$execdirpath/error.log  2>&1 &
-        if [ $? -ne 0 ]; then
-                echo "${execnewname}_${i} start error "
-                break
-        else
-                echo "${execnewname}_${i} start ok "
-        fi
-    fi
-    sleep 5s
-done
-echo "${execname} script is end...."
-exit 0
diff --git a/sh/pre/apigame.sh b/sh/pre/apigame.sh
new file mode 100644
index 0000000..2c3689f
--- /dev/null
+++ b/sh/pre/apigame.sh
@@ -0,0 +1,91 @@
+ # !/bin/bash
+if [ ! -n "$1" ]; then
+   echo "params error"
+   exit 1
+elif [ $1 != "start" -a $1 != "restart" -a $1 != "stop" ]; then
+   echo "please input start|stop|restart"
+   exit 2
+fi
+env=pre
+nowdate=`date +"%Y%m%d%H%M"`
+execdir=/home/exec/apigame/api/$nowdate
+codedir=/home/code/go/apigame/src
+execname=apigame
+execnewname=API_GAME_$nowdate
+ports=(39080)
+codeport=80
+echo "${execname} script is begin...."
+sleep 1s
+# cd $codedir
+for i in ${ports[@]};
+do
+    if [ $1 == "start" ];then
+        userport=`netstat -antp | grep ":${i}"`
+        if [ ${#userport} -gt 3 ]; then
+                echo "port ${i} is busy..."
+                break
+        fi
+    fi
+    if [ $1 == "start" -o $1 == "restart" ];then
+        #copy new main 
+        cd $codedir
+        if [ $? -ne 0 ]; then
+                echo "cd ${codedir} error,port:${i}"
+                break
+        fi
+        execdirpath=$execdir/$i
+        if [ ! -d $execdirpath ]; then
+                mkdir -p $execdirpath
+                if [ $? -ne 0 ]; then
+                echo "mkdir ${execdirpath} error"
+                 break
+                fi
+                cp $execname $execdirpath/${execnewname}_${i}
+                cp -r conf $execdirpath/
+                #cp -r ../conf $execdirpath/../
+                sed -i "s#httpport = ${codeport}#httpport = ${i}#g" $execdirpath/conf/${env}.conf
+                if [ $? -ne 0 ]; then
+                        echo "sed httpport ${codeport},i:${i} error"
+                        break
+                fi
+                sed -i "s#appname = ${execname}#appname = ${execnewname}_${i}#g" $execdirpath/conf/${env}.conf
+                if [ $? -ne 0 ]; then
+                        echo "sed appname ${execname},i:${i} error"
+                        break
+                fi  
+                rm -rf app.conf
+                if [ $? -ne 0 ]; then
+                        echo "delete app.conf i:${i} error"
+                        break
+                fi  
+                echo "include \"${env}.conf\"" > $execdirpath/conf/app.conf
+        fi
+    fi
+    #kill old port main
+    if [ $1 == "stop" -o $1 == "restart" ];then
+        userport=`netstat -antp | grep ":${i}"`
+        if [ ${#userport} -gt 3 ]; then
+                kill -9 $(netstat -nlp | grep :${i} | awk '{print $7}' | awk -F"/" '{ print $1 }')
+                if [ $? -ne 0 ]; then
+                        echo "kill port ${i} success"
+                        break
+                else
+                        echo "kill port ${i} success"
+                fi  
+        fi
+    fi
+    #start new maini
+    if [ $1 == "start" -o $1 == "restart" ];then
+        cd $execdirpath/
+        nohup ./${execnewname}_${i} >/dev/null 2>$execdirpath/error.log  2>&1 &
+        if [ $? -ne 0 ]; then
+                echo "${execnewname}_${i} start error "
+                break
+        else
+                echo "${execnewname}_${i} start ok "
+        fi
+    fi
+    sleep 5s
+done
+echo "${execname} script is end...."
+exit 0
diff --git a/sh/pre/auto.sh b/sh/pre/auto.sh
index 972e8e4..2c0fa4c 100644
--- a/sh/pre/auto.sh
+++ b/sh/pre/auto.sh
@@ -2,33 +2,26 @@
 if [ ! -n "$1" ]; then
    echo "params error"
    exit 1
-elif [ $1 != "api-qixi" ]; then
-   echo "please input api-qixi"
-   exit 2
-fi
-if [ ! -n "$2" ]; then
-   echo "params error"
-   exit 1
-elif [ $2 != "start" -a $2 != "restart" -a $2 != "stop" ]; then
+elif [ $1 != "start" -a $1 != "restart" -a $1 != "stop" ]; then
    echo "please input start|stop|restart"
    exit 2
 fi
 
 
-sh /sh/qixi/git.sh
+sh /sh/apigame/git.sh
 if [ $? -ne 0 ];then
    exit 3
 fi
 
-binname=$1
-sh /sh/qixi/build.sh ${binname}
+binname=apigame
+sh /sh/apigame/build.sh ${binname}
 if [ $? -ne 0 ];then
    exit 1
 fi
 
 
 sleep 1s
-sh /sh/qixi/${1}.sh ${2}
+sh /sh/apigame/$apigame.sh ${1}
 if [ $? -ne 0 ];then
    exit 1
 fi
--
libgit2 0.21.0