更新

app/Admin/Controllers/NoticeController.php

@@ -84,6 +84,10 @@ class NoticeController extends AdminController
                 //dd($res->attributes);
                 //推送消息
                 $notice = Notice::query()->orderBy('id','desc')->first();
+
+                $users = User::query()->where(['notice_status'=>1])->whereNotNull('registrationId')->get(['id','registrationId'])->toArray();
+
+
                 JPushService::pushNotify([
                     //标题
                     'title' => $res->title,
@@ -100,7 +104,6 @@ class NoticeController extends AdminController
                 ]);
 
                 //给用户添加消息记录
-                $users = User::query()->get(['id']);
                 $datas = array();
                 foreach ($users as $k=>$v){
                     $arr = array();

app/Admin/Controllers/UsersInfoController.php

@@ -108,7 +108,7 @@ class UsersInfoController extends AdminController
                 $form->radio('state', '阅后即焚')->options([0 => "否", 1 => "是"])->default(0);
             })->saveAsJson()->label("图片上传");
             $form->array('video',function ($form){
-                $form->file("url","视频上传")->disk('oss')->saveFullUrl()->uniqueName()->removable(false)->autoUpload();
+                $form->file("url","视频上传")->accept('avi,mov,rmvb,rm,flv,mp4,3gp','video/*')->disk('oss')->saveFullUrl()->uniqueName()->removable(false)->autoUpload();
             })->saveAsJson()->label("视频上传");
 
 

app/Http/Controllers/Api/AuthorizationsController.php

@@ -117,7 +117,7 @@ class AuthorizationsController extends Controller
 
 
     //登录操作
-    public function do_login($mobile,$password=null){
+    public function do_login($mobile,$password=null,$registrationId=null,$phoneModel=null){
         if(!empty($password)){
             if (!$user=User::query()->where(['mobile' => $mobile,'is_distory'=>0])->whereNull('deleted_at')->first()) {
                 throw new Exception("用户不存在");
@@ -164,6 +164,11 @@ class AuthorizationsController extends Controller
         $user->remember_token = $token;
         $user->last_login_time = Carbon::now();
         $user->last_login_ip = request()->ip();
+        if(!empty($registrationId)){
+            $user->registrationId = $registrationId;
+            $user->phoneModel = $phoneModel;
+        }
+
         $user->save();
 
         $resdata['token'] = "Bearer ".$token;

app/Models/User.php

@@ -20,7 +20,7 @@ class User extends Authenticatable implements JWTSubject
      * @var array
      */
     protected $fillable = [
-        'mobile', 'password', 'pid', 'tencent_im_user_id','sex','status','is_vip','is_auth','remember_token','ycode','latitude','longitude','online','notice_status','like_num','like_me_num','look_num','lock_pass','is_distory'
+        'mobile', 'password', 'pid', 'tencent_im_user_id','sex','status','is_vip','is_auth','remember_token','ycode','latitude','longitude','online','notice_status','like_num','like_me_num','look_num','lock_pass','is_distory','registrationId','phoneModel'
     ];
 
     /**

app/Services/JPushService.php

@@ -139,7 +139,6 @@ class JPushService
         if ($response['http_code'] == 200) {
             return true;
         }
-
         return false;
     }