admin/verify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 拆分更新类型(全量/补丁)和更新方式(自动/手动)，移除force_update字段

Browse Source
This commit is contained in:
admin
2026-05-08 23:34:14 +08:00
parent de0de10b8d
commit 65fa7146e8
12 changed files with 157 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/model/models.go
+4 -3
View File
@@ -225,10 +225,9 @@ type Version struct {
FileSize int64 `json:"file_size"`
FileHash string `gorm:"size:64" json:"file_hash"`
EntryFile string `gorm:"size:255" json:"entry_file"`
ForceUpdate bool `gorm:"default:false" json:"force_update"`
UpdateStrategy string `gorm:"size:20;default:optional" json:"update_strategy"`
UpdateMethod string `gorm:"size:20;default:manual" json:"update_method"`
MinVersion string `gorm:"size:50" json:"min_version"`
UpdateType string `gorm:"size:20;default:full" json:"update_type"`
UpdateMethod string `gorm:"size:20;default:auto" json:"update_method"`
Description string `gorm:"type:text" json:"description"`
Changelog string `gorm:"type:text" json:"changelog"`
Status string `gorm:"size:20;default:active" json:"status"`
@@ -236,6 +235,8 @@ type Version struct {
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
ForceUpdate bool `gorm:"default:false" json:"force_update,omitempty"`
MinVersion string `gorm:"size:50" json:"-"`
Application Application `gorm:"foreignKey:ApplicationID" json:"application,omitempty"`
Files []VersionFile `gorm:"foreignKey:VersionID" json:"files,omitempty"`
backend/internal/router/admin/applications.go
+2 -6
View File
@@ -871,15 +871,14 @@ func handleCreateVersion(c *gin.Context) {
Version string `json:"version"`
Description string `json:"description"`
FilePath string `json:"file_path"`
ForceUpdate bool `json:"force_update"`
}
if err := c.ShouldBindJSON(&req); err != nil {
response.Error(c, 400, "参数错误")
return
}
fmt.Printf("接收到的完整请求: Version=%s, Description=%s, FilePath=%s, ForceUpdate=%v\n",
req.Version, req.Description, req.FilePath, req.ForceUpdate)
fmt.Printf("接收到的完整请求: Version=%s, Description=%s, FilePath=%s\n",
req.Version, req.Description, req.FilePath)
finalFilePath := req.FilePath
fileSize := int64(0)
@@ -904,7 +903,6 @@ func handleCreateVersion(c *gin.Context) {
Version: req.Version,
Description: req.Description,
FilePath: filePath,
ForceUpdate: req.ForceUpdate,
Status: "active",
FileSize: fileSize,
}
@@ -954,7 +952,6 @@ func handleUpdateVersion(c *gin.Context) {
Version string `json:"version"`
Description string `json:"description"`
FilePath string `json:"file_path"`
ForceUpdate bool `json:"force_update"`
Status string `json:"status"`
}
if err := c.ShouldBindJSON(&req); err != nil {
@@ -971,7 +968,6 @@ func handleUpdateVersion(c *gin.Context) {
version.Version = req.Version
version.Description = req.Description
version.FilePath = req.FilePath
version.ForceUpdate = req.ForceUpdate
version.Status = req.Status
if err := database.DB.Save(&version).Error; err != nil {
backend/internal/router/admin/versions.go
+22 -17
View File
@@ -42,6 +42,7 @@ func handleGetAllVersions(c *gin.Context) {
pageSize := c.DefaultQuery("page_size", "20")
applicationIDFilter := c.Query("application_id")
updateStrategyFilter := c.Query("update_strategy")
updateTypeFilter := c.Query("update_type")
updateMethodFilter := c.Query("update_method")
searchFilter := c.Query("search")
@@ -82,6 +83,9 @@ func handleGetAllVersions(c *gin.Context) {
if updateStrategyFilter != "" {
countQuery = countQuery.Where("update_strategy = ?", updateStrategyFilter)
}
if updateTypeFilter != "" {
countQuery = countQuery.Where("update_type = ?", updateTypeFilter)
}
if updateMethodFilter != "" {
countQuery = countQuery.Where("update_method = ?", updateMethodFilter)
}
@@ -98,6 +102,9 @@ func handleGetAllVersions(c *gin.Context) {
if updateStrategyFilter != "" {
query = query.Where("update_strategy = ?", updateStrategyFilter)
}
if updateTypeFilter != "" {
query = query.Where("update_type = ?", updateTypeFilter)
}
if updateMethodFilter != "" {
query = query.Where("update_method = ?", updateMethodFilter)
}
@@ -223,8 +230,8 @@ func handleGetVersionByID(c *gin.Context) {
"file_path": version.FilePath,
"file_size": version.FileSize,
"file_hash": version.FileHash,
"force_update": version.ForceUpdate,
"update_strategy": version.UpdateStrategy,
"update_type": version.UpdateType,
"update_method": version.UpdateMethod,
"changelog": version.Changelog,
"status": computedStatus,
@@ -242,8 +249,8 @@ type CreateVersionRequest struct {
FileSize int64 `json:"file_size"`
FileHash string `json:"file_hash"`
EntryFile string `json:"entry_file"`
ForceUpdate bool `json:"force_update"`
UpdateStrategy string `json:"update_strategy"`
UpdateType string `json:"update_type"`
UpdateMethod string `json:"update_method"`
Description string `json:"description"`
Changelog string `json:"changelog"`
@@ -282,8 +289,8 @@ func handleCreateVersionGlobal(c *gin.Context) {
FileSize: req.FileSize,
FileHash: req.FileHash,
EntryFile: req.EntryFile,
ForceUpdate: req.ForceUpdate,
UpdateStrategy: req.UpdateStrategy,
UpdateType: req.UpdateType,
UpdateMethod: req.UpdateMethod,
Description: req.Description,
Changelog: req.Changelog,
@@ -293,17 +300,16 @@ func handleCreateVersionGlobal(c *gin.Context) {
if version.UpdateStrategy == "" {
version.UpdateStrategy = "optional"
}
if version.UpdateType == "" {
version.UpdateType = "full"
}
if version.UpdateMethod == "" {
version.UpdateMethod = "manual"
version.UpdateMethod = "auto"
}
if version.UpdateStrategy == "forced" {
version.ForceUpdate = true
}
if version.UpdateMethod == "hot" {
if version.UpdateType == "patch" {
var lastFullVersion model.Version
if err := database.DB.Where("application_id = ? AND update_method = ?", req.ApplicationID, "full").
if err := database.DB.Where("application_id = ? AND update_type = ?", req.ApplicationID, "full").
Order("id DESC").First(&lastFullVersion).Error; err == nil {
version.BaseVersionID = &lastFullVersion.ID
}
@@ -333,6 +339,7 @@ func handleCreateVersionGlobal(c *gin.Context) {
type UpdateVersionRequest struct {
Version string `json:"version"`
UpdateStrategy string `json:"update_strategy"`
UpdateType string `json:"update_type"`
UpdateMethod string `json:"update_method"`
Description string `json:"description"`
Changelog string `json:"changelog"`
@@ -376,8 +383,8 @@ func handleUpdateVersionGlobal(c *gin.Context) {
}
}
log.Printf("[DEBUG] handleUpdateVersionGlobal versionID=%s, req: version=%s, update_strategy=%s, update_method=%s, description=%s\n",
versionID, req.Version, req.UpdateStrategy, req.UpdateMethod, req.Description)
log.Printf("[DEBUG] handleUpdateVersionGlobal versionID=%s, req: version=%s, update_strategy=%s, update_type=%s, update_method=%s, description=%s\n",
versionID, req.Version, req.UpdateStrategy, req.UpdateType, req.UpdateMethod, req.Description)
updates := map[string]interface{}{}
if req.Version != "" {
@@ -385,11 +392,9 @@ func handleUpdateVersionGlobal(c *gin.Context) {
}
if req.UpdateStrategy != "" {
updates["update_strategy"] = req.UpdateStrategy
if req.UpdateStrategy == "forced" {
updates["force_update"] = true
} else {
updates["force_update"] = false
}
}
if req.UpdateType != "" {
updates["update_type"] = req.UpdateType
}
if req.UpdateMethod != "" {
updates["update_method"] = req.UpdateMethod
backend/internal/router/app/info.go
+1
View File
@@ -103,6 +103,7 @@ func handleAppCheckUpdate(c *gin.Context) {
"entry_file": latestVersion.EntryFile,
"update_notes": latestVersion.Description,
"update_strategy": latestVersion.UpdateStrategy,
"update_type": latestVersion.UpdateType,
"update_method": latestVersion.UpdateMethod,
"changelog": latestVersion.Changelog,
"files": files,
backend/scripts/update_api_docs.go
+4 -2
View File
@@ -1,4 +1,4 @@
package main
package main
import (
"log"
@@ -122,10 +122,12 @@ GET /api/v1/app/{appKey}/check-update?version=1.0.0
"message": "success",
"data": {
"has_update": true,
"force_update": false,
"latest_version": "2.0.0",
"download_url": "http://example.com/download/app-v2.0.0.zip",
"file_size": 10240000,
"update_strategy": "optional",
"update_type": "full",
"update_method": "auto",
"description": "新版本修复了若干bug"
}
}
frontend/src/pages/admin/versions/[id].vue
+32 -9
View File
@@ -44,7 +44,8 @@ const formData = ref({
version: '',
description: '',
update_strategy: 'optional' as 'optional' | 'forced',
update_method: 'manual' as 'manual' | 'hot' | 'full',
update_type: 'full' as 'full' | 'patch',
update_method: 'auto' as 'auto' | 'manual',
changelog: '',
entry_file: '',
file: null as File | null,
@@ -94,7 +95,8 @@ async function fetchVersion() {
formData.value.version = ver.version || ''
formData.value.description = ver.description || ''
formData.value.update_strategy = ver.update_strategy || 'optional'
formData.value.update_method = ver.update_method || 'manual'
formData.value.update_type = ver.update_type || 'full'
formData.value.update_method = ver.update_method || 'auto'
formData.value.changelog = ver.changelog || ''
formData.value.entry_file = ver.entry_file || ''
}
@@ -180,6 +182,7 @@ async function handleSubmit() {
version: formData.value.version,
description: formData.value.description,
update_strategy: formData.value.update_strategy,
update_type: formData.value.update_type,
update_method: formData.value.update_method,
changelog: formData.value.changelog,
entry_file: formData.value.entry_file,
@@ -423,6 +426,23 @@ onMounted(() => {
/>
</div>
<div class="space-y-2">
<UiLabel>{{ t('admin.versions.createForm.updateType') }}</UiLabel>
<UiSelect v-model="formData.update_type" :disabled="saving">
<UiSelectTrigger>
<UiSelectValue />
</UiSelectTrigger>
<UiSelectContent>
<UiSelectItem value="full">
{{ t('admin.versions.types.full') }}
</UiSelectItem>
<UiSelectItem value="patch">
{{ t('admin.versions.types.patch') }}
</UiSelectItem>
</UiSelectContent>
</UiSelect>
</div>
<div class="space-y-2">
<UiLabel>{{ t('admin.versions.createForm.updateMethod') }}</UiLabel>
<UiSelect v-model="formData.update_method" :disabled="saving">
@@ -430,11 +450,8 @@ onMounted(() => {
<UiSelectValue />
</UiSelectTrigger>
<UiSelectContent>
<UiSelectItem value="full">
{{ t('admin.versions.methods.full') }}
</UiSelectItem>
<UiSelectItem value="hot">
{{ t('admin.versions.methods.hot') }}
<UiSelectItem value="auto">
{{ t('admin.versions.methods.auto') }}
</UiSelectItem>
<UiSelectItem value="manual">
{{ t('admin.versions.methods.manual') }}
@@ -485,11 +502,17 @@ onMounted(() => {
<span class="text-muted-foreground">{{ t('admin.versions.createForm.previewForcedUpdate') }}</span>
<span>{{ formData.update_strategy === 'forced' ? t('common.yes') : t('common.no') }}</span>
</div>
<div class="flex justify-between text-sm">
<span class="text-muted-foreground">{{ t('admin.versions.createForm.previewUpdateType') }}</span>
<span>{{
formData.update_type === 'full' ? t('admin.versions.types.full')
: t('admin.versions.types.patch')
}}</span>
</div>
<div class="flex justify-between text-sm">
<span class="text-muted-foreground">{{ t('admin.versions.createForm.previewUpdateMethod') }}</span>
<span>{{
formData.update_method === 'full' ? t('admin.versions.methods.full')
: formData.update_method === 'hot' ? t('admin.versions.methods.hot')
formData.update_method === 'auto' ? t('admin.versions.methods.auto')
: t('admin.versions.methods.manual')
}}</span>
</div>
frontend/src/pages/admin/versions/components/columns.ts
+18 -5
View File
@@ -69,21 +69,34 @@ export function getColumns(options: ColumnOptions, t: (key: string) => string):
return h(Badge, { class: strategyClasses[row.original.update_strategy] }, () => strategyLabels[row.original.update_strategy])
},
},
{
accessorKey: 'update_type',
header: () => t('admin.versions.columns.type'),
cell: ({ row }) => {
const typeClasses: Record<string, string> = {
full: 'bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-400',
patch: 'bg-orange-100 text-orange-700 dark:bg-orange-900/30 dark:text-orange-400',
}
const typeLabels: Record<string, string> = {
full: t('admin.versions.types.full'),
patch: t('admin.versions.types.patch'),
}
return h(Badge, { class: typeClasses[row.original.update_type] || typeClasses.full }, () => typeLabels[row.original.update_type] || row.original.update_type)
},
},
{
accessorKey: 'update_method',
header: () => t('admin.versions.columns.method'),
cell: ({ row }) => {
const methodClasses: Record<string, string> = {
auto: 'bg-purple-100 text-purple-700 dark:bg-purple-900/30 dark:text-purple-400',
manual: 'bg-gray-100 text-gray-700 dark:bg-gray-900/30 dark:text-gray-400',
hot: 'bg-orange-100 text-orange-700 dark:bg-orange-900/30 dark:text-orange-400',
full: 'bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-400',
}
const methodLabels: Record<string, string> = {
auto: t('admin.versions.methods.auto'),
manual: t('admin.versions.methods.manual'),
hot: t('admin.versions.methods.hot'),
full: t('admin.versions.methods.full'),
}
return h(Badge, { class: methodClasses[row.original.update_method] }, () => methodLabels[row.original.update_method])
return h(Badge, { class: methodClasses[row.original.update_method] || methodClasses.manual }, () => methodLabels[row.original.update_method] || row.original.update_method)
},
},
{
frontend/src/pages/admin/versions/create.vue
+35 -8
View File
@@ -43,7 +43,8 @@ const formData = ref({
version: '',
description: '',
update_strategy: 'optional' as 'optional' | 'forced',
update_method: 'manual' as 'manual' | 'hot' | 'full',
update_type: 'full' as 'full' | 'patch',
update_method: 'auto' as 'auto' | 'manual',
changelog: '',
entry_file: '',
file: null as File | null,
@@ -85,10 +86,17 @@ function formatFileSize(size: number): string {
return `${(size / (1024 * 1024)).toFixed(2)} MB`
}
const typeLabel = computed(() => {
const map: Record<string, string> = {
full: t('admin.versions.types.full'),
patch: t('admin.versions.types.patch'),
}
return map[formData.value.update_type] || formData.value.update_type
})
const methodLabel = computed(() => {
const map: Record<string, string> = {
full: t('admin.versions.methods.full'),
hot: t('admin.versions.methods.hot'),
auto: t('admin.versions.methods.auto'),
manual: t('admin.versions.methods.manual'),
}
return map[formData.value.update_method] || formData.value.update_method
@@ -178,6 +186,7 @@ async function handleSubmit() {
version: formData.value.version,
description: formData.value.description,
update_strategy: formData.value.update_strategy,
update_type: formData.value.update_type,
update_method: formData.value.update_method,
changelog: formData.value.changelog,
entry_file: formData.value.entry_file,
@@ -411,6 +420,23 @@ onMounted(() => {
/>
</div>
<div class="space-y-2">
<UiLabel>{{ t('admin.versions.createForm.updateType') }}</UiLabel>
<UiSelect v-model="formData.update_type" :disabled="saving">
<UiSelectTrigger>
<UiSelectValue />
</UiSelectTrigger>
<UiSelectContent>
<UiSelectItem value="full">
{{ t('admin.versions.types.full') }}
</UiSelectItem>
<UiSelectItem value="patch">
{{ t('admin.versions.types.patch') }}
</UiSelectItem>
</UiSelectContent>
</UiSelect>
</div>
<div class="space-y-2">
<UiLabel>{{ t('admin.versions.createForm.updateMethod') }}</UiLabel>
<UiSelect v-model="formData.update_method" :disabled="saving">
@@ -418,11 +444,8 @@ onMounted(() => {
<UiSelectValue />
</UiSelectTrigger>
<UiSelectContent>
<UiSelectItem value="full">
{{ t('admin.versions.methods.full') }}
</UiSelectItem>
<UiSelectItem value="hot">
{{ t('admin.versions.methods.hot') }}
<UiSelectItem value="auto">
{{ t('admin.versions.methods.auto') }}
</UiSelectItem>
<UiSelectItem value="manual">
{{ t('admin.versions.methods.manual') }}
@@ -485,6 +508,10 @@ onMounted(() => {
<span class="text-muted-foreground">{{ t('admin.versions.createForm.previewForcedUpdate') }}</span>
<span>{{ formData.update_strategy === 'forced' ? t('common.yes') : t('common.no') }}</span>
</div>
<div class="flex justify-between text-sm">
<span class="text-muted-foreground">{{ t('admin.versions.createForm.previewUpdateType') }}</span>
<span>{{ typeLabel }}</span>
</div>
<div class="flex justify-between text-sm">
<span class="text-muted-foreground">{{ t('admin.versions.createForm.previewUpdateMethod') }}</span>
<span>{{ methodLabel }}</span>
frontend/src/pages/admin/versions/data/schema.ts
+3 -2
View File
@@ -1,7 +1,8 @@
import { z } from 'zod'
export const updateStrategySchema = z.enum(['optional', 'forced'])
export const updateMethodSchema = z.enum(['manual', 'hot', 'full'])
export const updateTypeSchema = z.enum(['full', 'patch'])
export const updateMethodSchema = z.enum(['auto', 'manual'])
export const versionStatusSchema = z.enum(['active', 'superseded'])
export const versionSchema = z.object({
@@ -12,8 +13,8 @@ export const versionSchema = z.object({
description: z.string(),
file_path: z.string(),
file_size: z.number(),
force_update: z.boolean(),
update_strategy: updateStrategySchema,
update_type: updateTypeSchema,
update_method: updateMethodSchema,
status: versionStatusSchema,
changelog: z.string(),
frontend/src/pages/admin/versions/index.vue
+18 -3
View File
@@ -30,6 +30,7 @@ const tableRef = ref()
const appFilter = ref<string>('')
const strategyFilter = ref<string>('')
const typeFilter = ref<string>('')
const methodFilter = ref<string>('')
const searchFilter = ref<string>('')
const currentPage = ref(1)
@@ -56,10 +57,14 @@ const strategyOptions = computed(() => [
{ label: t('admin.versions.strategies.forced'), value: 'forced' },
])
const typeOptions = computed(() => [
{ label: t('admin.versions.types.full'), value: 'full' },
{ label: t('admin.versions.types.patch'), value: 'patch' },
])
const methodOptions = computed(() => [
{ label: t('admin.versions.methods.auto'), value: 'auto' },
{ label: t('admin.versions.methods.manual'), value: 'manual' },
{ label: t('admin.versions.methods.hot'), value: 'hot' },
{ label: t('admin.versions.methods.full'), value: 'full' },
])
const totalSize = computed(() => {
@@ -113,6 +118,9 @@ async function fetchVersions() {
if (strategyFilter.value) {
params.append('update_strategy', strategyFilter.value)
}
if (typeFilter.value) {
params.append('update_type', typeFilter.value)
}
if (methodFilter.value) {
params.append('update_method', methodFilter.value)
}
@@ -179,6 +187,8 @@ function handleExport() {
params.append('application_id', appFilter.value)
if (strategyFilter.value)
params.append('update_strategy', strategyFilter.value)
if (typeFilter.value)
params.append('update_type', typeFilter.value)
if (methodFilter.value)
params.append('update_method', methodFilter.value)
@@ -230,7 +240,7 @@ watch([currentPage, pageSize], () => {
fetchVersions()
})
watch([appFilter, strategyFilter, methodFilter, searchFilter], () => {
watch([appFilter, strategyFilter, typeFilter, methodFilter, searchFilter], () => {
currentPage.value = 1
fetchVersions()
})
@@ -336,6 +346,11 @@ watch([appFilter, strategyFilter, methodFilter, searchFilter], () => {
:title="t('admin.versions.strategy')"
:options="strategyOptions"
/>
<SingleFilter
v-model="typeFilter"
:title="t('admin.versions.columns.type')"
:options="typeOptions"
/>
<SingleFilter
v-model="methodFilter"
:title="t('admin.versions.method')"
frontend/src/plugins/i18n/en.json
+9 -3
View File
@@ -1417,6 +1417,7 @@
"description": "Description",
"fileSize": "File Size",
"strategy": "Strategy",
"type": "Type",
"method": "Method",
"status": "Status",
"createdAt": "Created At",
@@ -1426,10 +1427,13 @@
"optional": "Optional",
"forced": "Forced"
},
"types": {
"full": "Full Update",
"patch": "Patch Update"
},
"methods": {
"manual": "Manual",
"hot": "Hot",
"full": "Full"
"auto": "Auto Update",
"manual": "Manual Update"
},
"status": {
"active": "Active",
@@ -1467,6 +1471,7 @@
"entryFilePlaceholder": "Select entry file (optional)",
"forcedUpdate": "Force Update",
"forcedUpdateDesc": "When enabled, users must update to this version to continue using",
"updateType": "Update Type",
"updateMethod": "Update Method",
"baseVersion": "Base Version",
"baseVersionPlaceholder": "Select base version (patch mode)",
@@ -1486,6 +1491,7 @@
"previewFileCount": "File Count",
"previewEntryFile": "Entry File",
"previewForcedUpdate": "Force Update",
"previewUpdateType": "Update Type",
"previewUpdateMethod": "Update Method",
"previewAutoUpdate": "Auto Update",
"changelogPreview": "Changelog Preview",
frontend/src/plugins/i18n/zh.json
+9 -3
View File
@@ -1384,6 +1384,7 @@
"description": "描述",
"fileSize": "文件大小",
"strategy": "更新策略",
"type": "更新类型",
"method": "更新方式",
"status": "状态",
"createdAt": "创建时间",
@@ -1393,10 +1394,13 @@
"optional": "可选更新",
"forced": "强制更新"
},
"types": {
"full": "全量更新",
"patch": "补丁更新"
},
"methods": {
"manual": "手动更新",
"hot": "热更新",
"full": "完整更新"
"auto": "自动更新",
"manual": "手动更新"
},
"status": {
"active": "有效",
@@ -1434,6 +1438,7 @@
"entryFilePlaceholder": "选择入口文件（可选）",
"forcedUpdate": "强制更新",
"forcedUpdateDesc": "启用后用户必须更新到此版本才能继续使用",
"updateType": "更新类型",
"updateMethod": "更新方式",
"baseVersion": "基础版本",
"baseVersionPlaceholder": "选择基础版本（补丁模式）",
@@ -1453,6 +1458,7 @@
"previewFileCount": "文件数量",
"previewEntryFile": "入口文件",
"previewForcedUpdate": "强制更新",
"previewUpdateType": "更新类型",
"previewUpdateMethod": "更新方式",
"previewAutoUpdate": "自动更新",
"changelogPreview": "更新日志预览",