fix：沙盘切换库

models/sandbox/sandbox.go

@@ -24,14 +24,14 @@ type Sandbox struct {
 
 // Update 沙盘字段变更
 func (sandbox *Sandbox) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(sandbox, cols...)
 	return
 }
 
 // GetSandboxById 根据沙盘id获取沙盘详情
 func GetSandboxById(sandboxId int) (sandboxInfo *Sandbox, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `select * from sandbox where sandbox_id = ? and is_delete = 0`
 	err = o.Raw(sql, sandboxId).QueryRow(&sandboxInfo)
 	return
@@ -39,7 +39,7 @@ func GetSandboxById(sandboxId int) (sandboxInfo *Sandbox, err error) {
 
 // AddNewSandbox 添加一个新的沙盘
 func AddNewSandbox(sandboxInfo *Sandbox, sandboxVersion *SandboxVersion, sandboxDraft *SandboxDraft) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -78,7 +78,7 @@ func AddNewSandbox(sandboxInfo *Sandbox, sandboxVersion *SandboxVersion, sandbox
 
 // UpdateSandbox 更新沙盘
 func UpdateSandbox(sandboxInfo *Sandbox, updateSandboxColumn []string, sandboxVersion *SandboxVersion, sandboxDraft *SandboxDraft) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -116,7 +116,7 @@ func UpdateSandbox(sandboxInfo *Sandbox, updateSandboxColumn []string, sandboxVe
 
 // UpdateSandboxName 更新沙盘（仅仅更新名称）
 func UpdateSandboxName(sandboxInfo *Sandbox, sandboxVersion *SandboxVersion, sandboxDraft *SandboxDraft, updateSandboxColumn, updateSandboxVersionColumn []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -165,7 +165,7 @@ type SandboxListItem struct {
 	OpUserName   string    `description:"最近一次编辑的用户名称（冗余字段，避免查表）"`
 	IsDelete     int8      `description:"是否删除，0：未删除，1：已删除" json:"is_delete"`
 	CanEdit      bool      `description:"是否可编辑"`
-	Editor     string    `description:"编辑人"`
+	Editor       string    `description:"编辑人"`
 	VersionTotal int       `description:"历史版本数量"`
 	ModifyTime   time.Time `description:"修改时间"`
 	CreateTime   time.Time `description:"创建时间"`
@@ -173,7 +173,7 @@ type SandboxListItem struct {
 
 // GetList 获取沙盘列表页
 func GetList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*SandboxListItem, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := "select a.sandbox_id,a.name,a.chart_permission_id,a.chart_permission_name,a.curr_version,a.code,a.pic_url,a.op_user_id,a.op_user_name,a.modify_time,a.create_time,b.version_code from sandbox as a join sandbox_version b on a.sandbox_id=b.sandbox_id and a.curr_version=b.curr_version where 1=1 AND a.is_delete = 0 "
 	sql += condition
 	sql += ` order by a.modify_time desc,a.sandbox_id desc`

models/sandbox/sandbox_draft.go

@@ -21,7 +21,7 @@ type SandboxDraft struct {
 
 // AddSandboxDraft 添加一个新的沙盘草稿
 func AddSandboxDraft(sandboxDraft *SandboxDraft) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	// 新增草稿
 	id, err := o.Insert(sandboxDraft)
 	if err != nil {
@@ -33,7 +33,7 @@ func AddSandboxDraft(sandboxDraft *SandboxDraft) (err error) {
 
 // GetLastSandboxDraftById 根据沙盘id获取最后一条沙盘草稿详情
 func GetLastSandboxDraftById(sandboxId int) (sandboxDraft *SandboxDraft, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `select * from sandbox_draft where sandbox_id = ? order by sandbox_draft_id desc `
 	err = o.Raw(sql, sandboxId).QueryRow(&sandboxDraft)
 	return

models/sandbox/sandbox_version.go

@@ -26,14 +26,14 @@ type SandboxVersion struct {
 
 // Update 沙盘版本字段变更
 func (item *SandboxVersion) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(item, cols...)
 	return
 }
 
 // GetSandboxVersionBySandbox2VersionId 根据沙盘id和版本id获取沙盘版本详情
 func GetSandboxVersionBySandbox2VersionId(sandboxId, sandboxVersion int) (sandboxVersionInfo *SandboxVersion, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `select b.* from sandbox a join sandbox_version b on a.sandbox_id=b.sandbox_id where a.sandbox_id = ? and a.is_delete = 0 and b.is_delete = 0 and b.curr_version = ?`
 	err = o.Raw(sql, sandboxId, sandboxVersion).QueryRow(&sandboxVersionInfo)
 	return
@@ -41,7 +41,7 @@ func GetSandboxVersionBySandbox2VersionId(sandboxId, sandboxVersion int) (sandbo
 
 // GetSandboxVersionBySandboxVersionCode 根据沙盘版本code获取沙盘版本详情
 func GetSandboxVersionBySandboxVersionCode(sandboxVersionCode string) (sandboxVersionInfo *SandboxVersion, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `select b.* from sandbox a join sandbox_version b on a.sandbox_id=b.sandbox_id where a.is_delete = 0 and b.is_delete = 0  and b.version_code = ?`
 	err = o.Raw(sql, sandboxVersionCode).QueryRow(&sandboxVersionInfo)
 	return
@@ -49,7 +49,7 @@ func GetSandboxVersionBySandboxVersionCode(sandboxVersionCode string) (sandboxVe
 
 // GetLastSandboxVersionBySandbox2VersionId 根据沙盘id和版本id获取距离最新的沙盘版本详情
 func GetLastSandboxVersionBySandbox2VersionId(sandboxId, sandboxVersion int) (sandboxVersionInfo *SandboxVersion, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `select b.* from sandbox a join sandbox_version b on a.sandbox_id=b.sandbox_id where a.sandbox_id = ? and a.is_delete = 0 and b.is_delete = 0  and b.curr_version < ? order by b.curr_version desc`
 	err = o.Raw(sql, sandboxId, sandboxVersion).QueryRow(&sandboxVersionInfo)
 	return
@@ -76,7 +76,7 @@ type SandboxVersionListItem struct {
 
 // GetVersionList 获取沙盘版本列表页
 func GetVersionList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*SandboxVersionListItem, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := "select b.sandbox_version_id,b.sandbox_id,b.name,b.chart_permission_id,b.chart_permission_name,b.curr_version,b.version_code,b.pic_url,b.op_user_id,b.op_user_name,b.create_time from sandbox as a join sandbox_version b on a.sandbox_id=b.sandbox_id where 1=1 AND a.is_delete = 0  AND b.is_delete = 0 "
 	sql += condition
 	sql += ` order by b.sandbox_version_id desc`
@@ -93,7 +93,7 @@ func GetVersionList(condition string, pars []interface{}, startSize, pageSize in
 
 // GetTotalSandboxVersionBySandboxId 根据沙盘id获取沙盘版本数量
 func GetTotalSandboxVersionBySandboxId(sandboxId int) (sandboxVersionInfo *SandboxVersion, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `select count(1) total from sandbox_version b where b.sandbox_id = ? and b.is_delete = 0 `
 	err = o.Raw(sql, sandboxId).QueryRow(&sandboxVersionInfo)
 	return
@@ -110,7 +110,7 @@ func GetTotalSandboxVersionBySandboxIdList(sandboxIdList []int) (items []*TotalS
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := `select sandbox_id,count(1) AS total from sandbox_version b where b.sandbox_id in (` + utils.GetOrmInReplace(num) + `) and b.is_delete = 0 GROUP BY sandbox_id`
 	_, err = o.Raw(sql, sandboxIdList).QueryRows(&items)
 	return