Browse Source

redis配置全局替换

lizhen_gitee 1 year ago
parent
commit
20002aad80

+ 60 - 60
Party.php

@@ -76,10 +76,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $where = [];
@@ -194,10 +194,10 @@ class Party extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
 
             // 更新redis  加入缓存
@@ -232,10 +232,10 @@ class Party extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             $redis->zRem($this->roomTypeArr[$room_type] . "Rank", $party_id);
             $redis->del($this->roomTypeArr[$room_type] . "_" . $party_id);
@@ -265,10 +265,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $redisPartyRankList = $redis->zRevRange($this->roomTypeArr[$room_type] . "Rank", 0, -1, true);
         $partyModel = new \app\common\model\Party();
@@ -319,10 +319,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $res = [];
@@ -380,10 +380,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         // 更新热度
         $redis->zIncrBy($this->roomTypeArr[$room_type] . "Rank", $party_hot, $party_id);
@@ -432,10 +432,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $redisData = $redis->get($this->roomTypeArr[$room_type] . "_" . $party_id);
         if ($redisData) {
@@ -473,10 +473,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $res = $redis->hGetAll("online_" . $party_id);
@@ -504,10 +504,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $redis->zAdd("party_user_" . $party_id, $this->auth->u_id, $user_id);
 
@@ -607,10 +607,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         // 判断当前用户是否被该房间设置限制 //项目:1=房管,2=禁言,3=拉黑,4=踢出
@@ -645,10 +645,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $redis->zRem("party_user_" . $party_id, $user_u_id);
 
@@ -667,10 +667,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $userids = $redis->zRange("party_user_" . $party_id, 0, -1, true);
         $useridArr = [];
@@ -700,10 +700,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $partyModel = new \app\common\model\Party();
@@ -745,10 +745,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $partycellectionModel = new \app\common\model\PartyCellection();
@@ -796,10 +796,10 @@ class Party extends Common
 //            $redisconfig = config("redis");
 //            $redis->connect($redisconfig["host"], $redisconfig["port"]);
             /*if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }*/
 //            // 获取本周第一天
 //            $weekday = $this->firstOfWeek(date("Y-m-d H:i:s"));
@@ -927,10 +927,10 @@ class Party extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             $partyInfo = $redis->get($this->roomTypeArr[$room_type] . "_" . $party_id);
             if ($partyInfo) {
@@ -989,10 +989,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $data = [];
@@ -1030,10 +1030,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
 
@@ -1069,10 +1069,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $res = $redis->hDel("party_manage_" . $party_id, $id . "-" . $item);
         if ($res !== false) {
@@ -1107,10 +1107,10 @@ class Party extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             $partyInfo = $redis->get($this->roomTypeArr[$room_type] . "_" . $party_id);
             if ($partyInfo) {
@@ -1146,10 +1146,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $data = unserialize($redis->hGet("party_lineup", $party_id));
         $data[$userid]["user_id"] = $userInfo['id'];
@@ -1187,10 +1187,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $data = unserialize($redis->hGet("party_lineup", $party_id));
         if ($data && $is_empty != 1) {
@@ -1222,10 +1222,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $data = $redis->hGet("party_lineup", $party_id);
         $dataArr = unserialize($data);
@@ -1266,10 +1266,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $partyInfo = $redis->get($this->roomTypeArr[$room_type] . "_" . $party_id);
         if ($partyInfo) {
@@ -1479,10 +1479,10 @@ class Party extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"], 86400 * 31);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             // 事务处理余额与记录信息
             $userjewellogModel = new \app\common\model\UserJewelLog();
@@ -1740,10 +1740,10 @@ class Party extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             $redis->zAdd($this->roomTypeArr[$room_type] . "Rank", $partyInfo['party_hot'], $partyInfo["id"]);
 
@@ -1780,10 +1780,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         // 获取本周第一天
@@ -1828,10 +1828,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         // 获取用户魅力值
@@ -1865,10 +1865,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $res = $redis->del("hourCharm_" . $party_id);
         $this->success("操作成功!");
@@ -1905,10 +1905,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         // 获取所有派对ID
         $party_ids = \app\common\model\Party::where(["status" => 1])->column("id");

+ 2 - 2
application/admin/controller/party/Party.php

@@ -133,10 +133,10 @@ class Party extends Backend
                         $redisconfig = config("redis");
                         $redis->connect($redisconfig["host"], $redisconfig["port"]);
                         if ($redisconfig['redis_pwd']) {
-                            $redis->auth(config('redis_pwd'));
+                            $redis->auth($redisconfig['redis_pwd']);
                         }
                         if($redisconfig['redis_selectdb'] > 0){
-                            $redis->select(config('redis_selectdb'));
+                            $redis->select($redisconfig['redis_selectdb']);
                         }
                         $partyInfo = $redis->get($roomTypeArr[$room_type]."_".$party_id);
                         if($partyInfo) {

+ 4 - 4
application/api/controller/Egg.php

@@ -78,10 +78,10 @@ class Egg extends Api
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             for($i=1;$i<=$num;$i++) {
                 $val = date("YmdHis").$i;
@@ -140,10 +140,10 @@ class Egg extends Api
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 //        if($redis->lLen("hammer_num_".$user_id) < $num) $this->error("小金锤数量不足!");
 

+ 2 - 2
application/api/controller/Gatewayworker.php

@@ -88,10 +88,10 @@ class Gatewayworker extends Api
 //            $redisconfig = config("redis");
 //            $redis->connect($redisconfig["host"], $redisconfig["port"]);
         /*if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }*/
 //            foreach($party_id as $v) {
 //                $redis->del("hourCharm_".$v);

+ 2 - 2
application/api/controller/Guild.php

@@ -511,10 +511,10 @@ class Guild extends Api
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             // 获取成员用户信息
             $memberuserInfo = \app\common\model\User::field("id,avatar,nickname,gender,level")->find($member_user_id);

+ 14 - 14
application/api/controller/Live.php

@@ -151,10 +151,10 @@ class Live extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
 
@@ -231,10 +231,10 @@ class Live extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $redisLiveRankList = $redis->zRange("liveRank",$start,$end);
         $liveModel = new \app\common\model\Live();
@@ -285,10 +285,10 @@ class Live extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $res = [];
@@ -332,10 +332,10 @@ class Live extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         // 更新热度
         $redis->zIncrBy("liveRank", $live_hot, $live_id);
@@ -422,10 +422,10 @@ class Live extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             // 获取本周第一天
             $weekday = $this->firstOfWeek(date("Y-m-d H:i:s"));
@@ -667,10 +667,10 @@ class Live extends Common
                 $redisconfig = config("redis");
                 $redis->connect($redisconfig["host"], $redisconfig["port"]);
                 if ($redisconfig['redis_pwd']) {
-                    $redis->auth(config('redis_pwd'));
+                    $redis->auth($redisconfig['redis_pwd']);
                 }
                 if($redisconfig['redis_selectdb'] > 0){
-                    $redis->select(config('redis_selectdb'));
+                    $redis->select($redisconfig['redis_selectdb']);
                 }
 
                 // 获取本周第一天
@@ -711,10 +711,10 @@ class Live extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         // 获取直播间热度信息
         $redisLiveRankList = $redis->zRevRange("liveRank",0,-1,true);

+ 62 - 62
application/api/controller/Party.php

@@ -78,10 +78,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $where = [];
@@ -207,10 +207,10 @@ class Party extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
 
             // 更新redis  加入缓存
@@ -244,10 +244,10 @@ class Party extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             $redis->zRem($this->roomTypeArr[$room_type]."Rank",$party_id);
             $redis->del($this->roomTypeArr[$room_type]."_".$party_id);
@@ -276,10 +276,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $redisPartyRankList = $redis->zRevRange($this->roomTypeArr[$room_type]."Rank",0,-1,true);
 
@@ -396,10 +396,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $res = [];
@@ -457,10 +457,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         // 更新热度
         $redis->zIncrBy($this->roomTypeArr[$room_type]."Rank", $party_hot, $party_id);
@@ -509,10 +509,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $redisData = $redis->get($this->roomTypeArr[$room_type]."_".$party_id);
         if($redisData) {
@@ -549,10 +549,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $res = $redis->hGetAll("online_".$party_id);
@@ -578,10 +578,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $redis->zAdd("party_user_".$party_id,$this->auth->u_id,$user_id);
 
@@ -705,10 +705,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         // 判断当前用户是否被该房间设置限制 //项目:1=房管,2=禁言,3=拉黑,4=踢出
@@ -742,10 +742,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $redis->zRem("party_user_".$party_id,$user_u_id);
@@ -793,10 +793,10 @@ class Party extends Common
 //        $redisconfig = config("redis");
 //        $redis->connect($redisconfig["host"], $redisconfig["port"]);
         /*if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }*/
 //        $userids = $redis->zRange("party_user_".$party_id,0,-1,true);
 //        $useridArr = [];
@@ -825,10 +825,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $partyModel = new \app\common\model\Party();
@@ -869,10 +869,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $partycellectionModel = new \app\common\model\PartyCellection();
@@ -919,10 +919,10 @@ class Party extends Common
 //            $redisconfig = config("redis");
 //            $redis->connect($redisconfig["host"], $redisconfig["port"]);
             /*if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }*/
 //            // 获取本周第一天
 //            $weekday = $this->firstOfWeek(date("Y-m-d H:i:s"));
@@ -1048,10 +1048,10 @@ class Party extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             $partyInfo = $redis->get($this->roomTypeArr[$room_type]."_".$party_id);
             if($partyInfo) {
@@ -1113,10 +1113,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         $data = [];
@@ -1153,10 +1153,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
 
@@ -1191,10 +1191,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $res = $redis->hDel("party_manage_".$party_id,$id."-".$item);
         if($res !== false) {
@@ -1228,10 +1228,10 @@ class Party extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             $partyInfo = $redis->get($this->roomTypeArr[$room_type]."_".$party_id);
             if($partyInfo) {
@@ -1266,10 +1266,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $data = unserialize($redis->hGet("party_lineup",$party_id));
         $data[$userid]["user_id"] = $userInfo['id'];
@@ -1306,10 +1306,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $data=unserialize($redis->hGet("party_lineup",$party_id));
         if($data && $is_empty != 1) {
@@ -1340,10 +1340,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $data = $redis->hGet("party_lineup",$party_id);
         $dataArr = unserialize($data);
@@ -1382,10 +1382,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $partyInfo = $redis->get($this->roomTypeArr[$room_type]."_".$party_id);
         if($partyInfo) {
@@ -1600,10 +1600,10 @@ class Party extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"], 86400 * 31);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             // 事务处理余额与记录信息
             $userjewellogModel = new \app\common\model\UserJewelLog();
@@ -1868,10 +1868,10 @@ class Party extends Common
             $redisconfig = config("redis");
             $redis->connect($redisconfig["host"], $redisconfig["port"]);
             if ($redisconfig['redis_pwd']) {
-                $redis->auth(config('redis_pwd'));
+                $redis->auth($redisconfig['redis_pwd']);
             }
             if($redisconfig['redis_selectdb'] > 0){
-                $redis->select(config('redis_selectdb'));
+                $redis->select($redisconfig['redis_selectdb']);
             }
             $redis->zAdd($this->roomTypeArr[$room_type]."Rank", $partyInfo['party_hot'], $partyInfo["id"]);
 
@@ -1907,10 +1907,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         // 获取本周第一天
@@ -1954,10 +1954,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         // 获取用户魅力值
@@ -1991,10 +1991,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         if ($userId) {
@@ -2034,10 +2034,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         // 获取所有派对ID
         $party_ids = \app\common\model\Party::where(["status"=>1])->column("id");
@@ -2076,10 +2076,10 @@ class Party extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
 //        $redis->del("online_" . 3);die;

+ 14 - 14
application/api/controller/Tenim.php

@@ -463,10 +463,10 @@ exit;
                 $redisconfig = config("redis");
                 $redis->connect($redisconfig["host"], $redisconfig["port"]);
                 if ($redisconfig['redis_pwd']) {
-                    $redis->auth(config('redis_pwd'));
+                    $redis->auth($redisconfig['redis_pwd']);
                 }
                 if($redisconfig['redis_selectdb'] > 0){
-                    $redis->select(config('redis_selectdb'));
+                    $redis->select($redisconfig['redis_selectdb']);
                 }
                 $redis->HDel("online_".$v["GroupId"],$user_id);
             }
@@ -490,10 +490,10 @@ exit;
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $redisData = $redis->get("party_".$party_id);
         if(!$redisData) {
@@ -521,10 +521,10 @@ exit;
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $data=unserialize($redis->hGet("party_lineup",$party_id));
         // 更改红点排麦数量
@@ -602,10 +602,10 @@ exit;
                     $redisconfig = config("redis");
                     $redis->connect($redisconfig["host"], $redisconfig["port"]);
                     if ($redisconfig['redis_pwd']) {
-                        $redis->auth(config('redis_pwd'));
+                        $redis->auth($redisconfig['redis_pwd']);
                     }
                     if($redisconfig['redis_selectdb'] > 0){
-                        $redis->select(config('redis_selectdb'));
+                        $redis->select($redisconfig['redis_selectdb']);
                     }
                     $livingUserPartyId = $redis->hGet("livingUser", $info["To_Account"]);
                     if ($livingUserPartyId) {
@@ -631,10 +631,10 @@ exit;
                             $redisconfig = config("redis");
                             $redis->connect($redisconfig["host"], $redisconfig["port"]);
                             if ($redisconfig['redis_pwd']) {
-                                $redis->auth(config('redis_pwd'));
+                                $redis->auth($redisconfig['redis_pwd']);
                             }
                             if($redisconfig['redis_selectdb'] > 0){
-                                $redis->select(config('redis_selectdb'));
+                                $redis->select($redisconfig['redis_selectdb']);
                             }
                             $redis->HDel("online_".$v["GroupId"],$info["To_Account"]);
 
@@ -679,10 +679,10 @@ exit;
 //                $redisconfig = config("redis");
 //                $redis->connect($redisconfig["host"], $redisconfig["port"]);
                 /*if ($redisconfig['redis_pwd']) {
-                    $redis->auth(config('redis_pwd'));
+                    $redis->auth($redisconfig['redis_pwd']);
                 }
                 if($redisconfig['redis_selectdb'] > 0){
-                    $redis->select(config('redis_selectdb'));
+                    $redis->select($redisconfig['redis_selectdb']);
                 }*/
 //                $members = $input["NewMemberList"];
 //                if($members) foreach($members as $k => $v) {
@@ -710,10 +710,10 @@ exit;
 //                $redisconfig = config("redis");
 //                $redis->connect($redisconfig["host"], $redisconfig["port"]);
                 /*if ($redisconfig['redis_pwd']) {
-                    $redis->auth(config('redis_pwd'));
+                    $redis->auth($redisconfig['redis_pwd']);
                 }
                 if($redisconfig['redis_selectdb'] > 0){
-                    $redis->select(config('redis_selectdb'));
+                    $redis->select($redisconfig['redis_selectdb']);
                 }*/
 //                $members = $input["ExitMemberList"];
 //                if($members) foreach($members as $k => $v) {

+ 4 - 4
application/api/controller/Tentrtc.php

@@ -40,10 +40,10 @@ class Tentrtc extends Api
                     $redisconfig = config("redis");
                     $redis->connect($redisconfig["host"], $redisconfig["port"]);
                     if ($redisconfig['redis_pwd']) {
-                        $redis->auth(config('redis_pwd'));
+                        $redis->auth($redisconfig['redis_pwd']);
                     }
                     if($redisconfig['redis_selectdb'] > 0){
-                        $redis->select(config('redis_selectdb'));
+                        $redis->select($redisconfig['redis_selectdb']);
                     }
 
                     $userId = $aRequest['EventInfo']['UserId'];
@@ -79,10 +79,10 @@ class Tentrtc extends Api
                     $redisconfig = config("redis");
                     $redis->connect($redisconfig["host"], $redisconfig["port"]);
                     if ($redisconfig['redis_pwd']) {
-                        $redis->auth(config('redis_pwd'));
+                        $redis->auth($redisconfig['redis_pwd']);
                     }
                     if($redisconfig['redis_selectdb'] > 0){
-                        $redis->select(config('redis_selectdb'));
+                        $redis->select($redisconfig['redis_selectdb']);
                     }
 
                     $userId = $aRequest['EventInfo']['UserId'];

+ 4 - 4
application/api/controller/Usercenter.php

@@ -74,10 +74,10 @@ class UserCenter extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $livingUserPartyId = $redis->hGet("livingUser", $user_id);
 
@@ -811,10 +811,10 @@ class UserCenter extends Common
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         // 获取本周第一天

+ 2 - 2
application/common/controller/Api.php

@@ -387,10 +387,10 @@ class Api
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         $check = $redis->exists($key);
         if ($check) {

+ 2 - 2
application/common/model/Live.php

@@ -25,10 +25,10 @@ class Live extends Model
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
 
         if(is_array($live_id)) {

+ 2 - 2
application/common/model/Party.php

@@ -27,10 +27,10 @@ class Party extends Model
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
         if ($redisconfig['redis_pwd']) {
-            $redis->auth(config('redis_pwd'));
+            $redis->auth($redisconfig['redis_pwd']);
         }
         if($redisconfig['redis_selectdb'] > 0){
-            $redis->select(config('redis_selectdb'));
+            $redis->select($redisconfig['redis_selectdb']);
         }
         if(!is_array($party_id)) {
             return [];

+ 1 - 0
application/config.php

@@ -303,6 +303,7 @@ return [
         'redis_pwd' => 123456,
         'redis_selectdb' => 8,
     ],
+    'redis_pwd' =>
     'cos'                  => [
         // 链接
         "url"         => 'https://ggyuyin-1318896504.cos.ap-guangzhou.myqcloud.com',