github/niucloud
1
0
Fork 0
mirror of https://gitee.com/niucloud-team/niucloud.git synced 2025-12-10 17:22:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

up

Browse Source
This commit is contained in:
全栈小学生 2025-11-14 11:39:40 +08:00
parent 81bb4682d5
commit cf293a1dec
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/app/components/upgrade/index.vue
View File

@ -516,7 +516,7 @@ const open = (addonKey: string = '', callback = null) => {
active.value = 'upgrade' active.value = 'upgrade'
if (callback) callback() if (callback) callback()
} else { } else {
if (addonKey && frameworkVersion.value != newFrameworkVersion.value) { if (addonKey && addonKey.indexOf('niucloud-admin') == -1 && frameworkVersion.value != newFrameworkVersion.value) {
ElMessage({ message: '存在新版本框架，请先升级框架', type: 'error' }) ElMessage({ message: '存在新版本框架，请先升级框架', type: 'error' })
if (callback) callback() if (callback) callback()
return return

7
admin/src/app/views/index/store.vue
View File

@ -53,7 +53,9 @@
<div class="flex items-center flex-1 w-0 justify-end"> <div class="flex items-center flex-1 w-0 justify-end">
<el-button @click="oneClickRepair"><i class="iconfont iconyijianxiufu mr-[5px]" ></i>一键修复</el-button> <el-button @click="oneClickRepair"><i class="iconfont iconyijianxiufu mr-[5px]" ></i>一键修复</el-button>
<el-button type="primary" v-show="activeName == 'uninstalled'" @click="batchInstall"><i class="iconfont iconanzhuang1 mr-[5px]"></i>安装<span v-if="batchUpgradeApp.length">({{ batchUpgradeApp.length }})</span></el-button> <el-button type="primary" v-show="activeName == 'uninstalled'" @click="batchInstall"><i class="iconfont iconanzhuang1 mr-[5px]"></i>安装<span v-if="batchUpgradeApp.length">({{ batchUpgradeApp.length }})</span></el-button>
<el-button type="primary" v-show="activeName == 'recentlyUpdated'" @click="batchUpgrade"><i class="iconfont iconyijianshengji mr-[5px]"></i>一键升级<span v-if="batchUpgradeApp.length">({{ batchUpgradeApp.length }})</span></el-button> <el-button type="primary" v-show="activeName == 'recentlyUpdated' || (frameworkVersion != frameworkNewVersion && activeName != 'uninstalled')" @click="batchUpgrade">
<i class="iconfont iconyijianshengji mr-[5px]"></i>一键升级<span v-if="batchUpgradeApp.length">({{ batchUpgradeApp.length }})</span>
</el-button>
<el-checkbox label="全选" :model-value="localList[activeName].length && localList[activeName].length == batchUpgradeApp.length" @change="appKeyAllSelect" v-show="activeName == 'uninstalled' || activeName == 'recentlyUpdated'" value="Value A" class="ml-[12px]"/> <el-checkbox label="全选" :model-value="localList[activeName].length && localList[activeName].length == batchUpgradeApp.length" @change="appKeyAllSelect" v-show="activeName == 'uninstalled' || activeName == 'recentlyUpdated'" value="Value A" class="ml-[12px]"/>
</div> </div>
</div> </div>
@ -592,6 +594,7 @@ import useUserStore from '@/stores/modules/user'
import Upgrade from '@/app/components/upgrade/index.vue' import Upgrade from '@/app/components/upgrade/index.vue'
import CloudBuild from '@/app/components/cloud-build/index.vue' import CloudBuild from '@/app/components/cloud-build/index.vue'
import UpgradeLog from '@/app/components/upgrade-log/index.vue' import UpgradeLog from '@/app/components/upgrade-log/index.vue'
import {deepClone} from "@/utils/common";
const tableRef = ref(null) const tableRef = ref(null)
const router = useRouter() const router = useRouter()
@ -1271,7 +1274,7 @@ const appKeySingleSelect = (event: any, key: string) => {
} }
const batchUpgrade = () => { const batchUpgrade = () => {
const appKeys = batchUpgradeApp.value const appKeys = deepClone(batchUpgradeApp.value)
if (frameworkVersion.value != frameworkNewVersion.value) { if (frameworkVersion.value != frameworkNewVersion.value) {
appKeys.unshift('niucloud-admin') appKeys.unshift('niucloud-admin')
} }

6
niucloud/app/adminapi/route/upgrade.php
View File

@ -30,13 +30,13 @@ Route::group('', function () {
Route::post('upgrade/clear', 'addon.Upgrade/clearUpgradeTask'); Route::post('upgrade/clear', 'addon.Upgrade/clearUpgradeTask');
// 升级环境检测 // 升级环境检测
Route::get('upgrade/check/[:addon]', 'addon.Upgrade/upgradePreCheck')->pattern(['addon' => '[\w|\,]+']); Route::get('upgrade/check/[:addon]', 'addon.Upgrade/upgradePreCheck')->pattern(['addon' => '[\w,-]+']);
// 升级 // 升级
Route::post('upgrade/[:addon]', 'addon.Upgrade/upgrade')->pattern(['addon' => '[\w|\,]+']); Route::post('upgrade/[:addon]', 'addon.Upgrade/upgrade')->pattern(['addon' => '[\w,-]+']);
// 获取升级内容 // 获取升级内容
Route::get('upgrade/[:addon]', 'addon.Upgrade/getUpgradeContent')->pattern(['addon' => '[\w|\,]+']); Route::get('upgrade/[:addon]', 'addon.Upgrade/getUpgradeContent')->pattern(['addon' => '[\w,-]+']);
Route::post('upgrade/operate/:operate', 'addon.Upgrade/operate'); Route::post('upgrade/operate/:operate', 'addon.Upgrade/operate');

21
niucloud/app/service/admin/upgrade/UpgradeService.php
View File

@ -863,15 +863,22 @@ class UpgradeService extends BaseAdminService
} else { } else {
$addons = array_filter(explode(',', $addon)); $addons = array_filter(explode(',', $addon));
foreach ($addons as $key) { foreach ($addons as $key) {
$info = ( new Addon() )->where([ [ 'key', '=', $key ] ])->field('version,type')->find(); if ($key != AddonDict::FRAMEWORK_KEY) {
$upgrade[ 'app_key' ] = $key; $info = ( new Addon() )->where([ [ 'key', '=', $key ] ])->field('version,type')->find();
$upgrade[ 'version' ] = $info['version']; $upgrade[ 'app_key' ] = $key;
if ($info['type'] == 'app') { $upgrade[ 'version' ] = $info['version'];
array_unshift($apps, $upgrade); if ($info['type'] == 'app') {
} else { array_unshift($apps, $upgrade);
array_push($apps, $upgrade); } else {
array_push($apps, $upgrade);
}
} }
} }
if (in_array(AddonDict::FRAMEWORK_KEY, $addons)) {
$upgrade[ 'app_key' ] = AddonDict::FRAMEWORK_KEY;
$upgrade[ 'version' ] = config('version.version');
array_unshift($apps, $upgrade);
}
} }
foreach ($apps as $item) { foreach ($apps as $item) {