From 4d6d1b7f8cacc4d6725f990b4b1f8966bb9c33b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B0=E5=B9=BF=E9=93=B6?= <273650669@qq.com>
Date: Mon, 30 Oct 2017 11:12:25 +0800
Subject: [PATCH] fix bugs

---
 io/io.js        | 3 +++
 utils/common.js | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/io/io.js b/io/io.js
index 90b6f73..9f2b2e7 100644
--- a/io/io.js
+++ b/io/io.js
@@ -62,6 +62,9 @@ function ioServer(io) {
                             //var ip = socket.request.connection.remoteAddress;
                             //此处获取IP可能会有延迟，建议改成自己的IP库
                             Common.getIpLocation(msg.ip,function (err,location) {
+                                if(err){
+                                    location = '';
+                                }
                                 var info = {
                                     "uid":uid,
                                     "name":location + ' 客户',
diff --git a/utils/common.js b/utils/common.js
index 8795917..2678b40 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -18,6 +18,8 @@ function getIpLocation(ip,callback) {
             var json = JSON.parse(html);
             if(json.code == 0){
                 return callback(null,json.data.region + json.data.city);
+            }else{
+                return callback(json.data,null);
             }
 
         });