feat:后台安装模块时支持选择安装版本

Author: build-admin

app/admin/controller/Module.php

@@ -42,13 +42,14 @@ public function state(): void
     public function install(): void
     {
         AdminLog::instance()->setTitle(__('Install module'));
-        $uid = $this->request->param("uid/s", '');
+        $uid    = $this->request->param("uid/s", '');
+        $update = $this->request->param("update/b", false);
         if (!$uid) {
             $this->error(__('Parameter error'));
         }
         $res = [];
         try {
-            $res = Manage::instance($uid)->install();
+            $res = Manage::instance($uid)->install($update);
         } catch (Exception $e) {
             $this->error(__($e->getMessage()), $e->getData(), $e->getCode());
         } catch (Throwable $e) {
@@ -113,24 +114,6 @@ public function uninstall(): void
         $this->success();
     }
 
-    public function update(): void
-    {
-        AdminLog::instance()->setTitle(__('Update module'));
-        $uid   = $this->request->param("uid/s", '');
-        $token = $this->request->param("token/s", '');
-        if (!$token || !$uid) {
-            $this->error(__('Parameter error'));
-        }
-        try {
-            Manage::instance($uid)->update();
-        } catch (Exception $e) {
-            $this->error(__($e->getMessage()), $e->getData(), $e->getCode());
-        } catch (Throwable $e) {
-            $this->error(__($e->getMessage()));
-        }
-        $this->success();
-    }
-
     public function upload(): void
     {
         AdminLog::instance()->setTitle(__('Upload install module'));

app/admin/library/module/Manage.php

@@ -173,22 +173,6 @@ public function upload(string $token, string $file): array
             throw new Exception('Basic configuration of the Module is incomplete');
         }
 
-        // 安装预检 - 系统版本号要求、已安装模块的互斥和依赖检测
-        try {
-            Server::installPreCheck([
-                'uid'           => $info['uid'],
-                'sysVersion'    => Config::get('buildadmin.version'),
-                'nuxtVersion'   => Server::getNuxtVersion(),
-                'moduleVersion' => $info['version'],
-                'ba-user-token' => $token,
-                'installed'     => Server::getInstalledIds($this->installDir),
-                'server'        => 1,
-            ]);
-        } catch (Throwable $e) {
-            Filesystem::delDir($copyToDir);
-            throw $e;
-        }
-
         $this->uid        = $info['uid'];
         $this->modulesDir = $this->installDir . $info['uid'] . DIRECTORY_SEPARATOR;
 
@@ -202,7 +186,13 @@ public function upload(string $token, string $file): array
                 }
                 $nextVersion = implode('.', $versions);
                 $upgrade     = Version::compare($nextVersion, $info['version']);
-                if (!$upgrade) {
+                if ($upgrade) {
+                    // 检查模块是否已禁用
+                    if (!in_array($oldInfo['state'], [self::UNINSTALLED, self::WAIT_INSTALL, self::DISABLE])) {
+                        Filesystem::delDir($copyToDir);
+                        throw new Exception('Please disable the module before updating');
+                    }
+                } else {
                     Filesystem::delDir($copyToDir);
                     // 模块已经存在
                     throw new Exception('Module already exists');
@@ -216,9 +206,26 @@ public function upload(string $token, string $file): array
             }
         }
 
+        // 安装预检 - 系统版本号要求、已安装模块的互斥和依赖检测
+        try {
+            Server::installPreCheck([
+                'uid'           => $info['uid'],
+                'version'       => $info['version'],
+                'sysVersion'    => Config::get('buildadmin.version'),
+                'nuxtVersion'   => Server::getNuxtVersion(),
+                'moduleVersion' => $info['version'],
+                'ba-user-token' => $token,
+                'installed'     => Server::getInstalledIds($this->installDir),
+                'server'        => 1,
+            ]);
+        } catch (Throwable $e) {
+            Filesystem::delDir($copyToDir);
+            throw $e;
+        }
+
         $newInfo = ['state' => self::WAIT_INSTALL];
         if ($upgrade) {
-            $newInfo['update'] = 1;
+            $info['update'] = 1;
 
             // 清理旧版本代码
             Filesystem::delDir($this->modulesDir);
@@ -236,54 +243,52 @@ public function upload(string $token, string $file): array
         return $info;
     }
 
-    /**
-     * 更新
-     * @throws Throwable
-     */
-    public function update(): void
-    {
-        $state = $this->getInstallState();
-        if ($state != self::DISABLE) {
-            throw new Exception('Please disable the module before updating');
-        }
-
-        $this->download();
-
-        // 标记需要执行更新脚本，并在安装请求执行（当前请求未自动加载到新文件不方便执行）
-        $info           = $this->getInfo();
-        $info['update'] = 1;
-        $this->setInfo([], $info);
-    }
-
     /**
      * 安装模块
      * @return array 模块基本信息
      * @throws Throwable
      */
-    public function install(): array
+    public function install(bool $update): 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();
+        if ($update) {
+            if (!in_array($state, [self::UNINSTALLED, self::WAIT_INSTALL, self::DISABLE])) {
+                throw new Exception('Please disable the module before updating');
+            }
+
+            /**
+             * self::WAIT_INSTALL=待安装
+             * 即本地上传文件进行升级的安装流程，文件上传成功后将被标记为待安装，免去此处的下载
+             */
+            if ($state == self::UNINSTALLED || $state != self::WAIT_INSTALL) {
+                $this->download();
+            }
+        } else {
+            if ($state == self::INSTALLED || $state == self::DIRECTORY_OCCUPIED || $state == self::DISABLE) {
+                throw new Exception('Module already exists');
+            }
+
+            if ($state == self::UNINSTALLED) {
+                $this->download();
+            }
         }
 
         // 导入sql
         Server::importSql($this->modulesDir);
 
         // 如果是更新，先执行更新脚本
         $info = $this->getInfo();
-        if (isset($info['update']) && $info['update']) {
+        if ($update) {
+            $info['update'] = 1;
             Server::execEvent($this->uid, 'update');
-            unset($info['update']);
-            $this->setInfo([], $info);
         }
 
-        // 执行安装脚本
-        Server::execEvent($this->uid, 'install');
+        // 执行安装脚本 - 排除冲突处理时会重复提交至此的请求
+        $extend = request()->post('extend/a', []);
+        if (!isset($extend['conflictHandle'])) {
+            Server::execEvent($this->uid, 'install');
+        }
 
         // 启用插件
         $this->enable('install');
@@ -572,9 +577,6 @@ public function disable(): array
         ]);
 
         if ($update) {
-            $token = request()->post("token/s", '');
-            $order = request()->post("order/d", 0);
-            $this->update($token, $order);
             throw new Exception('update', -3, [
                 'uid' => $this->uid,
             ]);

web/src/api/backend/module.ts

@@ -89,6 +89,24 @@ export function payCheck(sn: string) {
     )
 }
 
+/**
+ * 获取模块的可安装版本列表
+ */
+export function preDownload(data: anyObj) {
+    const baAccount = useBaAccount()
+    const siteConfig = useSiteConfig()
+    return createAxios(
+        {
+            url: siteConfig.apiUrl + storeUrl + 'preDownload',
+            method: 'POST',
+            data,
+        },
+        {
+            anotherToken: baAccount.getToken('auth'),
+        }
+    )
+}
+
 export function getInstallState(uid: string) {
     return createAxios({
         url: moduleControllerUrl + 'state',
@@ -99,19 +117,19 @@ export function getInstallState(uid: string) {
     })
 }
 
-export function postInstallModule(uid: string, orderId: number, extend: anyObj = {}) {
+export function postInstallModule(uid: string, orderId: number, version: string, update: boolean, extend: anyObj = {}) {
     const baAccount = useBaAccount()
     return createAxios(
         {
             url: moduleControllerUrl + 'install',
-            method: 'post',
-            params: {
-                uid: uid,
-                orderId: orderId,
-                token: baAccount.getToken('auth'),
-            },
+            method: 'POST',
             data: {
-                extend: extend,
+                uid,
+                update,
+                version,
+                orderId,
+                token: baAccount.getToken('auth'),
+                extend,
             },
             timeout: 3000 * 10,
         },
@@ -121,23 +139,6 @@ export function postInstallModule(uid: string, orderId: number, extend: anyObj =
     )
 }
 
-export function postUpdate(uid: string, orderId: number, extend: anyObj = {}) {
-    const baAccount = useBaAccount()
-    return createAxios({
-        url: moduleControllerUrl + 'update',
-        method: 'POST',
-        params: {
-            uid,
-            orderId: orderId,
-            token: baAccount.getToken('auth'),
-        },
-        data: {
-            extend: extend,
-        },
-        timeout: 3000 * 10,
-    })
-}
-
 export function postUninstall(uid: string) {
     return createAxios(
         {

web/src/lang/backend/en/module.ts

@@ -2,6 +2,7 @@ export default {
     'stateTitle init': 'Module installer initialization...',
     'stateTitle download': 'Downloading module...',
     'stateTitle install': 'Installing module...',
+    'stateTitle getInstallableVersion': 'Get installable version...',
     'env require': 'Composer',
     'env require-dev': 'Composer-dev',
     'env dependencies': 'NPM',
@@ -89,8 +90,7 @@ export default {
     'You need to disable this module before updating Do you want to disable it now?':
         'You need to disable this module before updating. Do you want to disable it now?',
     'Disable and update': 'Disable and update',
-    'No module purchase order was found within the expiration date':
-        'No module purchase order was found within the expiration date. Do you want to purchase the current module now?',
+    'No module purchase order was found': 'No module purchase order was found. Do you want to purchase the current module now?',
     // installConflict
     'new file': 'new file',
     'Existing files': 'Existing files',
@@ -135,6 +135,7 @@ export default {
         'Installation cancelled because the directory required by the module is occupied!',
     'Installation complete': 'Installation complete',
     'A conflict is found Please handle it manually': 'A conflict is found. Please handle it manually',
+    'Select Version': 'Select install version',
     'Wait for dependent installation': 'Wait for dependent installation',
     'The operation succeeds Please clear the system cache and refresh the browser ~':
         'The operation succeeds. Please clear the system cache and refresh the browser ~',
@@ -147,4 +148,15 @@ export default {
         'Before successfully restarting the service, you can find the button to manually restart the service from the button group on the right side of the top bar.',
     'Manual restart': 'Manual restart',
     'Restart Now': 'Restart Now',
+    // 选择安装版本
+    'Available system version': 'Available system version',
+    Description: 'Description',
+    Version: 'Version',
+    'Current installed version': 'Current installed version',
+    'Insufficient system version': 'Insufficient system version',
+    'Click to install': 'Click to install',
+    'Versions released beyond the authorization period': 'Versions released beyond the authorization period',
+    Renewal: 'Renewal',
+    'Order expiration time':
+        'The expiration time of the current order authorization is {expiration_time}, and the release time of this version is {create_time}',
 }

web/src/lang/backend/zh-cn/module.ts

@@ -2,6 +2,7 @@ export default {
     'stateTitle init': '模块安装器初始化...',
     'stateTitle download': '正在下载模块...',
     'stateTitle install': '正在安装模块...',
+    'stateTitle getInstallableVersion': '正在获取模块版本列表...',
     'env require': '后端依赖（composer）',
     'env require-dev': '后端开发环境依赖（composer）',
     'env dependencies': '前端依赖（NPM）',
@@ -85,7 +86,7 @@ export default {
     'There are no more works': '没有更多作品了',
     'You need to disable this module before updating Do you want to disable it now?': '更新前需要先禁用该模块，立即禁用？',
     'Disable and update': '禁用并更新',
-    'No module purchase order was found within the expiration date': '没有找到在有效期以内的模块购买订单，是否立即购买当前模块？',
+    'No module purchase order was found': '没有找到有效的模块购买订单，是否立即购买当前模块？',
     // installConflict
     'new file': '新文件',
     'Existing files': '已有文件',
@@ -127,6 +128,7 @@ export default {
     'Installation cancelled because the directory required by the module is occupied!': '安装取消，因为模块所需目录被占用！',
     'Installation complete': '安装完成',
     'A conflict is found Please handle it manually': '发现冲突，请手动处理',
+    'Select Version': '选择安装版本',
     'Wait for dependent installation': '等待依赖安装',
     'The operation succeeds Please clear the system cache and refresh the browser ~': '操作成功，请清理系统缓存并刷新浏览器~',
     'Deal with conflict': '处理冲突',
@@ -137,4 +139,14 @@ export default {
     'Restart Vite hot server tips': '在完成服务重启之前，您还可以随时从顶栏右侧的按钮组中找到手动重启服务的按钮。',
     'Manual restart': '手动重启',
     'Restart Now': '立即重启',
+    // 选择安装版本
+    'Available system version': '可用系统版本',
+    Description: '描述',
+    Version: '版本',
+    'Current installed version': '当前安装版本',
+    'Insufficient system version': '系统版本不足',
+    'Click to install': '点击安装',
+    'Versions released beyond the authorization period': '授权期限以外发布的版本',
+    Renewal: '续费',
+    'Order expiration time': '当前订单授权过期时间为 {expiration_time}，此版本发布时间为 {create_time}',
 }

web/src/views/backend/module/components/buy.vue

@@ -55,7 +55,7 @@
                             <el-button
                                 v-else
                                 :loading="state.loading.common"
-                                @click="onInstall(state.buy.info.uid, state.buy.info.id)"
+                                @click="onPreInstallModule(state.buy.info.uid, state.buy.info.id, true)"
                                 v-blur
                                 type="warning"
                             >
@@ -70,11 +70,11 @@
 </template>
 
 <script setup lang="ts">
+import { isEmpty } from 'lodash-es'
+import { useI18n } from 'vue-i18n'
+import { currency, onPay, onPreInstallModule, specificUserName } from '../index'
 import { state } from '../store'
-import { onPay, currency, onInstall, specificUserName } from '../index'
 import { useBaAccount } from '/@/stores/baAccount'
-import { useI18n } from 'vue-i18n'
-import { isEmpty } from 'lodash-es'
 
 const { t } = useI18n()
 const baAccount = useBaAccount()