feat: 版本状态看板 — 检查更新时展示全量服务对比表格
- Dockerfile.tenant/ops: 注入 SERVICE_VERSION ARG，设置 com.xuqm.version 标签 - Jenkinsfile: 移除手动 IMAGE_TAG；自动递增语义版本；构建后更新 versions.json；commit VERSION 文件 - SecurityCenterView: 点击「检查更新」后始终展示全量服务当前版本 vs 云端版本对比表格（不再仅 hasUpdate 时显示） Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
这个提交包含在：
XuqmGroup
父节点
b31bf0ce45
当前提交
4c6be2c489
@ -26,6 +26,10 @@ RUN cd ops-platform && \
|
||||
|
||||
FROM --platform=linux/amd64 nginx:1.27-alpine
|
||||
|
||||
ARG SERVICE_VERSION=0.0.0
|
||||
LABEL com.xuqm.version="${SERVICE_VERSION}"
|
||||
LABEL com.xuqm.service="ops-web"
|
||||
|
||||
COPY nginx/ops.conf /etc/nginx/conf.d/default.conf
|
||||
COPY --from=build /workspace/ops-platform/dist /usr/share/nginx/html
|
||||
|
||||
|
||||
@ -30,6 +30,10 @@ RUN cd docs-site && yarn build
|
||||
|
||||
FROM --platform=linux/amd64 nginx:1.27-alpine
|
||||
|
||||
ARG SERVICE_VERSION=0.0.0
|
||||
LABEL com.xuqm.version="${SERVICE_VERSION}"
|
||||
LABEL com.xuqm.service="tenant-web"
|
||||
|
||||
COPY nginx/tenant.conf /etc/nginx/conf.d/default.conf
|
||||
COPY --from=build /workspace/tenant-platform/dist /usr/share/nginx/html/tenant
|
||||
COPY --from=build /workspace/docs-site/docs/.vitepress/dist /usr/share/nginx/html/docs
|
||||
|
||||
68
Jenkinsfile
vendored
68
Jenkinsfile
vendored
@ -3,7 +3,6 @@ pipeline {
|
||||
|
||||
parameters {
|
||||
choice(name: 'APP', choices: ['tenant-platform', 'ops-platform'], description: '要构建的 Web 应用')
|
||||
string(name: 'IMAGE_TAG', defaultValue: 'latest', description: '镜像 Tag')
|
||||
booleanParam(name: 'DEPLOY', defaultValue: true, description: '构建后是否自动部署')
|
||||
booleanParam(name: 'NO_CACHE', defaultValue: false, description: '禁用 Docker 构建缓存（缓存错误时使用）')
|
||||
}
|
||||
@ -15,6 +14,7 @@ pipeline {
|
||||
PROD_HOST = '106.54.23.149'
|
||||
PROD_USER = 'ubuntu'
|
||||
COMPOSE_FILE = '/opt/xuqm/deploy/compose.production.yaml'
|
||||
VERSIONS_FILE = '/opt/xuqm/deploy/versions.json'
|
||||
DOCKER_BUILDKIT = '1'
|
||||
}
|
||||
|
||||
@ -44,17 +44,28 @@ pipeline {
|
||||
env.IMAGE_NAME = 'tenant-web'
|
||||
env.DOCKERFILE = 'Dockerfile.tenant'
|
||||
env.DEPLOY_SERVICE = 'tenant-web'
|
||||
env.VERSION_FILE = 'VERSION.tenant-web'
|
||||
env.BUILD_ARGS = '--build-arg TENANT_APP_BASE=/ --build-arg TENANT_API_BASE_URL=/api'
|
||||
break
|
||||
case 'ops-platform':
|
||||
env.IMAGE_NAME = 'ops-web'
|
||||
env.DOCKERFILE = 'Dockerfile.ops'
|
||||
env.DEPLOY_SERVICE = 'ops-web'
|
||||
env.VERSION_FILE = 'VERSION.ops-web'
|
||||
env.BUILD_ARGS = '--build-arg OPS_APP_BASE=/ --build-arg OPS_API_BASE_URL=/api'
|
||||
break
|
||||
default:
|
||||
error("Unsupported APP: ${params.APP}")
|
||||
}
|
||||
|
||||
// 自动递增版本号（与后端 Jenkinsfile 保持一致）
|
||||
def vf = env.VERSION_FILE
|
||||
def current = fileExists(vf) ? readFile(vf).trim() : '1.0.0'
|
||||
def parts = current.tokenize('.')
|
||||
while (parts.size() < 3) parts.add('0')
|
||||
env.SERVICE_VERSION = "${parts[0]}.${parts[1]}.${parts[2].toInteger() + 1}"
|
||||
writeFile file: vf, text: env.SERVICE_VERSION
|
||||
echo "${env.IMAGE_NAME}: ${current} → ${env.SERVICE_VERSION}"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -63,20 +74,23 @@ pipeline {
|
||||
steps {
|
||||
withCredentials([string(credentialsId: 'ACR_PASSWORD', variable: 'ACR_PASS')]) {
|
||||
script {
|
||||
def fullImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:${params.IMAGE_TAG}"
|
||||
def versionedImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:${env.SERVICE_VERSION}"
|
||||
def latestImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:latest"
|
||||
def cacheArgs = params.NO_CACHE
|
||||
? '--no-cache'
|
||||
: "--build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ${fullImage}"
|
||||
: "--build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ${latestImage}"
|
||||
def gitCommit = env.GIT_COMMIT ?: 'unknown'
|
||||
bat """
|
||||
docker login ${env.ACR_REGISTRY} -u ${env.ACR_USERNAME} -p %ACR_PASS%
|
||||
if %errorlevel% neq 0 exit /b 1
|
||||
docker pull --platform=linux/amd64 ${fullImage} || echo Pull failed, will build fresh
|
||||
docker build --platform=linux/amd64 -f ${env.DOCKERFILE} ${env.BUILD_ARGS} --build-arg GIT_COMMIT=${gitCommit} ${cacheArgs} -t ${fullImage} .
|
||||
docker pull --platform=linux/amd64 ${latestImage} || echo Pull failed, will build fresh
|
||||
docker build --platform=linux/amd64 -f ${env.DOCKERFILE} ${env.BUILD_ARGS} --build-arg GIT_COMMIT=${gitCommit} --build-arg SERVICE_VERSION=${env.SERVICE_VERSION} ${cacheArgs} -t ${versionedImage} -t ${latestImage} .
|
||||
if %errorlevel% neq 0 exit /b 1
|
||||
docker push ${fullImage}
|
||||
docker push ${versionedImage}
|
||||
if %errorlevel% neq 0 exit /b 1
|
||||
docker rmi ${fullImage}
|
||||
docker push ${latestImage}
|
||||
if %errorlevel% neq 0 exit /b 1
|
||||
docker rmi ${versionedImage} ${latestImage}
|
||||
exit /b 0
|
||||
"""
|
||||
}
|
||||
@ -90,21 +104,55 @@ pipeline {
|
||||
lock('prod-deploy') {
|
||||
withCredentials([sshUserPrivateKey(credentialsId: 'PROD_SSH_KEY', keyFileVariable: 'SSH_KEY')]) {
|
||||
script {
|
||||
def fullImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:${params.IMAGE_TAG}"
|
||||
def latestImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:latest"
|
||||
retry(2) {
|
||||
bat """
|
||||
ssh -i "%SSH_KEY%" -o StrictHostKeyChecking=no ${env.PROD_USER}@${env.PROD_HOST} "docker image prune -f 2>/dev/null || true; docker pull ${fullImage} || exit 1; docker compose -f ${env.COMPOSE_FILE} up -d --no-deps --force-recreate ${env.DEPLOY_SERVICE} || exit 1; docker image prune -f"
|
||||
ssh -i "%SSH_KEY%" -o StrictHostKeyChecking=no ${env.PROD_USER}@${env.PROD_HOST} "docker image prune -f 2>/dev/null || true; docker pull ${latestImage} || exit 1; docker compose -f ${env.COMPOSE_FILE} up -d --no-deps --force-recreate ${env.DEPLOY_SERVICE} || exit 1; docker image prune -f"
|
||||
"""
|
||||
}
|
||||
|
||||
// 更新 versions.json（与后端 Jenkinsfile 保持一致的合并逻辑）
|
||||
def svcName = env.DEPLOY_SERVICE
|
||||
def svcVer = env.SERVICE_VERSION
|
||||
def releasedAt = new Date().format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone('UTC'))
|
||||
def updateScript = """\
|
||||
import json, os
|
||||
path = '${env.VERSIONS_FILE}'
|
||||
d = json.load(open(path)) if os.path.exists(path) else {}
|
||||
d.setdefault('services', {})
|
||||
d['services'].setdefault('${svcName}', {})
|
||||
d['services']['${svcName}']['version'] = '${svcVer}'
|
||||
d['services']['${svcName}']['changed'] = True
|
||||
d['releasedAt'] = '${releasedAt}'
|
||||
json.dump(d, open(path, 'w'), indent=2, ensure_ascii=False)
|
||||
print('versions.json updated: ${svcName}=${svcVer}')
|
||||
""".stripIndent()
|
||||
writeFile file: 'update_versions_web.py', text: updateScript
|
||||
bat """
|
||||
scp -i "%SSH_KEY%" -o StrictHostKeyChecking=no update_versions_web.py ${env.PROD_USER}@${env.PROD_HOST}:/tmp/update_versions_web.py
|
||||
ssh -i "%SSH_KEY%" -o StrictHostKeyChecking=no ${env.PROD_USER}@${env.PROD_HOST} "python3 /tmp/update_versions_web.py && rm /tmp/update_versions_web.py"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Commit Version') {
|
||||
steps {
|
||||
bat """
|
||||
git config user.email "jenkins@xuqm.com"
|
||||
git config user.name "Jenkins CI"
|
||||
git add ${env.VERSION_FILE}
|
||||
git diff --cached --quiet || git commit -m "ci: bump ${env.IMAGE_NAME} to ${env.SERVICE_VERSION} [skip ci]"
|
||||
git push origin HEAD:main
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
success { echo "✅ ${env.IMAGE_NAME}:${params.IMAGE_TAG} 构建部署成功" }
|
||||
success { echo "✅ ${env.IMAGE_NAME}:${env.SERVICE_VERSION} 构建部署成功" }
|
||||
failure { echo "❌ 构建失败，请检查日志" }
|
||||
}
|
||||
}
|
||||
|
||||
@ -55,34 +55,49 @@
|
||||
</div>
|
||||
</template>
|
||||
<!-- 版本信息 -->
|
||||
<el-descriptions :column="1" border style="margin-bottom:16px">
|
||||
<el-descriptions-item label="当前版本">
|
||||
<el-tag v-if="currentVersion" type="info" size="small">{{ currentVersion }}</el-tag>
|
||||
<span v-else style="color:#c0c4cc">加载中...</span>
|
||||
<el-button size="small" style="margin-left:12px" @click="checkUpdate" :loading="checkingUpdate">检查更新</el-button>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item v-if="updateCheckResult?.hasUpdate" label="最新版本">
|
||||
<el-tag type="success" size="small">{{ updateCheckResult.latestVersion }}</el-tag>
|
||||
<span v-if="updateCheckResult.releasedAt" style="color:#909399;font-size:12px;margin-left:8px">
|
||||
{{ formatTime(updateCheckResult.releasedAt) }}
|
||||
</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item v-if="updateCheckResult?.hasUpdate && updateCheckResult.changelog" label="更新日志">
|
||||
<div style="white-space:pre-wrap;font-size:13px;color:#606266;line-height:1.6">{{ updateCheckResult.changelog }}</div>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item v-if="updateCheckResult?.hasUpdate" label="变更服务">
|
||||
<div style="display:flex;flex-wrap:wrap;gap:6px">
|
||||
<el-tag
|
||||
v-for="(info, svc) in updateCheckResult.services"
|
||||
:key="svc"
|
||||
:type="info.changed ? 'warning' : 'info'"
|
||||
size="small"
|
||||
>
|
||||
{{ svc }} {{ info.current }}{{ info.changed ? ' → ' + info.latest : '' }}
|
||||
<div style="display:flex;align-items:center;gap:12px;margin-bottom:16px">
|
||||
<el-button type="primary" plain size="small" @click="checkUpdate" :loading="checkingUpdate">
|
||||
检查更新
|
||||
</el-button>
|
||||
<el-tag v-if="updateCheckResult && !updateCheckResult.hasUpdate" type="success" size="small">所有服务已是最新</el-tag>
|
||||
<el-tag v-else-if="updateCheckResult?.hasUpdate" type="warning" size="small">
|
||||
有 {{ changedServiceCount }} 个服务可更新
|
||||
</el-tag>
|
||||
<span v-if="updateCheckResult?.releasedAt" style="color:#909399;font-size:12px">
|
||||
云端发布于 {{ formatTime(updateCheckResult.releasedAt) }}
|
||||
</span>
|
||||
</div>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
|
||||
<!-- 版本对比表格（检查后始终显示） -->
|
||||
<el-table
|
||||
v-if="updateCheckResult"
|
||||
:data="serviceVersionRows"
|
||||
size="small"
|
||||
border
|
||||
style="margin-bottom:16px"
|
||||
>
|
||||
<el-table-column prop="name" label="服务" min-width="160" />
|
||||
<el-table-column label="当前版本" min-width="120">
|
||||
<template #default="{ row }">
|
||||
<el-tag type="info" size="small" class="mono">{{ row.current || '未知' }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="云端最新" min-width="120">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.changed ? 'warning' : 'success'" size="small" class="mono">
|
||||
{{ row.latest || '未知' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="状态" width="100">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.changed ? 'warning' : 'success'" size="small">
|
||||
{{ row.changed ? '有更新' : '最新' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<div style="display:flex;gap:8px;flex-wrap:wrap">
|
||||
<el-button type="primary" size="small" @click="openOperationDialog('update')">
|
||||
{{ updateCheckResult?.hasUpdate ? '一键更新到最新版本' : '一键更新' }}
|
||||
@ -250,7 +265,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { nextTick, onMounted, onUnmounted, ref } from 'vue'
|
||||
import { computed, nextTick, onMounted, onUnmounted, ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { Loading } from '@element-plus/icons-vue'
|
||||
import { accountApi } from '@/api/account'
|
||||
@ -397,6 +412,35 @@ const versionLoading = ref(false)
|
||||
const checkingUpdate = ref(false)
|
||||
const updateCheckResult = ref<import('@/api/system').UpdateCheckResult | null>(null)
|
||||
|
||||
const SERVICE_DISPLAY_NAMES: Record<string, string> = {
|
||||
'tenant-service': '租户服务',
|
||||
'im-service': '即时通讯服务',
|
||||
'push-service': '推送服务',
|
||||
'update-service': '版本管理服务',
|
||||
'file-service': '文件服务',
|
||||
'license-service': '授权服务',
|
||||
'xuqm-bugcollect-service': '崩溃收集服务',
|
||||
'demo-service': 'Demo 服务',
|
||||
'tenant-web': '租户平台 (Web)',
|
||||
'ops-web': '运营平台 (Web)',
|
||||
'nginx': 'Nginx 网关',
|
||||
}
|
||||
|
||||
const serviceVersionRows = computed(() => {
|
||||
if (!updateCheckResult.value) return []
|
||||
return Object.entries(updateCheckResult.value.services).map(([name, info]) => ({
|
||||
name: SERVICE_DISPLAY_NAMES[name] ?? name,
|
||||
key: name,
|
||||
current: info.current,
|
||||
latest: info.latest,
|
||||
changed: info.changed,
|
||||
}))
|
||||
})
|
||||
|
||||
const changedServiceCount = computed(() =>
|
||||
serviceVersionRows.value.filter(r => r.changed).length
|
||||
)
|
||||
|
||||
async function checkUpdate() {
|
||||
checkingUpdate.value = true
|
||||
try {
|
||||
|
||||
正在加载...
在新工单中引用
屏蔽一个用户
