diff --git a/internal/dao/cache_job_dao.go b/internal/dao/cache_job_dao.go index 737a5f5..459313d 100644 --- a/internal/dao/cache_job_dao.go +++ b/internal/dao/cache_job_dao.go @@ -16,6 +16,7 @@ package dao import ( "fmt" + "strings" "dingoscheduler/internal/data" "dingoscheduler/internal/model" @@ -111,19 +112,19 @@ func (c *CacheJobDao) RemoteRequestPathsInfo(domain, dataType, org, repo, revisi func (c *CacheJobDao) UpdateCacheStatus(statusReq *query.UpdateJobStatusReq) error { var ( - msgStr []byte - err error + newMsgStr string ) if statusReq.ErrorMsg != "" { msg := make(map[string]string, 0) msg["msg"] = statusReq.ErrorMsg - msgStr, err = sonic.Marshal(msg) + msgStr, err := sonic.Marshal(msg) if err != nil { return err } + newMsgStr = strings.ReplaceAll(string(msgStr), "'", "''") } sql := fmt.Sprintf("UPDATE cache_job SET status = %d, error_msg = '%s', updated_at = '%s' WHERE id = %d", - statusReq.Status, string(msgStr), util.GetCurrentTimeStr(), statusReq.Id) + statusReq.Status, newMsgStr, util.GetCurrentTimeStr(), statusReq.Id) if err := c.baseData.BizDB.Exec(sql).Error; err != nil { return err } diff --git a/internal/dao/hf_token_dao.go b/internal/dao/hf_token_dao.go index a1ed691..2852f46 100644 --- a/internal/dao/hf_token_dao.go +++ b/internal/dao/hf_token_dao.go @@ -27,7 +27,7 @@ func (d *HfTokenDao) getDefaultToken() string { defer d.mu.Unlock() if d.defaultToken == "" { var hfTokens []*model.HfToken - if err := d.baseData.BizDB.Table("hf_token t1").Limit(1).Find(&hfTokens).Error; err != nil { + if err := d.baseData.BizDB.Table("hf_token t1").Where("enabled = ?", true).Limit(1).Find(&hfTokens).Error; err != nil { zap.S().Errorf("getDefaultToken err.%v", err) return "" } diff --git a/internal/dao/repository_dao.go b/internal/dao/repository_dao.go index b7b2f53..1883bb8 100644 --- a/internal/dao/repository_dao.go +++ b/internal/dao/repository_dao.go @@ -76,7 +76,8 @@ func (r *RepositoryDao) PersistRepo(persistRepoReq *query.PersistRepoReq) error return err } if len(freeRepositories) == 0 { - return myerr.New("没有要持久化的仓库。") + zap.S().Warnf("instanceId:%s 没有要持久化的仓库。", instanceId) + continue } speed, err := r.dingospeedDao.GetEntity(instanceId, true) if err != nil { diff --git a/internal/model/hf_token.gen.go b/internal/model/hf_token.gen.go index 8209a23..0fe4a1e 100644 --- a/internal/model/hf_token.gen.go +++ b/internal/model/hf_token.gen.go @@ -6,10 +6,10 @@ package model const TableNameHfToken = "hf_token" -// PreheatJob mapped from table type HfToken struct { - ID int64 `gorm:"column:id;primaryKey;autoIncrement:true" json:"id"` - Token string `gorm:"column:token;not null" json:"token"` + ID int64 `gorm:"column:id;primaryKey;autoIncrement:true" json:"id"` + Token string `gorm:"column:token;not null" json:"token"` + Enabled bool `gorm:"column:enabled;not null;comment:是否启用" json:"enabled"` } // TableName PreheatJob's table name