Merge branch 'develop'

app/Helper/helper.php

@@ -38,7 +38,7 @@ function http($url, $param, $method = 'post')
         $client = new \GuzzleHttp\Client();
         $response = $client->request($method, $url, $param);
         $result = json_decode($response->getBody()->getContents(), true);
-        if ($result['code'] == 0) {
+        if ($result['status_code'] == 200) {
             return $result['data'];
         } else {
             return [];

app/Http/Controllers/UploadController.php

@@ -27,15 +27,16 @@ class UploadController extends Controller
                 $width = Image::make($filePath)->width();
                 $height = Image::make($filePath)->height();
                 //要保存的文件名 时间+扩展名
-                $filename = time() . '_' . uniqid() . '.' . $kuoname . '?' . $width . '_' . $height;
+                $filename = time() . '_' . uniqid() . '.' . $kuoname;
+                $fileurl = time() . '_' . uniqid() . '.' . $kuoname . '?' . $width . '_' . $height;
             } else {
                 //要保存的文件名 时间+扩展名
-                $filename = time() . '_' . uniqid() . '.' . $kuoname;
+                $fileurl = $filename = time() . '_' . uniqid() . '.' . $kuoname;
             }
             $imageUrl = Storage::put($path . $filename, file_get_contents($filePath));
             if ($imageUrl) {
                 return [
-                    'data' => ['url' => $path . $filename]
+                    'data' => ['url' => $path . $fileurl]
                 ];
             } else {
                 return $this->response->error('图片上传失败,请重试', 500);
@@ -59,14 +60,15 @@ class UploadController extends Controller
                 $height = Image::make($filePath)->height();
                 //要保存的文件名 时间+扩展名
                 //$filename = time() . '_' . uniqid() . '*' . $width . '_' . $height . '.' . $kuoname;
-                $filename = time() . '_' . uniqid() . '.' . $kuoname . '?' . $width . '_' . $height;
+                $filename = time() . '_' . uniqid() . '.' . $kuoname;
+                $fileurl = time() . '_' . uniqid() . '.' . $kuoname . '?' . $width . '_' . $height;
             } else {
                 //要保存的文件名 时间+扩展名
-                $filename = time() . '_' . uniqid() . '.' . $kuoname;
+                $fileurl = $filename = time() . '_' . uniqid() . '.' . $kuoname;
             }
             $imageUrl = Storage::put($filename, file_get_contents($filePath));
             if ($imageUrl) {
-                array_push($urls, $filename);
+                array_push($urls, $fileurl);
             } else {
                 Log::debug('文件上传失败。' . $filename);
             }

app/Http/Controllers/V2/StarNewsController.php

@@ -55,8 +55,8 @@ class StarNewsController extends BaseController
     public function create(Request $request)
     {
         $validator = Validator::make($request->all(), [
-            'title' => 'required|string',
-            'content' => 'required|string',
+            'title' => 'required|string|max:30',
+            'content' => 'required|string|max:300',
             'cover_img' => 'required',
         ]);
         if ($validator->fails()) {
@@ -72,8 +72,8 @@ class StarNewsController extends BaseController
     {
         $validator = Validator::make($request->all(), [
             'id' => 'required|exists:star_news',
-            'title' => 'required|string',
-            'content' => 'required|string',
+            'title' => 'required|string|max:30',
+            'content' => 'required|string|max:300',
             'cover_img' => 'required',
         ]);
 

app/Repositories/MessageRuleRepository.php

@@ -9,6 +9,7 @@
 namespace App\Repositories;
 
 use App\Models\MessageRule;
+use App\Traits\PostTrait;
 use Illuminate\Database\QueryException;
 use Dingo\Api\Http\Response;
 use Illuminate\Support\Carbon;
@@ -20,6 +21,7 @@ use Tymon\JWTAuth\Facades\JWTAuth;
 
 class MessageRuleRepository
 {
+    use PostTrait;
     public function __construct(MessageRule $messageRule)
     {
         $this->messageRule = $messageRule;
@@ -49,6 +51,17 @@ class MessageRuleRepository
      */
     public function create($request)
     {
+        $post_type = '';
+        if($request['message_show_type'] == 'post'){
+            //查看内容的类型
+            $post_type = $this->getPostType($request['activity_url']);
+            if(!$post_type){
+                return Response::create([
+                    'message'  => '请输入有效内容id',
+                    'status_code'   => 500
+                ]);
+            }
+        }
         $noticeGroups = explode(',', $request['notice_groups']);
 
         if(in_array(0, $noticeGroups)){
@@ -71,6 +84,7 @@ class MessageRuleRepository
             'message_type' => $request['message_type'],
             'message_show_type' => isset($request['message_show_type']) && $request['message_type'] == 'star'? $request['message_show_type']:'',
             'activity_url' => isset($request['activity_url']) && $request['message_type'] == 'star'? $request['activity_url']:'',
+            'post_type' => $post_type,
             'cover' => $request['message_type'] == 'star'? $request['cover']:'',
             'message_status' => 0,
             'send_time' => isset($request['send_time']) && $request['send_time']? $request['send_time']:null,

app/Traits/PostTrait.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019/6/11
+ * Time: 17:50
+ */
+
+namespace App\Traits;
+use Tymon\JWTAuth\Facades\JWTAuth;
+
+trait PostTrait
+{
+    public function getPostType($id) {
+        try {
+            $url = config("customer.manage_service_url").'/community/post/getType';
+            $array = [
+                'json' => ['id' => $id], 'query' => [], 'http_errors' => false,'headers'=>['Authorization'=>"Bearer ".JWTAuth::getToken()]
+            ];
+            return http($url,$array, 'get');
+        } catch (\Exception $e) {
+            return [];
+        }
+
+    }
+}

database/migrations/2019_07_18_115357_update_content_to_star_news_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateContentToStarNewsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('star_news', function (Blueprint $table) {
+            $table->text('content')->comment('文字说明')->change();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('star_news', function (Blueprint $table) {
+            //
+        });
+    }
+}