更新函数

app/functions.php

@@ -65,29 +65,14 @@ function getProp($param, $key, $default = '')
 /**
  * 获取真实IP
  */
-function get_client_ip($type = 0, $adv = true)
+function get_client_ip()
 {
-    $type = $type ? 1 : 0;
-    if ($adv) {
-        if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-            $arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
-            $pos = array_search('unknown', $arr);
-            if (false !== $pos) {
-                unset($arr[$pos]);
-            }
-            $ip = trim($arr[0]);
-        } elseif (isset($_SERVER['HTTP_CLIENT_IP'])) {
-            $ip = $_SERVER['HTTP_CLIENT_IP'];
-        } elseif (isset($_SERVER['REMOTE_ADDR'])) {
-            $ip = $_SERVER['REMOTE_ADDR'];
-        }
-    } elseif (isset($_SERVER['REMOTE_ADDR'])) {
-        $ip = $_SERVER['REMOTE_ADDR'];
+    $ip = '0.0.0.0';
+    if ($request = request()) {
+        $header = $request->header();
+        $ip =  $header['remoteip'];
     }
-    // IP地址合法验证
-    $long = sprintf("%u", ip2long($ip));
-    $ip   = $long ? array($ip, $long) : array('0.0.0.0', 0);
-    return $ip[$type];
+    return $ip;
 }
 
 /**
@@ -95,8 +80,9 @@ function get_client_ip($type = 0, $adv = true)
  */
 function get_client_ua()
 {
-    $ua = $_SERVER['HTTP_USER_AGENT'];
-    return $ua;
+    $request = request();
+    $header = $request->header();
+    return $header['user-agent'];
 }