Merge branch 'dev' of http://16.162.42.175:8014/guanli/ngds into dev

common/helpers/DingTalk.php

@@ -26,9 +26,7 @@ class DingTalk
 
     public static function sendNotice($message)
     {
-        LoggerTool::info($_SERVER);
-
-        $message['serverIP'] = self::getRealIp();
+        $message['server-ip'] = $_SERVER['HTTP_HOST'];
         $data = [
             'msgtype' => 'text',
             'text' => ['content' => $message],
@@ -51,19 +49,4 @@ class DingTalk
             }
         }
     }
-
-    public static function getRealIp()
-    {
-        $onlineIp = '';
-        if(getenv('HTTP_CLIENT_IP') && strcasecmp(getenv('HTTP_CLIENT_IP'), 'unknown')) {
-            $onlineIp = getenv('HTTP_CLIENT_IP');
-        } elseif(getenv('HTTP_X_FORWARDED_FOR') && strcasecmp(getenv('HTTP_X_FORWARDED_FOR'), 'unknown')) {
-            $onlineIp = getenv('HTTP_X_FORWARDED_FOR');
-        } elseif(getenv('REMOTE_ADDR') && strcasecmp(getenv('REMOTE_ADDR'), 'unknown')) {
-            $onlineIp = getenv('REMOTE_ADDR');
-        } elseif(isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] && strcasecmp($_SERVER['REMOTE_ADDR'], 'unknown')) {
-            $onlineIp = $_SERVER['REMOTE_ADDR'];
-        }
-        return $onlineIp;
-    }
 }