Merge branch 'develop'

app/Http/Controllers/UpgradeController.php

@@ -4,6 +4,7 @@ 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;
@@ -39,6 +40,11 @@ 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;