gq 7 jaren geleden
bovenliggende
commit
ad778da3f1

+ 5 - 1
server/app/Http/Controllers/Api/V1/AuthController.php

xqd xqd xqd xqd xqd
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api\V1;
 
 use App\Helper\AttachmentHelper;
+use App\Helper\JpushHelper;
 use App\Helper\SmsHelper;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use App\Models\UserInfoModel;
@@ -12,7 +13,7 @@ use Validator, Auth, Cache;
 
 class AuthController extends Controller
 {
-    use SmsHelper,AuthenticatesUsers,AttachmentHelper;
+    use SmsHelper,AuthenticatesUsers,AttachmentHelper,JpushHelper;
 
     private $expireTime     = 1;
     private $keySmsCode     = 'auth:sms:';
@@ -30,6 +31,7 @@ class AuthController extends Controller
      * @apiPermission none
      * @apiVersion 0.1.0
      * @apiParam {string}  phone    手机号码
+     * @apiParam {string}  [jpush]
      * @apiParam {string}  wechat   微信openid
      * @apiParam {String}  verify_code  手机验证码
      * @apiSuccessExample {json} Success-Response:
@@ -86,6 +88,7 @@ class AuthController extends Controller
             return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
         $phone = $request->phone;
         $wechat = $request->wechat;
+        $jpush = $request->jpush;
         $key = $this->keySmsCode . $phone;
         $code = Cache::store('file')->get($key);
         $password = 123456;
@@ -95,6 +98,7 @@ class AuthController extends Controller
             $user = UserInfoModel::create([
                 'phone'=>$phone,
                 'wechat'=>$wechat,
+                'jpush'=>$jpush,
                 'password'=>bcrypt(123456)
             ]);
             $user->status=1;

+ 9 - 0
server/app/Http/Controllers/Api/V1/DreamController.php

xqd xqd xqd xqd xqd
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Helper\JpushHelper;
 use App\Models\AccountLog;
 use App\Models\BaseSettingsModel;
 use App\Models\DreamImages;
@@ -18,6 +19,7 @@ use App\Services\Base\ErrorCode;
 
 class DreamController extends Controller
 {
+    use JpushHelper;
     /**
      * @api {get} /api/dream/show    梦想详情
      * @apiDescription 梦想详情
@@ -430,6 +432,9 @@ class DreamController extends Controller
             ];
             SystemInfoModel::create($info);
 
+//            长连接
+            $this->jPush($message,'',$user_id);
+
 //            支持成功返回数据到当前页面   top3user
             $support_dream = SupportDreamModel::where('dream_id',$dream_id)->get();
             $top = [] ;
@@ -540,6 +545,8 @@ class DreamController extends Controller
                 'message' =>$message
             ];
             SystemInfoModel::create($info2);
+            //            长连接
+            $this->jPush($message,'',$dream->user_id);
         }
 
         return $this->api($is_collection);
@@ -718,6 +725,8 @@ class DreamController extends Controller
                         'user_id' => $user->id,
                         'message' => '关注的梦想有新的梦想动态'.$dream_id,
                     ];
+                    //            长连接
+                    $this->jPush('关注的梦想有新的梦想动态','',$id);
                 }
                 SystemInfoModel::insert($arr);
             }

+ 4 - 0
server/app/Http/Controllers/Api/V1/HomeController.php

xqd xqd xqd
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Helper\JpushHelper;
 use App\Models\BaseDictionaryOptionModel;
 
 use App\Models\BaseSettingsModel;
@@ -15,6 +16,7 @@ use Illuminate\Http\Request;
 use App\Services\Base\ErrorCode;
 class HomeController extends Controller
 {
+    use JpushHelper;
     /**
      * @api {get} /api/user/show/ 用户信息
      * @apiDescription 用户信息
@@ -161,6 +163,8 @@ class HomeController extends Controller
                     'message' =>$message
                 ];
                 SystemInfoModel::create($info);
+                //            长连接
+                $this->jPush($message,'',$user->id);
             }
 
         }else{

+ 1 - 0
server/app/Models/UserInfoModel.php

xqd
@@ -54,6 +54,7 @@ class UserInfoModel extends Authenticatable
                            'remember_token',
                            'birthday',
                            'wechat',
+                           'jpush',
                           ];
 
     protected $hidden = ['password'];

+ 32 - 0
server/database/migrations/2017_09_02_180221_add_jpush_to_user_info_table.php

xqd
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddJpushToUserInfoTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('user_info', function (Blueprint $table) {
+            $table->string('jpush')->nullable()->comment('长连接')->after('wechat');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('user_info', function (Blueprint $table) {
+            //
+        });
+    }
+}