| xqd
@@ -19,7 +19,7 @@ use App\Models\AlbumUserModel;
|
|
|
use App\Models\AlbumXyxUserModel;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Support\Facades\DB;
|
|
|
-use Validator, Response;
|
|
|
+use Validator, Response,Auth;
|
|
|
use App\Services\Base\ErrorCode;
|
|
|
use WXBizDataCrypt;
|
|
|
use EasyWeChat\Factory;
|
| xqd
@@ -132,17 +132,22 @@ class AlbumController extends Controller
|
|
|
|
|
|
$userinfo = AlbumUserModel::where('wechat_open_id', $openid)->where('store_id',$storeid)->first(['id', 'username','wechat_open_id','avatar']);
|
|
|
|
|
|
- if ($userinfo) {
|
|
|
- return $this->api(compact('userinfo'));
|
|
|
- } else {
|
|
|
+ if (!$userinfo) {
|
|
|
$data['wechat_open_id'] = $openid;
|
|
|
$data['username'] = $request->get('nickName');
|
|
|
$data['avatar'] = $request->get('avatar');
|
|
|
$data['is_dealer'] = 0;
|
|
|
|
|
|
$userinfo = AlbumUserModel::create($data);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (Auth::loginUsingId($userinfo->id)) {
|
|
|
+ $user = Auth::user();
|
|
|
+ $token = $user->createToken($user->id . '-' . $user->openid)->accessToken;
|
|
|
+ return $this->api(compact('token', 'user', 'session_key'));
|
|
|
+ } else {
|
|
|
|
|
|
- return $this->api($userinfo);
|
|
|
+ return $this->error(ErrorCode::INCORRECT_USER_OR_PASS);
|
|
|
}
|
|
|
}
|
|
|
|