Merge branch 'master' into release

app/Http/Controllers/UpgradeController.php

@@ -66,6 +66,7 @@ class UpgradeController extends Controller
      */
     public function upgrade(Request $request)
     {
+        Log::debug('系统升级接口'.json_encode($request->all()));
         $validator = Validator::make($request->all(), [
             'os' => ['required', Rule::in('ios', 'android')],
             'version_code' => 'required',
@@ -73,7 +74,6 @@ class UpgradeController extends Controller
         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 = [];
@@ -84,13 +84,6 @@ class UpgradeController extends Controller
             $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{
@@ -109,7 +102,6 @@ class UpgradeController extends Controller
                 }
             }
 
-
             $info['url'] = $url;
             $info['version'] = $version;
             $info['title'] = $title;

routes/api.php

@@ -17,7 +17,7 @@ $api->version('v1', [
     'namespace' => 'App\Http\Controllers',
 ], function ($api) {
 //升级接口
-    $api->get('upgrade', 'UpgradeController@index');
+    $api->get('upgrade', 'UpgradeController@upgrade');
     //登录
     $api->group(['middleware' => 'chxq_jwt_auth'], function ($api) {
         $api->post('upload', 'UploadController@uploadImage');