| xqd
@@ -12,6 +12,7 @@ use App\Models\ProductScheduleModel;
|
|
|
use App\Models\SettingInfoModel;
|
|
|
use App\Models\StoreInfoModel;
|
|
|
use App\Models\UserCouponRelationModel;
|
|
|
+use App\Models\UserInfoModel;
|
|
|
use App\Models\UserScheduleModel;
|
|
|
use Carbon\Carbon;
|
|
|
use EasyWeChat\Factory;
|
| xqd
@@ -19,7 +20,7 @@ use function foo\func;
|
|
|
use Illuminate\Http\Request;
|
|
|
use App\Services\Base\Attachment;
|
|
|
use App\Services\Base\ErrorCode;
|
|
|
-use Validator, Response;
|
|
|
+use Validator, Response,Auth, Cache;
|
|
|
|
|
|
class HomeController extends Controller
|
|
|
{
|
| xqd
@@ -78,25 +79,45 @@ class HomeController extends Controller
|
|
|
|
|
|
public function login(Request $request)
|
|
|
{
|
|
|
- $code = $request->get('code');
|
|
|
- $session = $this->app->auth->session($code);
|
|
|
- \Log::info(json_encode($session));
|
|
|
- $openid = $session['openid'];
|
|
|
+// $code = $request->get('code');
|
|
|
+// $session = $this->app->auth->session($code);
|
|
|
+// \Log::info(json_encode($session));
|
|
|
+// $openid = $session['openid'];
|
|
|
+ $openid = 'olAS94uwfTdsL3nDnvG67p_v5Vks';
|
|
|
+ if(!$openid){
|
|
|
+ $data = [
|
|
|
+ 'code' => 500,
|
|
|
+ 'msg' => '获取openid失败!'
|
|
|
+ ];
|
|
|
+ return $this->api($data);
|
|
|
+ }
|
|
|
|
|
|
- $userinfo = UserInfoModel::where('openid', $openid)->first(['id', 'nickname', 'openid', 'has_agreed']);
|
|
|
|
|
|
- if ($userinfo) {
|
|
|
- return $this->api(compact('userinfo'));
|
|
|
- } else {
|
|
|
+ $userinfo = UserInfoModel::where('openid', $openid)->first(['id', 'nickname', 'openid']);
|
|
|
+
|
|
|
+ if (!$userinfo) {
|
|
|
$data['openid'] = $openid;
|
|
|
$data['nickname'] = $request->get('nickName');
|
|
|
$data['avatar'] = $request->get('avatar');
|
|
|
|
|
|
$userinfo = UserInfoModel::create($data);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
- return $this->api($userinfo);
|
|
|
+ if (Auth::loginUsingId($userinfo->id)) {
|
|
|
+ $user = Auth::user();
|
|
|
+ $token = $user->createToken($user->id . '-' . $user->openid)->accessToken;
|
|
|
+ return $this->api(compact('token', 'user'));
|
|
|
+ } else {
|
|
|
+
|
|
|
+ return $this->error(ErrorCode::INCORRECT_USER_OR_PASS);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|