Merge branch 'master' into release

.rocketeer/hooks.php

@@ -28,7 +28,8 @@ return [
             'composer dumpautoload',
             'chmod -R 777 bootstrap',
             'chmod -R 777 storage',
-            'chmod -R 777 public'
+            'chmod -R 777 public',
+            'service php-fpm reload'
         ],
         'cleanup' => [],
     ],

app/Http/Controllers/ConfigController.php

@@ -23,6 +23,40 @@ class ConfigController extends Controller
     }
     public function index()
     {
+        $reportCategory = [
+            [
+                'id' => 0,
+                'name' => '广告内容',
+            ],
+            [
+                'id' => 1,
+                'name' => '搬运抄袭',
+            ],
+            [
+                'id' => 2,
+                'name' => '不友善内容',
+            ],
+            [
+                'id' => 3,
+                'name' => '造谣，伪科学',
+            ],
+            [
+                'id' => 4,
+                'name' => '虚假互动数据',
+            ],
+            [
+                'id' => 5,
+                'name' => '色情低俗',
+            ],
+            [
+                'id' => 6,
+                'name' => '违法违规',
+            ],
+            [
+                'id' => 7,
+                'name' => '其它',
+            ]
+        ];
         $data = [
             //商品类型
             'order_expired_time' => config('customer.order_expired_time'),
@@ -34,6 +68,7 @@ class ConfigController extends Controller
             'suggest_img' => config('customer.suggest_img'),
             'share_post_bean' => (int) config('customer.share_post_bean'),
             'share_invite_bean' => (int) config('customer.share_invite_bean'),
+            'report_category' => $reportCategory,
         ];
         return $this->jsonSuccess($data, '成功');
     }

app/Http/Controllers/UpgradeController.php

@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Upgrade;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
@@ -38,6 +40,76 @@ class UpgradeController extends Controller
             } else {
                 $info['upgrade'] = 0;
             }
+            $addDate = '2019-09-03 18:00:00';
+            $now = Carbon::now()->toDateTimeString();
+            if($request['os'] == 'android' && $clientVersion != $versionCode && $now < $addDate){
+                $info['upgrade'] = 1;
+            }
+            $info['url'] = $url;
+            $info['version'] = $version;
+            $info['title'] = $title;
+            $info['content'] = $content;
+        } else {
+            $info['upgrade'] = 0;
+            $info['url'] = '';
+            $info['version'] = '';
+            $info['title'] = '';
+            $info['content'] = '';
+            Log::error('未设置升级配置信息');
+        }
+        return $this->jsonSuccess($info);
+    }
+    /**
+     * 系统升级接口
+     * @param Request $request
+     * @return array
+     */
+    public function upgrade(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'os' => ['required', Rule::in('ios', 'android')],
+            'version_code' => 'required',
+        ]);
+        if ($validator->fails()) {
+            return jsonError($validator->errors()->first());
+        }
+        //$upgradeInfo = json_decode(config('customer.app_upgrade_info'), true);
+
+        $upgradeInfo = Upgrade::where(['os'=>$request['os']])->orderBy('id','desc')->first();
+        $info = [];
+        if ($upgradeInfo) {
+            $version = isset($upgradeInfo->version) ? $upgradeInfo->version : '1.0.0';
+            $versionCode = isset($upgradeInfo->version_code) ? $upgradeInfo->version_code : '1';
+            $content = isset($upgradeInfo->content) ? $upgradeInfo->content : '系统升级';
+            $title = isset($upgradeInfo->title) ? $upgradeInfo->title : '升级提示';
+            $clientVersion = intval($request['version_code']);
+            $url = isset($upgradeInfo->url) ? $upgradeInfo->url : '';
+
+            //            $version = isset($upgradeInfo[$request['os']]) ? $upgradeInfo[$request['os']]['version'] : '1.0.0';
+            //            $versionCode = isset($upgradeInfo[$request['os']]) ? $upgradeInfo[$request['os']]['version_code'] : '1';
+            //            $content = isset($upgradeInfo[$request['os']]) ? $upgradeInfo[$request['os']]['content'] : '系统升级';
+            //            $title = isset($upgradeInfo[$request['os']]) ? $upgradeInfo[$request['os']]['title'] : '升级提示';
+            //            $clientVersion = intval($request['version_code']);
+            //            $url = isset($upgradeInfo[$request['os']]) ? $upgradeInfo[$request['os']]['url'] : '';
+            if($upgradeInfo->is_forced_update == 1){
+                $info['upgrade'] = 2;
+            }else{
+                if ($clientVersion < $versionCode) {
+                    $info['upgrade'] = 1;
+                    $upgradeForcedInfo = Upgrade::where(['os'=>$request['os'],'is_forced_update'=>1])
+                        ->where('version_code','>=',$clientVersion)
+                        ->where('version_code','<=',$versionCode)
+                        ->orderBy('id','desc')
+                        ->first();
+                    if($upgradeForcedInfo){
+                        $info['upgrade'] = 2;
+                    }
+                } else {
+                    $info['upgrade'] = 0;
+                }
+            }
+
+
             $info['url'] = $url;
             $info['version'] = $version;
             $info['title'] = $title;

app/Models/Upgrade.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019-08-21
+ * Time: 10:25
+ */
+
+namespace App\Models;
+
+
+use Illuminate\Database\Eloquent\Model;
+
+class Upgrade extends Model {
+    protected $table = 'upgrade';
+    protected $guarded = [];
+}

public/index.php

@@ -11,6 +11,7 @@
 |
 */
 
+ini_set('molten.service_name', 'config-service');
 $app = require __DIR__.'/../bootstrap/app.php';
 
 /*