xielin 5 gadi atpakaļ
vecāks
revīzija
800107cdd0
1 mainītis faili ar 9 papildinājumiem un 8 dzēšanām
  1. 9 8
      app/Http/Controllers/UpgradeController.php

+ 9 - 8
app/Http/Controllers/UpgradeController.php

@@ -19,7 +19,7 @@ class UpgradeController extends Controller
     {
         $validator = Validator::make($request->all(), [
             'os' => ['required', Rule::in('ios', 'android')],
-            'version' => 'required',
+            'version_code' => 'required',
         ]);
         if ($validator->fails()) {
             return jsonError($validator->errors()->first());
@@ -28,24 +28,25 @@ class UpgradeController extends Controller
         $info = [];
         if ($upgradeInfo) {
             $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'] : '系统升级';
-            $clientVersion = $request['version'];
+            $title = isset($upgradeInfo[$request['os']]) ? $upgradeInfo[$request['os']]['title'] : '升级提示';
+            $clientVersion = intval($request['version_code']);
             $url = isset($upgradeInfo[$request['os']]) ? $upgradeInfo[$request['os']]['url'] : '';
-            $row = version_compare($version, $clientVersion);
-            if (-1 == $row) {
-                $info['upgrade'] = 0;
-            } elseif (0 == $row) {
-                $info['upgrade'] = 0;
-            } elseif (1 == $row) {
+            if ($clientVersion < $versionCode) {
                 $info['upgrade'] = 1;
+            } else {
+                $info['upgrade'] = 0;
             }
             $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('未设置升级配置信息');
         }