修复控制器获取 app_id 失败

修复导入用户只获取到前100个的问题

Author: Hanson

src/Http/Controllers/Admin/BaseController.php

@@ -24,8 +24,6 @@ public function index(Content $content)
 
         if ($appId = request('app_id')) {
             Cache::forever(config('admin.extensions.wechat.admin_current_key', 'wechat.admin.current'), $appId);
-
-            $this->appId = $appId;
         }
 
         $current = ConfigService::getCurrent();
@@ -37,6 +35,7 @@ public function index(Content $content)
         }
 
         $this->config = $current;
+        $this->appId = $current->app_id;
 
         Admin::navbar(function (\Encore\Admin\Widgets\Navbar $navbar) use ($current) {
             $configs = WechatConfig::query()->get(['app_id', 'name']);

src/Jobs/ImportUsers.php

@@ -49,21 +49,25 @@ public function handle()
                 return;
             }
 
-            $result = $app->user->select($list['data']['openid']);
+            $chunk = array_chunk($list['data']['openid'], 100);
 
-            foreach ($result['user_info_list'] as $user) {
-                config('admin.extensions.wechat.wechat_user', WechatUser::class)::query()->updateOrCreate([
-                    'app_id' => $this->appId,
-                    'openid' => $user['openid'],
-                ], [
-                    'nickname' => $user['nickname'] ?? null,
-                    'avatar' => $user['headimgurl'] ?? null,
-                    'gender' => $user['sex'] ?? null,
-                    'country' => $user['country'] ?? null,
-                    'province' => $user['province'] ?? null,
-                    'city' => $user['city'] ?? null,
-                    'subscribed_at' => $user['subscribe'] ? Carbon::parse($user['subscribe_time'])->toDateTimeString() : null,
-                ]);
+            foreach ($chunk as $openids) {
+                $result = $app->user->select($openids);
+
+                foreach ($result['user_info_list'] as $user) {
+                    config('admin.extensions.wechat.wechat_user', WechatUser::class)::query()->updateOrCreate([
+                        'app_id' => $this->appId,
+                        'openid' => $user['openid'],
+                    ], [
+                        'nickname' => $user['nickname'] ?? null,
+                        'avatar' => $user['headimgurl'] ?? null,
+                        'gender' => $user['sex'] ?? null,
+                        'country' => $user['country'] ?? null,
+                        'province' => $user['province'] ?? null,
+                        'city' => $user['city'] ?? null,
+                        'subscribed_at' => $user['subscribe'] ? Carbon::parse($user['subscribe_time'])->toDateTimeString() : null,
+                    ]);
+                }
             }
         }
     }