Merge pull request #38 from kbdxbt/master

fix
jianyan74 · Sep 1, 2019 · ee49944 · ee49944
2 parents 4cc9d65 + d169073
commit ee49944
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/api/modules/v1/controllers/MiniProgramController.php b/api/modules/v1/controllers/MiniProgramController.php
@@ -85,7 +85,7 @@ public function actionDecode()
 
         // 插入到用户授权表
         if (!($memberAuthInfo = Yii::$app->services->memberAuth->findOauthClient(Auth::CLIENT_MINI_PROGRAM, $userinfo['openId']))) {
-            Yii::$app->services->memberAuth->create([
+            $memberAuthInfo = Yii::$app->services->memberAuth->create([
                 'unionid' => $userinfo['unionId'] ?? '',
                 'oauth_client' => Auth::CLIENT_MINI_PROGRAM,
                 'oauth_client_user_id' => $userinfo['openId'],

diff --git a/common/helpers/UploadHelper.php b/common/helpers/UploadHelper.php
@@ -137,6 +137,9 @@ public function __construct(array $config, $type, $superaddition = false)
     public function verifyFile()
     {
         $file = UploadedFile::getInstanceByName($this->uploadFileName);
+        if (!$file) {
+            throw new NotFoundHttpException('找不到上传文件');
+        }
         if ($file->getHasError()) {
             throw new NotFoundHttpException('上传失败，请检查文件');
         }