From 460ebeb8c5fb0494e0d292704c2243ce837cbdb1 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 29 Jun 2022 13:40:26 +0800
Subject: [PATCH] no message

---
 app/Http/Controllers/Api/SystemController.php | 30 +++++++++++++++++++
 app/Http/Controllers/IndexController.php      | 18 ++---------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index ccbc5568f..f576a8937 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
 
 use App\Models\User;
 use App\Module\Base;
+use Arr;
 use Guanguans\Notify\Factory;
 use Guanguans\Notify\Messages\EmailMessage;
 use Request;
@@ -714,4 +715,33 @@ class SystemController extends AbstractController
             }
         }
     }
+
+    /**
+     * @api {get} api/system/version          18. 获取版本号
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName version
+     *
+     * @apiSuccess {String} version
+     * @apiSuccess {String} publish
+     */
+    public function version()
+    {
+        $url = url('');
+        $package = Base::getPackage();
+        $array = [
+            'version' => Base::getVersion(),
+            'publish' => Arr::get($package, 'app.0.publish'),
+        ];
+        if (is_array($package['app'])) {
+            foreach ($package['app'] as $item) {
+                $urls = $item['urls'] && is_array($item['urls']) ? $item['urls'] : $item['url'];
+                if (is_array($item['publish']) && Base::hostContrast($url, $urls)) {
+                    $array['publish'] = $item['publish'];
+                }
+            }
+        }
+        return $array;
+    }
 }
diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php
index c3f53ba3b..9ee33f0ef 100755
--- a/app/Http/Controllers/IndexController.php
+++ b/app/Http/Controllers/IndexController.php
@@ -106,25 +106,11 @@ class IndexController extends InvokeController
 
     /**
      * 获取版本号
-     * @return array
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function version()
     {
-        $url = url('');
-        $package = Base::getPackage();
-        $array = [
-            'version' => Base::getVersion(),
-            'publish' => Arr::get($package, 'app.0.publish'),
-        ];
-        if (is_array($package['app'])) {
-            foreach ($package['app'] as $item) {
-                $urls = $item['urls'] && is_array($item['urls']) ? $item['urls'] : $item['url'];
-                if (is_array($item['publish']) && Base::hostContrast($url, $urls)) {
-                    $array['publish'] = $item['publish'];
-                }
-            }
-        }
-        return $array;
+        return Redirect::to(Base::fillUrl('api/system/version'), 301);
     }
 
     /**