diff --git a/app/controller/admin/WechatUser.php b/app/controller/admin/WechatUser.php new file mode 100644 index 0000000..e299418 --- /dev/null +++ b/app/controller/admin/WechatUser.php @@ -0,0 +1,34 @@ +request->get('size', config('apiadmin.ADMIN_LIST_DEFAULT')); + $start = $this->request->get('page', 1); + + $obj = new WechatUserModel(); + + $listObj = $obj->order('create_time', 'DESC') + ->field('id,openid,headimgurl,phone,create_time,status,last_login_time') + ->paginate(['page' => $start, 'list_rows' => $limit])->each(function($item, $key) { + $item->last_login_time = $item->last_login_time ? date("Y-m-d H:i:s") :''; + })->toArray(); + $listInfo = $listObj['data']; + + return $this->buildSuccess([ + 'list' => $listInfo, + 'count' => $listObj['total'] + ]); + } +} \ No newline at end of file diff --git a/app/controller/wechat/Wechat.php b/app/controller/wechat/Wechat.php index 5724b1f..f91ddf1 100644 --- a/app/controller/wechat/Wechat.php +++ b/app/controller/wechat/Wechat.php @@ -15,7 +15,6 @@ use think\cache\driver\Redis; use think\exception\ValidateException; use think\facade\Db; use think\Request; -use think\Response; class Wechat extends Base { diff --git a/app/middleware/WechatAuth.php b/app/middleware/WechatAuth.php index 4903527..d3d2c83 100644 --- a/app/middleware/WechatAuth.php +++ b/app/middleware/WechatAuth.php @@ -31,8 +31,9 @@ class WechatAuth $request->wechat_user = $userInfo['data']; $request->wechat_user_id = $userInfo['data']['id']; } - - return $next($request); + $response = $next($request); + $response->header($header); + return $response; } else { return json([ 'code' => ReturnCode::AUTH_ERROR, diff --git a/route/app.php b/route/app.php index c4fe673..2ff54b2 100644 --- a/route/app.php +++ b/route/app.php @@ -66,5 +66,6 @@ Route::group('admin', function() { Route::rule('Login/getUserInfo', 'admin.Login/getUserInfo', 'get')->middleware([app\middleware\AdminAuth::class, app\middleware\AdminPermission::class, app\middleware\AdminResponse::class]); Route::rule('Auth/editRule', 'admin.Auth/editRule', 'post')->middleware([app\middleware\AdminAuth::class, app\middleware\AdminPermission::class, app\middleware\AdminLog::class, app\middleware\AdminResponse::class]); Route::rule('Login/getAccessMenu', 'admin.Login/getAccessMenu', 'get')->middleware([app\middleware\AdminAuth::class, app\middleware\AdminResponse::class]); + Route::rule('WechatUser/index', 'admin.WechatUser/index', 'get')->middleware([app\middleware\AdminAuth::class, app\middleware\AdminPermission::class, app\middleware\AdminLog::class, app\middleware\AdminResponse::class]); Route::miss('admin.Miss/index'); });