浏览代码

头条账户级名称搜索

liuzejian 1 年之前
父节点
当前提交
2b3ff2b34e

+ 2 - 1
modules/Callback/Http/Controllers/JuliangAccountController.php

@@ -18,7 +18,7 @@ class JuliangAccountController extends CatchController
 
     public function list(Request $request) {
         $advAccountId = $request->input('account_id');
-        $advAccountName = $request->input('account_name');
+        $advAccountName = $request->input('name');
         $unBind = $request->input('unbind', 0);
         $id =  $request->input('id', 0);
         $alreadyBindConfigIds = null;
@@ -83,6 +83,7 @@ class JuliangAccountController extends CatchController
         foreach ($list as $item) {
             $item->promotion_name = $promotions->get($item->id)->name ?? '';
             $item->promotion_id = $promotions->get($item->id)->id ?? '';
+            $item->name = $item->adv_account_name;
         }
 
         return $list;

+ 2 - 1
modules/User/Models/User.php

@@ -110,7 +110,8 @@ class User extends Model implements AuthenticatableContract
         $appModules = Modules::getAppModules();
         if(!is_null($appModules)) {
             $hiddenAppModuleNames = $appModules->reject(function ($module) use ($showApp) {
-                return $showApp == $module['name'];
+                $apps = explode(',', $showApp);
+                return in_array($module['name'], $apps);
             })->pluck('name');
         } else {
             $hiddenAppModuleNames = collect();

+ 3 - 2
tests/User/Http/Controllers/UserControllerTest.php

@@ -36,7 +36,8 @@ class UserControllerTest extends \Tests\UsedTestCase
     public function testOnline() {
         $res = $this->withHeaders([
             'Authorization' => 'Bearer '. $this->token,
-        ])->json('get','http://localhost/api/user/online');
-        $res->dump();
+        ])->json('get','http://localhost/api/user/online?app=k');
+
+        $this->dumpJson($res);
     }
 }