From 8c125ce34362d331d2166b0d60774b6d6854613f Mon Sep 17 00:00:00 2001
From: liwei <liwei1dao@gmail.com>
Date: Wed, 21 Sep 2022 16:42:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=90=AF=E5=8A=A8=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/build_linux.sh |  1 +
 bin/gm.json        | 26 +++++++++++++-------------
 bin/stup.sh        |  7 +++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/bin/build_linux.sh b/bin/build_linux.sh
index 19e825379..0ece25ba6 100755
--- a/bin/build_linux.sh
+++ b/bin/build_linux.sh
@@ -2,6 +2,7 @@ CGO_ENABLED=0
 GO111MODULE=on 
 GOOS=linux
 cd ../
+go build -o ./bin/cmd ./services/cmd/main.go
 go build -o ./bin/mainte ./services/mainte/main.go
 go build -o ./bin/gateway ./services/gateway/main.go
 go build -o ./bin/worker ./services/worker/main.go
diff --git a/bin/gm.json b/bin/gm.json
index 5c8ef9ed1..d768ccf95 100644
--- a/bin/gm.json
+++ b/bin/gm.json
@@ -1,47 +1,47 @@
 {
-  "AreaId": "dfli01",
+  "AreaId": "df03",
   "ConsulAddr": [
     "10.0.0.9:10012"
   ],
   "IsCross": false,
-  "BelongCrossServerId": "dflicross01",
+  "BelongCrossServerId": "dfcross_2",
   "LoaclDB": {
     "RedisIsCluster": false,
-    "RedisAddr": "10.0.0.9:10011",
+    "RedisAddr": ["10.0.0.9:10011"],
     "RedisPassword": "li13451234",
-    "RedisDB": 5,
+    "RedisDB": 3,
     "MongodbUrl": "mongodb://10.0.0.9:10013",
-    "MongodbDatabase": "dreamfactory5"
+    "MongodbDatabase": "dreamfactory3"
   },
   "CrossDB": {
     "RedisIsCluster": false,
-    "RedisAddr": "10.0.0.9:10011",
+    "RedisAddr": ["10.0.0.9:10011"],
     "RedisPassword": "li13451234",
-    "RedisDB": 6,
+    "RedisDB": 12,
     "MongodbUrl": "mongodb://10.0.0.9:10013",
-    "MongodbDatabase": "dreamfactory6"
+    "MongodbDatabase": "dreamfactory12"
   },
   "Services": [
     {
       "ServiceType": "gateway",
       "Host": "127.0.0.1",
-      "Port": 9567,
+      "Port": 9571,
       "Loglevel": 5,
       "MaxAgeTime": 7,
-      "ListenPort": 7891
+      "ListenPort": 7895
     },
     {
       "ServiceType": "mainte",
       "Host": "127.0.0.1",
-      "Port": 9568,
+      "Port": 9572,
       "Loglevel": 5,
       "MaxAgeTime": 7,
-      "ListenPort": 8000
+      "ListenPort": 7896
     },
     {
       "ServiceType": "worker",
       "Host": "127.0.0.1",
-      "Port": 9569,
+      "Port": 9573,
       "Loglevel": 5,
       "MaxAgeTime": 7
     }
diff --git a/bin/stup.sh b/bin/stup.sh
index b24bc4c4e..ceed5aff4 100755
--- a/bin/stup.sh
+++ b/bin/stup.sh
@@ -4,12 +4,11 @@
  
     start(){
         echo "starting $SERVICE..."
-
-        num=`ps -ef | grep $SERVICE | grep -v grep | wc -l`
+        num=`ps -ef | grep conf | grep $SERVICE | grep -v grep | grep -v /bin/bash | wc -l`
         if [ $num -eq 0 ]
         then
-            nohup $CMD > /dev/null 2>&1 &  
-            #nohup $CMD > $SERVICE.log 2>&1 &
+            # nohup $CMD > /dev/null 2>&1 &  
+            nohup $CMD > $SERVICE.log 2>&1 &
             if [ $? -ne 0 ]
             then
                 echo "start failed, please check the log!"