From 9b0843f21b85c57368371b70901d0e0063d99145 Mon Sep 17 00:00:00 2001
From: HITSword <admin@huayizhiyun.com>
Date: Fri, 17 Jan 2020 18:50:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=97=B6=E4=B8=8D=E9=87=8D?=
 =?UTF-8?q?=E8=BD=BDNginx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: HITSword <admin@huayizhiyun.com>
---
 AMHScript | 14 ++++++++++----
 cli.php   | 10 +++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/AMHScript b/AMHScript
index 9c1ba7e..6e979ff 100644
--- a/AMHScript
+++ b/AMHScript
@@ -69,14 +69,20 @@ function amh_module_admin()
             ;;
             add)
                 proxy_pass=$3;
-                php ${module_dir}cli.php --action='add' --server_name=${domain} --proxy_pass=${proxy_pass};
-                amh nginx reload;
+                RES=`php ${module_dir}cli.php --action='add' --server_name=${domain} --proxy_pass=${proxy_pass}`;
+                echo $RES;
+                if ! echo "$RES" | grep 'Error' > /dev/null; then
+                    amh nginx reload;
+                fi;
             ;;
             edit)
                 ParamName=$3
                 ParamVal=$4
-                php ${module_dir}cli.php --action='edit' --server_name=${domain} --field_name=${ParamName} --value=${ParamVal};
-                amh nginx reload;
+                RES=`php ${module_dir}cli.php --action='edit' --server_name=${domain} --field_name=${ParamName} --value=${ParamVal}`;
+                echo $RES;
+                if ! echo "$RES" | grep 'Error' > /dev/null; then
+                    amh nginx reload;
+                fi;
             ;;
             del)
                 echo "del something";
diff --git a/cli.php b/cli.php
index 37ceff1..7f2faff 100644
--- a/cli.php
+++ b/cli.php
@@ -93,7 +93,7 @@
     function amproxy_add($server_name, $proxy_pass = '')
     {
         if (empty($server_name)) {
-            return "[ERROR] The server_name is empty.\n";//不能为空
+            return "[Error] The server_name is empty.\n";//不能为空
         }
   
         $res = '';
@@ -124,7 +124,7 @@
                 $res = "[OK] successfully create $server_name AMProxy.\n";
                 shell_exec("php "._HYPROXY."hyproxy-cli.php --action='make' --server_name=$server_name");
             } else {
-                $res = "[ERROR] error create $server_name AMProxy.\n";
+                $res = "[Error] error create $server_name AMProxy.\n";
             }
         }
         return $res;
@@ -140,10 +140,10 @@
     function hyproxy_edit($server_name, $field_name = '', $value = '')
     {
         if (empty($server_name)) {
-            return "[ERROR] The server_name is empty.\n";//不能为空
+            return "[Error] The server_name is empty.\n";//不能为空
         }
         if (empty($field_name)) {
-            return "[ERROR] The field_name is empty.\n";//不能为空
+            return "[Error] The field_name is empty.\n";//不能为空
         }
         $value = trim($value);
         $res = '';
@@ -174,7 +174,7 @@
                 $res = "[OK] $field_name parameters set success.\n";
                 shell_exec("php "._HYPROXY."hyproxy-cli.php --action='make' --server_name=$server_name");
             } else {
-                $res = "[ERROR] $field_name parameters set error.\n";
+                $res = "[Error] $field_name parameters set error.\n";
             }
         }
         return $res;