fix: gormfind (#370)

Co-authored-by: fusikai <fusikai@douyu.tv>
douyu · Feb 13, 2023 · 83429f5 · 83429f5
1 parent 6d0e164
commit 83429f5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/internal/pkg/install/mock_setting.go b/internal/pkg/install/mock_setting.go
@@ -21,7 +21,7 @@ func mockGrafanaSetting(url string, e *echo.Echo) {
 
 func mockAdminUser() {
 	var user db.User
-	invoker.JunoMysql.Where("uid = ?", 1).Find(&user)
+	invoker.JunoMysql.Where("uid = ?", 1).First(&user)
 	if user.Uid == 0 {
 		return
 	}

diff --git a/internal/pkg/service/confgo/tpl.go b/internal/pkg/service/confgo/tpl.go
@@ -31,7 +31,7 @@ func (r *confu) GetTplList(where db.CmcTpl, currentPage, pageSize int, keyType,
 }
 
 func (r *confu) GetTpl(v int) (resp db.CmcTpl, err error) {
-	err = r.DB.Where("id = ?", v).Find(&resp).Error
+	err = r.DB.Where("id = ?", v).First(&resp).Error
 	return
 }
 

diff --git a/internal/pkg/service/confgov2/config.go b/internal/pkg/service/confgov2/config.go
@@ -427,7 +427,7 @@ func Instances(param view.ReqConfigInstanceList) (resp view.RespConfigInstanceLi
 		instanceNotPublished = make(view.RespConfigInstanceList, 0)
 	)
 	// get configuration info
-	query := mysql.Where("id=?", param.ConfigurationID).Find(&configuration)
+	query := mysql.Where("id=?", param.ConfigurationID).First(&configuration)
 	if query.Error != nil {
 		err = query.Error
 		return
@@ -772,7 +772,7 @@ func Publish(param view.ReqPublishConfig, c echo.Context) (err error) {
 
 	// get publish version
 	var confHistory db.ConfigurationHistory
-	query = mysql.Where("configuration_id=? and version =?", param.ID, param.Version).Find(&confHistory)
+	query = mysql.Where("configuration_id=? and version =?", param.ID, param.Version).First(&confHistory)
 	if query.Error != nil {
 		return query.Error
 	}

diff --git a/internal/pkg/service/confgov2/status.go b/internal/pkg/service/confgov2/status.go
@@ -167,7 +167,7 @@ func getUsedStatus(env, zoneCode, filePath string, ipPort string) int {
 }
 
 func getConfigurationStatus(configurationID uint, hostName string) (res db.ConfigurationStatus, err error) {
-	query := mysql.Preload("ConfigurationPublish").Where("configuration_id=? and host_name=?", configurationID, hostName).Order("id desc").Find(&res)
+	query := mysql.Preload("ConfigurationPublish").Where("configuration_id=? and host_name=?", configurationID, hostName).Order("id desc").First(&res)
 	if query.Error != nil {
 		err = query.Error
 		return

diff --git a/internal/pkg/service/resource/app.go b/internal/pkg/service/resource/app.go
@@ -26,9 +26,9 @@ import (
 func (r *resource) GetApp(identify interface{}) (resp db.AppInfo, err error) {
 	switch v := identify.(type) {
 	case string:
-		err = r.DB.Where("app_name = ?", v).Find(&resp).Error
+		err = r.DB.Where("app_name = ?", v).First(&resp).Error
 	case int, uint:
-		err = r.DB.Where("aid=?", v).Find(&resp).Error
+		err = r.DB.Where("aid=?", v).First(&resp).Error
 	default:
 		err = errors.New("identify type error")
 	}

diff --git a/internal/pkg/service/tool.go b/internal/pkg/service/tool.go
@@ -51,7 +51,7 @@ func (t *tool) List(currentPage int, pageSize int, queryObj string) *view.RespTo
 func (t *tool) Detail(id int) *db.ToolInfo {
 	resp := new(db.ToolInfo)
 	invoker.JunoMysql.Table("tool").Select("id, name, url, pic_url, create_time, `desc`").
-		Where("id = ?", id).Find(&resp)
+		Where("id = ?", id).First(&resp)
 	return resp
 }