diff --git a/app/common/controller/UploadController.php b/app/common/controller/UploadController.php index fd80c53..293c5d3 100644 --- a/app/common/controller/UploadController.php +++ b/app/common/controller/UploadController.php @@ -88,7 +88,7 @@ class UploadController $originalName = $file->getUploadName(); $result = Storage::adapter('oss') - ->path('bsh_datax/' . $sceneUrl . date('Ymd')) + ->path('bsh_info/' . $sceneUrl . date('Ymd')) ->size(1024*1024*100) ->upload($file); @@ -129,7 +129,7 @@ class UploadController } $result = Storage::adapter('oss') - ->path('bsh_datax/' . $sceneUrl . date('Ymd')) + ->path('bsh_info/' . $sceneUrl . date('Ymd')) ->size(1024*1024*100) ->extYes(['image/jpeg','image/png']) ->extNo(['image/gif']) diff --git a/app/common/controller/UserController.php b/app/common/controller/UserController.php index e617153..6146a03 100644 --- a/app/common/controller/UserController.php +++ b/app/common/controller/UserController.php @@ -133,7 +133,7 @@ class UserController extends BaseController { try { $params = $request->all(); - $result = $this->service->wechatLogin($params['code'], $params['state']); + $result = $this->service->wechatLogin($params['login_code'], $params['phone_code']); return $this->success($result); } catch (\Throwable $th) { diff --git a/app/common/model/PostCategory.php b/app/common/model/PostCategory.php index b7b9bd1..602cab9 100644 --- a/app/common/model/PostCategory.php +++ b/app/common/model/PostCategory.php @@ -40,7 +40,7 @@ class PostCategory extends Model /** * 允许自动填充模型字段 */ - protected $fillable = ['id', 'parent_id', 'name', 'level', 'path', 'sort', 'status', 'created_at', 'updated_at']; + protected $fillable = ['id', 'parent_id', 'icon', 'name', 'level', 'path', 'sort', 'status', 'created_at', 'updated_at']; /** * 不允许自动填充模型字段 diff --git a/app/common/service/BasicDataService.php b/app/common/service/BasicDataService.php index 2e7885a..970aef3 100644 --- a/app/common/service/BasicDataService.php +++ b/app/common/service/BasicDataService.php @@ -98,7 +98,7 @@ class BasicDataService */ private function getAllLoginTypes() { - return ['upwd', 'feishu', 'qrcode']; // 示例数据 + return ['upwd', 'feishu', 'wechat', 'qrcode']; // 示例数据 } /** diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php index 2244357..786da49 100644 --- a/app/common/service/UserService.php +++ b/app/common/service/UserService.php @@ -187,7 +187,8 @@ class UserService $session = $logic->miniCode2Session($loginCode); if (!isset($session['openid'])) { - return json(['code'=>0, 'msg'=>'登录失败', 'data'=>$session]); + throw new BusinessException('登录失败'); +// return json(['code'=>0, 'msg'=>'登录失败', 'data'=>$session]); } $openid = $session['openid']; @@ -199,7 +200,8 @@ class UserService $phoneData = $logic->getMiniPhoneNumber($access_token, $phoneCode); if (!isset($phoneData['phone_info']['phoneNumber'])) { - return json(['code'=>0, 'msg'=>'获取手机号失败', 'data'=>$phoneData]); + throw new BusinessException('获取手机号失败'); +// return json(['code'=>0, 'msg'=>'获取手机号失败', 'data'=>$phoneData]); } $phone = $phoneData['phone_info']['phoneNumber']; diff --git a/app/common/service/WechatService.php b/app/common/service/WechatService.php index 224631c..4883a1b 100644 --- a/app/common/service/WechatService.php +++ b/app/common/service/WechatService.php @@ -13,6 +13,7 @@ class WechatService { protected array $web; + protected array $mini; protected array $login; protected $app; diff --git a/config/route.php b/config/route.php index d74f70c..426eb79 100644 --- a/config/route.php +++ b/config/route.php @@ -21,7 +21,7 @@ Route::any('/qrcode/url', [app\common\controller\UserController::class, 'getQrUr Route::any('/user/info', [app\common\controller\UserController::class, 'getUserInfo']); Route::any('/bind/user', [app\common\controller\UserController::class, 'bindUser']); -//Route::post('/api/wechat/login', [app\common\controller\UserController::class, 'wechatLogin']); +Route::post('/wechat/login', [app\common\controller\UserController::class, 'wechatLogin']); // 代理oss文件地址 Route::any('/proxy/ossurl', [app\common\controller\UploadController::class, 'proxy']);