diff --git a/admin/src/app/views/index/store.vue b/admin/src/app/views/index/store.vue index 342d445ee..ed6914df9 100644 --- a/admin/src/app/views/index/store.vue +++ b/admin/src/app/views/index/store.vue @@ -613,9 +613,8 @@ const getInstallTask = (first: boolean = true) => { } else { if (!first) { installStep.value = 3 - userStore.clearRouters() localListFn() - userStore.getAppList() + userStore.clearRouters() notificationEl.close() } } @@ -733,7 +732,7 @@ const uninstallAddonFn = (key: string) => { if (data.is_pass) { uninstallAddon({ addon: key }).then(res => { localListFn() - userStore.getAppList() + userStore.clearRouters() loading.value = false }).catch(() => { loading.value = false diff --git a/admin/src/components/upload-file/index.vue b/admin/src/components/upload-file/index.vue index 67ffb041c..e6fd11897 100644 --- a/admin/src/components/upload-file/index.vue +++ b/admin/src/components/upload-file/index.vue @@ -24,9 +24,9 @@ const prop = defineProps({ type: String, default: 'sys/document/document' }, - accept:{ + accept: { type: String, - default: '.doc,.docx,.xml,.txt,.pem,.zip,.rar,.7z,.crt' + default: '.doc,.docx,.xml,.txt,.pem,.zip,.rar,.7z,.crt,.key' } }) diff --git a/niucloud/app/service/core/addon/CoreAddonCloudService.php b/niucloud/app/service/core/addon/CoreAddonCloudService.php index ff77e152a..93467a58f 100644 --- a/niucloud/app/service/core/addon/CoreAddonCloudService.php +++ b/niucloud/app/service/core/addon/CoreAddonCloudService.php @@ -13,6 +13,7 @@ namespace app\service\core\addon; use app\model\addon\AddonDevelop; use app\service\core\niucloud\CoreCloudBaseService; +use app\service\core\niucloud\CoreModuleService; use core\exception\CommonException; use core\util\niucloud\CloudService; use GuzzleHttp\Client; @@ -71,7 +72,7 @@ class CoreAddonCloudService extends CoreCloudBaseService 'authorize_code' => $this->auth_code, 'timestamp' => $install_task['timestamp'] ]; - (new CloudService())->httpPost('cloud/build?' . http_build_query($query), [ + $response = (new CloudService())->httpPost('cloud/build?' . http_build_query($query), [ 'multipart' => [ [ 'name' => 'file', @@ -80,6 +81,7 @@ class CoreAddonCloudService extends CoreCloudBaseService ] ], ]); + if (isset($response['code']) && $response['code'] == 0) throw new CommonException($response['msg']); // 删除临时文件 del_target_dir($temp_dir, true); @@ -212,7 +214,8 @@ class CoreAddonCloudService extends CoreCloudBaseService $query = [ 'authorize_code' => $this->auth_code, 'addon_name' => $addon, - 'addon_version' => $version + 'addon_version' => $version, +// 'token' => (new CoreModuleService())->getActionToken('download', ['app_key' => $addon, 'version' => $version]) ]; // 获取文件大小 diff --git a/niucloud/app/service/core/addon/CoreAddonInstallService.php b/niucloud/app/service/core/addon/CoreAddonInstallService.php index da6052843..048511f5a 100644 --- a/niucloud/app/service/core/addon/CoreAddonInstallService.php +++ b/niucloud/app/service/core/addon/CoreAddonInstallService.php @@ -157,7 +157,7 @@ class CoreAddonInstallService extends CoreAddonBaseService // 是否通过校验 $data['is_pass'] = !in_array(false, $check_res); - Cache::set($this->cache_key . '_install_check', $data['is_pass'], 120); + Cache::set($this->cache_key . '_install_check', $data['is_pass']); return $data; }