fly 5 سال پیش
والد
کامیت
5e39490438
3فایلهای تغییر یافته به همراه17 افزوده شده و 23 حذف شده
  1. 13 19
      app/Http/Controllers/QuickApp/BaseController.php
  2. 3 4
      app/Http/Controllers/QuickApp/User/UserController.php
  3. 1 0
      config/error.php

+ 13 - 19
app/Http/Controllers/QuickApp/BaseController.php

@@ -11,25 +11,19 @@ class BaseController extends Controller
     
     public function __get($name)
     {
-//        if (!isset($this->field[$name])) {
-//            $qapp_user = QappUserService::getGolableUserStatic();
-//            if ($name == '_user_info') {
-//                $this->field[$name] = $qapp_user->user;
-//            }
-//            if ($name == 'uid') {
-//                $this->field[$name] = $qapp_user->uid;
-//            }
-//            if ($name == 'distribution_channel_id') {
-//                $this->field[$name] = $qapp_user->user->distribution_channel_id;
-//            }
-//        }
-        if (!isset($this->field[$name])) {
-
-            $this->field['_user_info'] = '';
-            $this->field['uid'] = 1;
-            $this->field['distribution_channel_id'] = 5;
-
-        }
+       if (!isset($this->field[$name])) {
+           QappUserService::setGolableUserStatic(162261523);
+           $qapp_user = QappUserService::getGolableUserStatic();
+           if ($name == '_user_info') {
+               $this->field[$name] = $qapp_user->user;
+           }
+           if ($name == 'uid') {
+               $this->field[$name] = $qapp_user->uid;
+           }
+           if ($name == 'distribution_channel_id') {
+               $this->field[$name] = $qapp_user->user->distribution_channel_id;
+           }
+       }
         return  $this->field[$name];
     }
 }

+ 3 - 4
app/Http/Controllers/QuickApp/User/UserController.php

@@ -24,8 +24,7 @@ class UserController extends BaseController
      * @apiVersion 1.0.0
      * @apiDescription 获取用户信息
      * @api {GET} userinfo 获取用户信息
-     * @apiParam {String}  [token]  token
-     * @apiHeader {String} [Authorization]  token 两个token任选其一
+     * @apiHeader {String} [Authorization]  token
      * @apiGroup User
      * @apiName index
      * @apiSuccess {Number}  id 用户ID.
@@ -105,11 +104,11 @@ class UserController extends BaseController
     public function sign(Request $request)
     {
         if (UserSignService::isSign($this->uid)) {
-            return 0;
+            return response()->error('QAPP_CHECKED_IN');
         }
         if (UserSignService::signV2($this->uid, date('Y-m-d'))) {
             return response()->success();
         }
-        return 0;
+        return response()->error('QAPP_SYS_ERROR');
     }
 }

+ 1 - 0
config/error.php

@@ -191,6 +191,7 @@ return [
 
         //Quick App 快应用
         'QAPP_NOT_LOGIN' => ['code' => 10023, 'msg' => '未登录'],
+        'QAPP_CHECKED_IN' => ['code' => 10024, 'msg' => '已签到'],
         'QAPP_TOKEN_ERROR' => ['code' => 10023, 'msg' => 'token失效'],
         'QAPP_NOT_ORDERED' => ['code' => 10002, 'msg' => '未订购'],
         'QAPP_PARAM_ERROR' => ['code' => 10003, 'msg' => '参数错误'],