diff --git a/internal/dao/repository_dao.go b/internal/dao/repository_dao.go index 1883bb8..aedd85c 100644 --- a/internal/dao/repository_dao.go +++ b/internal/dao/repository_dao.go @@ -334,8 +334,9 @@ func (r *RepositoryDao) DeleteByInstanceIdAndDatatypeAndOrgAndRepo(instanceId st func (r *RepositoryDao) UpdateRepositoryMountStatus(statusReq *query.UpdateMountStatusReq) error { var ( - msgStr []byte - err error + msgStr []byte + err error + newMsgStr string ) if statusReq.ErrorMsg != "" { msg := make(map[string]string, 0) @@ -344,10 +345,11 @@ func (r *RepositoryDao) UpdateRepositoryMountStatus(statusReq *query.UpdateMount if err != nil { return err } + newMsgStr = strings.ReplaceAll(string(msgStr), "'", "''") } sql := fmt.Sprintf("UPDATE repository SET status = %d, error_msg = '%s', updated_at = '%s' WHERE id = %d", - statusReq.Status, string(msgStr), util.GetCurrentTimeStr(), statusReq.Id) - if err := r.baseData.BizDB.Exec(sql).Error; err != nil { + statusReq.Status, newMsgStr, util.GetCurrentTimeStr(), statusReq.Id) + if err = r.baseData.BizDB.Exec(sql).Error; err != nil { return err } return nil diff --git a/internal/router/http_router.go b/internal/router/http_router.go index 1b958e1..3874c94 100644 --- a/internal/router/http_router.go +++ b/internal/router/http_router.go @@ -67,7 +67,7 @@ func (r *HttpRouter) repositoryRouter() { r.echo.GET("/api/v1/repository/card/:aidcCode/:id", r.repositoryHandler.RepositoryCardHandler) // 仓库介绍 r.echo.GET("/api/v1/repository/files/:aidcCode/:id/", r.repositoryHandler.RepositoryFilesHandler) // 仓库文件目录 r.echo.GET("/api/v1/repository/files/:aidcCode/:id/:filePath", r.repositoryHandler.RepositoryFilesHandler) // 仓库文件目录 - r.echo.POST("/api/v1/repositories/mount", r.repositoryHandler.MountRepositoryHandler) // 挂载缓存 + r.echo.POST("/api/v1/repositories/mount", r.repositoryHandler.MountRepositoryHandler) // 挂载缓存(公共目录) r.echo.GET("/api/v1/tags", r.tagHandler.TagHandler) r.echo.GET("/api/v1/task_tags", r.tagHandler.TaskTagHandler) @@ -76,7 +76,7 @@ func (r *HttpRouter) repositoryRouter() { func (r *HttpRouter) cacheJobRouter() { r.echo.GET("/api/v1/cacheJob/list", r.cacheJobHandler.ListCacheJobHandler) - r.echo.POST("/api/v1/cacheJob/create", r.cacheJobHandler.CreateCacheJobHandler) + r.echo.POST("/api/v1/cacheJob/create", r.cacheJobHandler.CreateCacheJobHandler) // 缓存任务创建 r.echo.POST("/api/v1/cacheJob/stop", r.cacheJobHandler.StopCacheJobHandler) r.echo.POST("/api/v1/cacheJob/resume", r.cacheJobHandler.ResumeCacheJobHandler) r.echo.DELETE("/api/v1/cacheJob/:id", r.cacheJobHandler.DeleteCacheJobHandler) diff --git a/internal/service/repository_service.go b/internal/service/repository_service.go index 8321b83..d8e96b2 100644 --- a/internal/service/repository_service.go +++ b/internal/service/repository_service.go @@ -230,7 +230,7 @@ func (s *RepositoryService) MountRepository(repoReq *query.RepositoryReq) error if repository.Status == consts.StatusCacheJobIng || repository.Status == consts.StatusCacheJobComplete { return myerr.New("当前状态不可执行该操作。") } - entity, err := s.dingospeedDao.GetEntity(repository.InstanceId, true) + entity, err := s.dingospeedDao.GetEntity(repository.InstanceId, false) // 挂载到公共目录,通过离线模式处理 if err != nil { return err } @@ -249,8 +249,9 @@ func (s *RepositoryService) MountRepository(repoReq *query.RepositoryReq) error RepositoryId: repository.ID, Type: consts.CacheTypeMount, InstanceId: repository.InstanceId, - Org: repository.Org, Repo: repository.Repo, - Datatype: repository.Datatype, + Org: repository.Org, + Repo: repository.Repo, + Datatype: repository.Datatype, } b, err := sonic.Marshal(createCacheJobReq) if err != nil {