Mike 7 vuotta sitten
vanhempi
commit
0745ea9ee5

+ 1 - 1
server/app/Http/Controllers/Admin/Dream/InfoController.php

xqd
@@ -287,7 +287,7 @@ class InfoController extends Controller
             SystemInfoModel::create($info);
 
 //            长连接
-            $this->jPush($message,'',$data['user_id']);
+//            $this->jPush($message,'',$data['user_id']);
         }
         if($ok) {
             $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');

+ 1 - 1
server/app/Http/Controllers/Admin/System/InfoController.php

xqd
@@ -172,7 +172,7 @@ class InfoController extends Controller
                 'created_at'=>date("Y-m-d H:i:s"),
                 'updated_at'=>date("Y-m-d H:i:s"),
             ];
-            $this->jPush($message,'',$user['id']);
+            $this->jPush($message,'',$user['id'],3,1);
         }
         $ok = SystemInfoModel::insert($arr);
         if ($ok) {

+ 1 - 1
server/app/Http/Controllers/Admin/User/Cash/OutController.php

xqd
@@ -129,7 +129,7 @@ class OutController extends Controller
                     }
                 }
                 $message = '你提现的¥'.$data['cash'].'已经到账啦,去实现梦想吧!喵~';
-                $this->jPush($message,'',$data['user_id']);
+//                $this->jPush($message,'',$data['user_id']);
             }
             $arr = [
                 'type_id'=>1,

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

xqd xqd xqd xqd xqd xqd xqd xqd
@@ -452,7 +452,7 @@ class DreamController extends Controller
             //                关注成功发送私信
             $message = BaseSettingsModel::where('category','message')->first();
             $message = empty($message) ? ""."<span style='color: #00c3da'>[$user->nickname]</span> 收藏了你的梦想《".$dream->name.'》' : $message->value;
-            $this->jPush($message,'',$dream->user_id);
+//            $this->jPush($message,'',$dream->user_id,1,$dream->id);
             $info2 = [
                 'to_user_id' => $dream->user_id,
                 'message' => $message,
@@ -465,7 +465,7 @@ class DreamController extends Controller
             SystemInfoModel::firstOrCreate($info2);
             //            长连接
             $mess = $user->nickname."收藏了你的梦想《".$dream->name.">";
-            $this->jPush($mess,'',$dream->user_id);
+//            $this->jPush($mess,'',$dream->user_id,1,$dream->id);
         }
 
 
@@ -555,7 +555,7 @@ class DreamController extends Controller
                 SystemInfoModel::create($info);
 
 //            长连接
-                $this->jPush($message,'',$dream->user_id);
+//                $this->jPush($message,'',$dream->user_id,1,$dream->id);
             }
             $data = [
                 'user_id'=>$user->id,
@@ -585,7 +585,7 @@ class DreamController extends Controller
 
 //            长连接
             $mess ="{$nickname}为你《".$dream->name.'》支持了'.$coin.'梦想币';
-            $this->jPush($mess,'',$user_id);
+            $this->jPush($mess,'',$user_id,1,$dream->id);
 
 //            支持成功返回数据到当前页面   top3user
             $support_dream = SupportDreamModel::where('dream_id',$dream_id)->get();
@@ -645,7 +645,7 @@ class DreamController extends Controller
             ];
             SystemInfoModel::create($arr);
             $mess = "你已不是《".$dream->name."》的《梦主》啦!"."[$user->nickname] "."以$new_arr[0]分刚取代你的位置";
-            $this->jPush($mess,'',$old_top_user_id);
+            $this->jPush($mess,'',$old_top_user_id,4,$dream->id);
         }
     }
 
@@ -712,7 +712,7 @@ class DreamController extends Controller
                 //                关注成功发送私信
                 $message = BaseSettingsModel::where('category','message')->first();
                 $message = empty($message) ? ""."<span style='color: #00c3da'>[$user->nickname]</span> 收藏了你的梦想《".$dream->name.'》' : $message->value;
-                $this->jPush($message,'',$dream->user_id);
+//                $this->jPush($message,'',$dream->user_id,4,$dream->id);/**/
                 $info2 = [
                     'to_user_id' => $dream->user_id,
                     'message' => $message,
@@ -725,7 +725,7 @@ class DreamController extends Controller
                 SystemInfoModel::firstOrCreate($info2);
                 //            长连接
                 $mess = $user->nickname."收藏了你的梦想《".$dream->name.">";
-                $this->jPush($mess,'',$dream->user_id);
+//                $this->jPush($mess,'',$dream->user_id);
             }
         }else{
             UserCareDream::where('user_id',$user->id)->
@@ -939,7 +939,7 @@ class DreamController extends Controller
                         'message' => '关注的梦想有新的梦想动态'.$dream_id,
                     ];
                     //            长连接
-                    $this->jPush('关注的梦想有新的梦想动态','',$id);
+//                    $this->jPush('关注的梦想有新的梦想动态','',$id);
                 }
                 SystemInfoModel::insert($arr);
             }

+ 2 - 2
server/app/Http/Controllers/Api/V1/InteractionController.php

xqd xqd
@@ -93,7 +93,7 @@ class InteractionController extends Controller
                     $arr['dream_id']=$dream_id;
                     SystemInfoModel::create($arr);
 //            长连接
-                    $this->jPush($arr['message'],'',$user_id);
+                    $this->jPush($arr['message'],'',$user_id,2,$dream_id);
                 }
             }
 //            收藏梦想的最新动态加一
@@ -185,7 +185,7 @@ class InteractionController extends Controller
                 SystemInfoModel::create($info);
             }
         }
-        $this->jPush($user->nickname."在你的互动上留言啦!点击去看看",'',$toid);
+        $this->jPush($user->nickname."在你的互动上留言啦!点击去看看",'',$toid,2,$dream_id);
 
         if (!empty($request->input('u_id'))) {
             $message = ""."<span style='color: #00c3da'>[$user->nickname]</span> ".'提起了你哦~点击看看!';

+ 2 - 2
server/app/Http/Controllers/Api/V1/MyController.php

xqd xqd
@@ -632,7 +632,7 @@ class MyController extends Controller
         SystemInfoModel::create($info);
 
 //            长连接
-        $this->jPush($message,'',$user->id);
+//        $this->jPush($message,'',$user->id);
 
         if ($ok) {
             return $this->api(ErrorCode::verify);
@@ -1366,7 +1366,7 @@ class MyController extends Controller
         $ok =SystemInfoModel::create($arr);
         if ($ok) {
             if (!empty($to_user_id)) {
-                $this->jPush($user->nickname.'给你发了个私信哦~点击看看!','',$to_user_id);
+                $this->jPush($user->nickname.'给你发了个私信哦~点击看看!','',$to_user_id,3,1);
             }
             return $this->api('');
         }else{