优化结构
This commit is contained in:
@@ -3,11 +3,11 @@ package handler
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"kra/internal/biz/system"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"kra/internal/biz"
|
||||
"kra/internal/service"
|
||||
"kra/internal/service/dto"
|
||||
|
||||
@@ -18,8 +18,8 @@ type Version struct{ service *service.VersionService }
|
||||
|
||||
func NewVersion(service *service.VersionService) *Version { return &Version{service: service} }
|
||||
|
||||
func versionStage(err error) (biz.VersionStage, bool) {
|
||||
var stageErr *biz.VersionStageError
|
||||
func versionStage(err error) (system.VersionStage, bool) {
|
||||
var stageErr *system.VersionStageError
|
||||
if !errors.As(err, &stageErr) {
|
||||
return "", false
|
||||
}
|
||||
@@ -89,15 +89,15 @@ func (h *Version) Export(c *gin.Context) {
|
||||
}
|
||||
if err := h.service.Export(c.Request.Context(), req.VersionName, req.VersionCode, req.Description, req.MenuIDs, req.APIIDs, req.DictIDs); err != nil {
|
||||
switch stage, _ := versionStage(err); stage {
|
||||
case biz.VersionStageMenus:
|
||||
case system.VersionStageMenus:
|
||||
Fail(c, "获取菜单数据失败:"+err.Error())
|
||||
case biz.VersionStageAPIs:
|
||||
case system.VersionStageAPIs:
|
||||
Fail(c, "获取API数据失败:"+err.Error())
|
||||
case biz.VersionStageDictionaries:
|
||||
case system.VersionStageDictionaries:
|
||||
Fail(c, "获取字典数据失败:"+err.Error())
|
||||
case biz.VersionStageJSON:
|
||||
case system.VersionStageJSON:
|
||||
Fail(c, "JSON序列化失败:"+err.Error())
|
||||
case biz.VersionStageSave:
|
||||
case system.VersionStageSave:
|
||||
Fail(c, "保存版本记录失败:"+err.Error())
|
||||
default:
|
||||
Fail(c, "创建发版失败:"+err.Error())
|
||||
@@ -131,16 +131,16 @@ func (h *Version) Import(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
if err := h.service.ImportRequest(c.Request.Context(), &req); err != nil {
|
||||
if errors.Is(err, biz.ErrInvalidVersion) {
|
||||
if errors.Is(err, system.ErrInvalidVersion) {
|
||||
Fail(c, "版本信息格式错误")
|
||||
return
|
||||
}
|
||||
switch stage, _ := versionStage(err); stage {
|
||||
case biz.VersionStageMenus:
|
||||
case system.VersionStageMenus:
|
||||
Fail(c, "导入菜单失败: "+err.Error())
|
||||
case biz.VersionStageAPIs:
|
||||
case system.VersionStageAPIs:
|
||||
Fail(c, "导入API失败: "+err.Error())
|
||||
case biz.VersionStageDictionaries:
|
||||
case system.VersionStageDictionaries:
|
||||
Fail(c, "导入字典失败: "+err.Error())
|
||||
default:
|
||||
Fail(c, "导入失败:"+err.Error())
|
||||
|
||||
Reference in New Issue
Block a user