Merge branch 'develop'

app/Http/Controllers/UpgradeController.php

@@ -28,7 +28,7 @@ class UpgradeController extends Controller {
             'os' => ['required', Rule::in('ios','android')],
             'version' => 'required|string',
             'version_code' => 'required|integer',
-            'url' => 'required|url',
+            'url' => 'required_if:os,android|url',
             'title' => 'max:80',
             //'content' => 'min:20',
             'is_forced_update' => [Rule::in([0, 1])],

app/Repositories/UpgradeRepository.php

@@ -10,8 +10,10 @@ namespace App\Repositories;
 
 
 use App\Models\Upgrade;
+use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\DB;
 use Dingo\Api\Http\Response;
+use Illuminate\Support\Facades\Log;
 
 class UpgradeRepository {
     public function __construct(Upgrade $upgrade) {
@@ -43,7 +45,7 @@ class UpgradeRepository {
             'os' => $request['os'],
             'version' => $request['version'],
             'version_code' => $request['version_code'],
-            'url' => $request['url'],
+            'url' => $request['url']??'',
             'title' => $request['title'],
             'content' => $request['content'],
             'is_forced_update' => $request['is_forced_update'],