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

miaomiao/www/css/style.css

@@ -607,7 +607,6 @@ a:visited,a:link{
     z-index: 11;
     display: block;
     width: 80%;
-    height: 15%;
     margin: 28% 10%;
 }
 .popover-backdrop .code{

miaomiao/www/templates/add/index.html

@@ -17,7 +17,7 @@
                     <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
                 </a>
                 <!--<a class="btn-file-up" ng-click="addpict()"><i class="ion-image"></i>添加图片</a>-->
-                <a class="btn-file-up" ng-click="addpict()">
+                <a class="btn-file-up" ng-click="addpict()" ng-show="imgs.length<9">
                     <img src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加图片</em>
                 </a>

miaomiao/www/templates/home/dream-detail.html

@@ -291,7 +291,7 @@
                 <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
                     <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
                 </a>
-                <a class="btn-file-up" ng-click="addpict()" ng-show="!video.isOK">
+                <a class="btn-file-up" ng-click="addpict()" ng-show="!video.isOK&&imgs.length<9">
                     <img ng-src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加图片</em>
                 </a>

server/app/Helper/JpushHelper.php

@@ -2,25 +2,25 @@
 namespace App\Helper;
 
 use JPush\Client as JPush;
-use App\Models\Push;
+//use App\Models\Push;
 use App\User;
 
 trait JpushHelper
 {
     public function jPush($title,$content='',$userid=0) {
-        $app_key = '55efccbdf77071c59ccbf0cd';
-        $master_secret = 'b9da2f5151a29889cbabee3f';
+        $app_key = '69838317211448192366f9d8';
+        $master_secret = 'f202d10301151e1816b49e55';
         $client = new JPush($app_key, $master_secret, storage_path('logs/jpush.log'));
 
-        $push = new Push;
-        $push->title = $title;
-        $push->content = $content;
-        $push->user_id = $userid;
-        $res=$push->save();
+//        $push = new Push;
+//        $push->title = $title;
+//        $push->content = $content;
+//        $push->user_id = $userid;
+//        $res=$push->save();
         if($userid){
             $user = User::find($userid);
         }
-        if($res&&$user&&$user->jpush){
+        if($user&&$user->jpush){
             $regId = array($user->jpush);
             $options = array(
                 'apns_production' => true,

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

@@ -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;

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

@@ -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);
             }

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

@@ -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 用户信息
@@ -48,7 +50,17 @@ class HomeController extends Controller
      */
     public function show(Request $request)
     {
+//        访问用户信息时临时将用户的梦想动态数量清零（不确定）
+        $login_user = $this->getUser();
         $user_id = $request->user_id;
+        $info = UserCareUser::where('user_id',$login_user->id)->where('other_user_id',$user_id)->first();
+        if (!empty($info)) {
+            if ($info->dream_number > 0) {
+                $info->dream_number = 0;
+                $info->save();
+            }
+        }
+
 //        获得的支持分数
         $info = SupportDreamModel::where('to_user_id',$user_id)->get();
         $score = 0;
@@ -161,6 +173,8 @@ class HomeController extends Controller
                     'message' =>$message
                 ];
                 SystemInfoModel::create($info);
+                //            长连接
+                $this->jPush($message,'',$user->id);
             }
 
         }else{

server/app/Models/UserInfoModel.php

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

server/database/migrations/2017_09_02_180221_add_jpush_to_user_info_table.php

@@ -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) {
+            //
+        });
+    }
+}