Merge branch 'gq' of http://git.9026.com/roobe/miao

server/app/Console/Commands/DreamDJS.php

@@ -70,7 +70,7 @@ class DreamDJS extends Command
 
                 $dream_user = $item->user;
                 if (!empty($dream_user)) {
-                    $img = $item->img;  //梦想图片
+                   /* $img = $item->img;  //梦想图片
                     $arr = [
                         'from_type'=>'梦想币',
                         'from_id'=>$dream_user->id,
@@ -90,7 +90,7 @@ class DreamDJS extends Command
                     if (empty($exist)) {
 //                        AccountLog::firstOrCreate($arr);
                         AccountLog::create($arr);
-                    }
+                    }*/
 
 
 

server/app/Http/Controllers/Admin/Dream/InfoController.php

@@ -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'=>'返回列表');

server/app/Http/Controllers/Admin/System/InfoController.php

@@ -14,10 +14,13 @@ use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\System\Criteria\MultiWhere;
 use App\Repositories\System\InfoRepository;
+use App\Helper\JpushHelper;
+
 
 class InfoController extends Controller
 {
     private $repository;
+    use JpushHelper;
 
     public function __construct(InfoRepository $repository) {
         if(!$this->repository) $this->repository = $repository;
@@ -163,11 +166,13 @@ class InfoController extends Controller
         $arr = [] ;
         foreach ($users as $user) {
             $arr[] = [
-                'user_id' =>$user['id'],
+                'user_id' =>0,
+                'to_user_id' =>$user['id'],
                 'message' =>$message,
                 'created_at'=>date("Y-m-d H:i:s"),
                 'updated_at'=>date("Y-m-d H:i:s"),
             ];
+            $this->jPush($message,'',$user['id']);
         }
         $ok = SystemInfoModel::insert($arr);
         if ($ok) {

server/app/Http/Controllers/Admin/User/Cash/OutController.php

@@ -16,11 +16,13 @@ use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\User\Cash\Criteria\MultiWhere;
 use App\Repositories\User\Cash\OutRepository;
+use App\Helper\JpushHelper;
+
 
 class OutController extends Controller
 {
     private $repository;
-
+    use JpushHelper;
     public function __construct(OutRepository $repository) {
         if(!$this->repository) $this->repository = $repository;
     }
@@ -127,6 +129,7 @@ class OutController extends Controller
                     }
                 }
                 $message = '你提现的¥'.$data['cash'].'已经到账啦，去实现梦想吧！喵～';
+                $this->jPush($message,'',$data['user_id']);
             }
             $arr = [
                 'type_id'=>1,

server/app/Http/Controllers/Api/V1/DreamController.php

@@ -535,7 +535,8 @@ class DreamController extends Controller
             SystemInfoModel::create($info);
 
 //            长连接
-//            $this->jPush($message,'',$user_id);
+            $mess ="{$nickname}为你《".$dream->name.'》支持了'.$coin.'梦想币';
+            $this->jPush($mess,'',$user_id);
 
 //            支持成功返回数据到当前页面   top3user
             $support_dream = SupportDreamModel::where('dream_id',$dream_id)->get();
@@ -594,6 +595,8 @@ class DreamController extends Controller
                 'attr_id'=>10,
             ];
             SystemInfoModel::create($arr);
+            $mess = "你已不是《".$dream->name."》的《梦主》啦！"."[$user->nickname] "."以$new_arr[0]分刚取代你的位置";
+            $this->jPush($mess,'',$old_top_user_id);
         }
     }
 
@@ -661,6 +664,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);
             $info2 = [
                 'to_user_id' => $dream->user_id,
                 'message' => $message,
@@ -672,7 +676,8 @@ class DreamController extends Controller
             ];
             SystemInfoModel::firstOrCreate($info2);
             //            长连接
-//            $this->jPush($message,'',$dream->user_id);
+            $mess = $user->nickname."收藏了你的梦想《".$dream->name.">";
+            $this->jPush($mess,'',$dream->user_id);
         }else{
             UserCareDream::where('user_id',$user->id)->
             where('dream_id',$request->id)->delete();

server/app/Http/Controllers/Api/V1/HomeController.php

@@ -230,8 +230,8 @@ class HomeController extends Controller
             }
             $arr[$k] = $score;
         }
-        $sup_id= iconv('UTF-8', 'GBK', array_search(max($arr),$arr));
-
+        if (!empty($arr)) $sup_id= iconv('UTF-8', 'GBK', array_search(max($arr),$arr));
+        else  $sup_id = 0;
         if ($user->id != $sup_id) return $this->error(ErrorCode::SUP_ERROR);
 //        见面成功写入数据记录
         $data = [

server/app/Http/Controllers/Api/V1/InteractionController.php

@@ -173,6 +173,8 @@ class InteractionController extends Controller
                 $data['to_user_nickname'] = $to_user->nickname;
 //点击去看看
                 $message = ""."<span style='color: #00c3da'>[$user->nickname]</span> ".'在你的互动上留言啦！点击去看看';
+                $this->jPush($user->nickname."在你的互动上留言啦！点击去看看",'',$data['to_user_id']);
+
                 $info = [
                     'to_user_id' => $data['to_user_id'],
                     'message' => $message,

server/resources/views/admin/share1.blade.php

@@ -278,7 +278,7 @@
 <body>
 <div style="height: 50px">
     <a href="https://fir.im/jt4h" style="height: 50px; background: #00c3da; position: fixed; z-index: 99; width: 100%">
-        <div style="float: left;color: #fff;line-height: 50px;padding-left: 5px">支持({{empty($dream->user) ? '' : $dream->user->nickname}})的梦想!现在就下载喵喵</div>
+        <div style="float: left;color: #fff;line-height: 50px;padding-left: 5px">支持({{empty($dream->user) ? '' : $dream->user->nickname}})的梦想!现在就下载瞄喵</div>
         <div style="float: right;padding: 5px">
             <img style="width: 40px;height: 40px;" src="http://firicon.fir.im/396004d5e7b572efbefdfee976338331a457282b" alt="">
         </div>