refactor:优化下载模块方法的参数接受方式

Author: build-admin

app/admin/controller/Module.php

@@ -22,8 +22,9 @@ public function initialize(): void
     public function index(): void
     {
         $this->success('', [
-            'sysVersion' => Config::get('buildadmin.version'),
-            'installed'  => Server::installedList(root_path() . 'modules' . DIRECTORY_SEPARATOR),
+            'installed'   => Server::installedList(root_path() . 'modules' . DIRECTORY_SEPARATOR),
+            'sysVersion'  => Config::get('buildadmin.version'),
+            'nuxtVersion' => Server::getNuxtVersion(),
         ]);
     }
 
@@ -41,15 +42,13 @@ public function state(): void
     public function install(): void
     {
         AdminLog::instance()->setTitle(__('Install module'));
-        $uid     = $this->request->get("uid/s", '');
-        $token   = $this->request->get("token/s", '');
-        $orderId = $this->request->get("orderId/d", 0);
+        $uid = $this->request->param("uid/s", '');
         if (!$uid) {
             $this->error(__('Parameter error'));
         }
         $res = [];
         try {
-            $res = Manage::instance($uid)->install($token, $orderId);
+            $res = Manage::instance($uid)->install();
         } catch (Exception $e) {
             $this->error(__($e->getMessage()), $e->getData(), $e->getCode());
         } catch (Throwable $e) {
@@ -117,14 +116,13 @@ public function uninstall(): void
     public function update(): void
     {
         AdminLog::instance()->setTitle(__('Update module'));
-        $uid     = $this->request->get("uid/s", '');
-        $token   = $this->request->get("token/s", '');
-        $orderId = $this->request->get("orderId/d", 0);
+        $uid   = $this->request->param("uid/s", '');
+        $token = $this->request->param("token/s", '');
         if (!$token || !$uid) {
             $this->error(__('Parameter error'));
         }
         try {
-            Manage::instance($uid)->update($token, $orderId);
+            Manage::instance($uid)->update();
         } catch (Exception $e) {
             $this->error(__($e->getMessage()), $e->getData(), $e->getCode());
         } catch (Throwable $e) {

app/admin/library/module/Manage.php

@@ -97,23 +97,27 @@ public function getInstallState()
 
     /**
      * 下载模块文件
-     * @param string $token   官网会员token
-     * @param int    $orderId 订单号
-     * @return string 下载文件路径
+     * @return string 已下载文件路径
      * @throws Throwable
      */
-    public function download(string $token, int $orderId): string
+    public function download(): string
     {
+        $token   = request()->param("token/s");
+        $version = request()->param('version/s');
+        $orderId = request()->param("orderId/d");
+
         if (!$orderId) {
             throw new Exception('Order not found');
         }
+
         // 下载 - 系统版本号要求、已安装模块的互斥和依赖检测
         $zipFile = Server::download($this->uid, $this->installDir, [
-            'sysVersion'    => Config::get('buildadmin.version'),
+            'version'       => $version,
+            'orderId'       => $orderId,
             'nuxtVersion'   => Server::getNuxtVersion(),
-            'ba-user-token' => $token,
-            'order_id'      => $orderId,
+            'sysVersion'    => Config::get('buildadmin.version'),
             'installed'     => Server::getInstalledIds($this->installDir),
+            'ba-user-token' => $token,
         ]);
 
         // 删除旧版本代码
@@ -236,14 +240,14 @@ public function upload(string $token, string $file): array
      * 更新
      * @throws Throwable
      */
-    public function update(string $token, int $orderId): void
+    public function update(): void
     {
         $state = $this->getInstallState();
         if ($state != self::DISABLE) {
             throw new Exception('Please disable the module before updating');
         }
 
-        $this->download($token, $orderId);
+        $this->download();
 
         // 标记需要执行更新脚本，并在安装请求执行（当前请求未自动加载到新文件不方便执行）
         $info           = $this->getInfo();
@@ -253,20 +257,18 @@ public function update(string $token, int $orderId): void
 
     /**
      * 安装模块
-     * @param string $token   用户token
-     * @param int    $orderId 订单号
      * @return array 模块基本信息
      * @throws Throwable
      */
-    public function install(string $token, int $orderId): array
+    public function install(): array
     {
         $state = $this->getInstallState();
         if ($state == self::INSTALLED || $state == self::DIRECTORY_OCCUPIED || $state == self::DISABLE) {
             throw new Exception('Module already exists');
         }
 
         if ($state == self::UNINSTALLED) {
-            $this->download($token, $orderId);
+            $this->download();
         }
 
         // 导入sql