|
|
@@ -713,21 +713,26 @@ class Events
|
|
|
{
|
|
|
$url = 'http://www.ip168.com/chxip/doGetIp.do?keyword=' . $ip;
|
|
|
$ret = file_get_contents($url);
|
|
|
- $defret = ['0' => '未知', '1' => '未知'];
|
|
|
+ $defret = '未知';
|
|
|
|
|
|
+ $ipreg = "/(192\.168\.*)|(10\.*)|(172\.(1|2|3)\d)\.*/";
|
|
|
+ if (preg_match($ipreg, $ip)) {
|
|
|
+ $defret = '局域网';
|
|
|
+ return $defret;
|
|
|
+ }
|
|
|
if (empty($ret)) {
|
|
|
return $defret;
|
|
|
}
|
|
|
+
|
|
|
$word1 = explode('：', $ret);
|
|
|
if (isset($word1['2'])) {
|
|
|
$word2 = explode(" ", $word1['2']);
|
|
|
- if (isset($word2['0']) && isset($word2['1'])) {
|
|
|
- $defret['0'] = $word2['0'];
|
|
|
- $defret['1'] = $word2['1'];
|
|
|
+ if (isset($word2['0'])) {
|
|
|
+ $defret = trim($word2['0']);
|
|
|
return $defret;
|
|
|
}
|
|
|
}
|
|
|
- $defret['0'] = $ret;
|
|
|
+ $defret = $ret;
|
|
|
return $defret;
|
|
|
}
|
|
|
|
|
|
@@ -790,9 +795,9 @@ class Events
|
|
|
|
|
|
self::$redis->hset('loginTmp:' . $uid, 'uid', time());
|
|
|
self::$redis->expire('loginTmp:' . $uid, 5);
|
|
|
- $system=Gateway::get_os();
|
|
|
- if (isset($message['settype'])){
|
|
|
- $system=$message['settype'];
|
|
|
+ $system = Gateway::get_os();
|
|
|
+ if (isset($message['settype'])) {
|
|
|
+ $system = $message['settype'];
|
|
|
}
|
|
|
$data = [
|
|
|
'id' => $uid,
|
vali