Merge commit 'c70813da285989854b16d1be4845395ec5aeb14d' into dev

app/v1/controller/advert/AgentSiteController.php

@@ -56,7 +56,9 @@ class AgentSiteController extends BaseController
         ]);
 
         if(!empty($where['agent_name'])){
-            $where['agent_id'] = $this->agentListLogic->where('name', 'like', '%'.$where['agent_name'].'%')->value('id');
+            $where['agent_id'] = $this->agentListLogic->where([
+                ['name', 'like', '%'.$where['agent_name'].'%']
+            ])->value('id');
             unset($where['agent_name']);
         }
 

app/v1/logic/advert/AgentSiteLogic.php

@@ -150,9 +150,6 @@ class AgentSiteLogic extends BaseLogic
             throw new ApiException('广告位数据错误');
         }
         $agentSiteList = array_column($agentSiteList, null, 'id');
-
-        print_r('agentSiteList');
-        print_r($agentSiteList);
         
         // 检查游戏是否为头条媒体的母包
         if(!$game_id || !$toutiaoGameData[$game_id]){
@@ -251,8 +248,6 @@ class AgentSiteLogic extends BaseLogic
                 throw new ApiException('推送头条的-asset_id获取失败');
              }
              $mediaArr = $this->getTtMediaConfig();
-             print_r('mediaArr');
-             print_r($mediaArr);
             
              foreach ($site_ids as $val) {
                     $site_id = $val;

app/v1/logic/customer/AccountLogic.php

@@ -64,7 +64,6 @@ class AccountLogic extends BaseLogic
             $data = Db::connect('db_origin')->table('user_'.$query['val']%10)->where('uid', $query['val'])->select()->toArray();
         }
 
-        print_r($data);
         $data = array_map(function($item){
             $item['login_ip'] = $item['login_ip'].$this->getIpLocation($item['login_ip']);
             $item['reg_ip'] = $item['reg_ip'].$this->getIpLocation($item['reg_ip']);
@@ -83,7 +82,6 @@ class AccountLogic extends BaseLogic
     public function updatePwd($data)
     {
         $user_pwd = password_hash($data['user_pwd'], PASSWORD_DEFAULT);
-        print_r($data);
         $result = Db::connect('db_origin')->table('user_'.$data['uid']%10)->where('uid', $data['uid'])->update(['user_pwd' => $user_pwd]);
         return $result;
     }

app/v1/middleware/FilterPermission.php

@@ -11,14 +11,8 @@ use Webman\MiddlewareInterface;
  */
 class FilterPermission implements MiddlewareInterface
 {
-   
-
     public function process(Request $request, callable $handler) : Response
     {
-
-        // 获取请求方法
-        $method = strtoupper($request->method());
-
         // 根据用户id获取用户权限
         $token = getCurrentInfo();
         // 用户权限缓存

config/process.php

@@ -62,20 +62,20 @@ return [
     'create_tables' => [
         'handler' => \app\process\CreateTables::class,
     ],
-    'game_active' => [
-        'handler' => \app\process\dataReport\GameActive::class,
-    ],
-    'base_total' => [
-        'handler' => \app\process\dataReport\BaseTotal::class,
-    ],
-    'basic_login_total' => [
-        'handler' => \app\process\dataReport\BasicLoginTotal::class,
-    ],
-    'game_reg_pay_month' => [
-        'handler' => \app\process\dataReport\GameRegPayMonth::class,
-    ],
-    'game_total_month' =>  [
-        'handler' => \app\process\dataReport\GameTotalMonth::class,
-    ]
+//    'game_active' => [
+//        'handler' => \app\process\dataReport\GameActive::class,
+//    ],
+//    'base_total' => [
+//        'handler' => \app\process\dataReport\BaseTotal::class,
+//    ],
+//    'basic_login_total' => [
+//        'handler' => \app\process\dataReport\BasicLoginTotal::class,
+//    ],
+//    'game_reg_pay_month' => [
+//        'handler' => \app\process\dataReport\GameRegPayMonth::class,
+//    ],
+//    'game_total_month' =>  [
+//        'handler' => \app\process\dataReport\GameTotalMonth::class,
+//    ]
 
 ];