IP信息超时设置

modules/users/models/log_model.js

@@ -62,9 +62,8 @@ class LogModel extends BaseModel {
         let ip = request.connection.remoteAddress;
         ip = ip.split(':');
         ip = ip[3] === undefined ? '' : ip[3];
-
         // let ipInfo = '127.0.0.1';//await this.getIpInfoFromApi(ip);
-       // let ipInfo = await this.getIpInfoFromApi(ip);
+        let ipInfo = await this.getIpInfoFromApi(ip);
 
         let userAgentObject = new UAParser(request.headers['user-agent']);
         let osInfo = userAgentObject.getOS();
@@ -74,7 +73,7 @@ class LogModel extends BaseModel {
             os: osInfo.name + ' ' + osInfo.version + ' ' + cpuInfo.architecture,
             browser: browserInfo.name + ' ' + browserInfo.version,
             ip: ip,
-            ip_info:"" //ipInfo
+            ip_info:ipInfo
         };
 
         return this.addLog(userId, LogType.LOGIN_LOG, message);
@@ -121,7 +120,8 @@ class LogModel extends BaseModel {
         }
         let getData = {
             url: 'http://ip.taobao.com/service/getIpInfo.php?ip=' + ip,
-            encoding: 'utf8'
+            encoding: 'utf8',
+            timeout:2000
         };
         return new Promise(function (resolve, reject) {
             try {