vali 6 years ago
parent
commit
a3f7dec930
1 changed files with 3 additions and 2 deletions
  1. 3 2
      application/service/controller/History.php

+ 3 - 2
application/service/controller/History.php

@@ -37,7 +37,8 @@ class History extends Common
             }
             }
 
 
             $groups = model('Groups')->selectGroups();
             $groups = model('Groups')->selectGroups();
-            $redis = new Redis(config('redis'));
+            $redisconfig = require(APP_PATH . DS . 'redis.php');
+            $redis = new Redis($redisconfig);
 
 
             $kefuInfo = $redis->handler()->hGetall('KFINFO');
             $kefuInfo = $redis->handler()->hGetall('KFINFO');
             $servicelog = $redis->handler()->hGetall('SERVICELOG');
             $servicelog = $redis->handler()->hGetall('SERVICELOG');
@@ -91,7 +92,7 @@ class History extends Common
 
 
             return json(['code' => 1, 'data' => $data, 'msg' => '成功', 'serverList' => array_keys($servicelog)]);
             return json(['code' => 1, 'data' => $data, 'msg' => '成功', 'serverList' => array_keys($servicelog)]);
         } catch (\Exception $e) {
         } catch (\Exception $e) {
-            return json(['code' => $code, 'data' => $e->getMessage(), 'msg' => $msg]);
+            return json(['code' => $code, 'data' => [$e->getMessage()], 'msg' => $msg]);
         }//end try
         }//end try
 
 
     }//end allConversation()
     }//end allConversation()