diff --git a/openflare_server/controller/update.go b/openflare_server/controller/update.go index 1ec26c69..2ceb97cf 100644 --- a/openflare_server/controller/update.go +++ b/openflare_server/controller/update.go @@ -2,7 +2,6 @@ package controller import ( "openflare/service" - "strings" "time" "github.com/gin-gonic/gin" @@ -102,35 +101,38 @@ func StreamServerUpgradeLogs(c *gin.Context) { // @Success 200 {object} map[string]interface{} // @Router /api/update/manual-upload [post] func UploadManualServerBinary(c *gin.Context) { - fileHeader, err := c.FormFile("binary") - if err != nil { - respondFailure(c, "请先选择要上传的服务端二进制文件。") - return - } - - file, err := fileHeader.Open() - if err != nil { - respondFailure(c, "读取上传文件失败。") - return - } - defer func() { - _ = file.Close() - }() - - info, err := service.UploadManualServerBinary(c.Request.Context(), fileHeader.Filename, file) - if err != nil { - respondFailure(c, err.Error()) - return - } - - message := strings.TrimSpace(info.ComparisonMessage) - if message == "" { - message = "已完成上传并检查升级包版本。" - } - - respondSuccessWithExtras(c, info, gin.H{ - "message": message, - }) + respondFailure(c, "手动升级功能已禁用") + return + // + //fileHeader, err := c.FormFile("binary") + //if err != nil { + // respondFailure(c, "请先选择要上传的服务端二进制文件。") + // return + //} + // + //file, err := fileHeader.Open() + //if err != nil { + // respondFailure(c, "读取上传文件失败。") + // return + //} + //defer func() { + // _ = file.Close() + //}() + // + //info, err := service.UploadManualServerBinary(c.Request.Context(), fileHeader.Filename, file) + //if err != nil { + // respondFailure(c, err.Error()) + // return + //} + // + //message := strings.TrimSpace(info.ComparisonMessage) + //if message == "" { + // message = "已完成上传并检查升级包版本。" + //} + // + //respondSuccessWithExtras(c, info, gin.H{ + // "message": message, + //}) } // ConfirmManualServerUpgrade godoc @@ -141,18 +143,21 @@ func UploadManualServerBinary(c *gin.Context) { // @Success 200 {object} map[string]interface{} // @Router /api/update/manual-upgrade [post] func ConfirmManualServerUpgrade(c *gin.Context) { - var request confirmManualUpgradeRequest - if !bindJSON(c, &request) { - return - } - - info, err := service.ConfirmManualServerUpgrade(request.UploadToken) - if err != nil { - respondFailure(c, err.Error()) - return - } - - respondSuccessWithExtras(c, info, gin.H{ - "message": "服务升级任务已启动,确认无误后将自动重启。", - }) + respondFailure(c, "手动升级功能已禁用") + return + // + //var request confirmManualUpgradeRequest + //if !bindJSON(c, &request) { + // return + //} + // + //info, err := service.ConfirmManualServerUpgrade(request.UploadToken) + //if err != nil { + // respondFailure(c, err.Error()) + // return + //} + // + //respondSuccessWithExtras(c, info, gin.H{ + // "message": "服务升级任务已启动,确认无误后将自动重启。", + //}) } diff --git a/openflare_server/web/features/update/components/version-upgrade-modal.tsx b/openflare_server/web/features/update/components/version-upgrade-modal.tsx index b1517cef..2370f9c7 100644 --- a/openflare_server/web/features/update/components/version-upgrade-modal.tsx +++ b/openflare_server/web/features/update/components/version-upgrade-modal.tsx @@ -130,7 +130,7 @@ export function VersionUpgradeModal({ isOpen={isOpen} onClose={onClose} title="版本" - description="默认检查正式版更新;你也可以手动检查 preview 发布并选择升级,或上传 Server 二进制确认升级。升级开始后服务会短暂重启。" + description="默认检查正式版更新;你也可以手动检查 preview 发布并选择升级。升级开始后服务会短暂重启。" size="lg" >
@@ -319,7 +319,7 @@ export function VersionUpgradeModal({ ) : null} - {canUpgrade ? ( + {canUpgrade && (false as boolean) ? (