adjust table name code

main.go

@@ -9,7 +9,6 @@ import (
 	"message-nest/models"
 	"message-nest/pkg/logging"
 	"message-nest/pkg/setting"
-	"message-nest/pkg/table"
 	"message-nest/routers"
 	"message-nest/service/cron_service"
 	"message-nest/service/env_service"
@@ -27,7 +26,6 @@ func init() {
 	logging.Setup()
 	migrate.Setup()
 	models.Setup()
-	table.Setup()
 	env_service.Setup()
 	cron_service.Setup()
 }

models/send_tasks.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"github.com/google/uuid"
 	"github.com/jinzhu/gorm"
-	"message-nest/pkg/table"
 )
 
 type SendTasks struct {
@@ -103,10 +102,10 @@ type TaskIns struct {
 	InsData []SendTasksInsRes `json:"ins_data"`
 }
 
-// GetSendTasksTotal 获取所有任务下所有的实例
+// GetTasksIns 获取所有任务下所有的实例
 func GetTasksIns(id string) (TaskIns, error) {
-	insTable := table.InsTableName
+	insTable := db.NewScope(SendTasksIns{}).TableName()
-	waysTable := table.WayTableName
+	waysTable := db.NewScope(SendWays{}).TableName()
 	var (
 		task       SendTasks
 		taskIns    []SendTasksInsRes
@@ -133,8 +132,8 @@ func GetTasksIns(id string) (TaskIns, error) {
 
 // FindTaskByWayId 通过way_id找到关联的任务
 func FindTaskByWayId(wayId string) []SendTasks {
-	insTable := table.InsTableName
+	insTable := db.NewScope(SendTasksIns{}).TableName()
-	taskTable := table.TasksTableName
+	taskTable := db.NewScope(SendTasks{}).TableName()
 	var (
 		tasks []SendTasks
 	)

models/send_tasks_logs.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	"fmt"
-	"message-nest/pkg/table"
 	"message-nest/pkg/util"
 )
 
@@ -38,8 +37,8 @@ type LogsResult struct {
 // GetSendLogs 获取所有日志记录
 func GetSendLogs(pageNum int, pageSize int, name string, taskId string, maps interface{}) ([]LogsResult, error) {
 	var logs []LogsResult
-	logt := table.LogsTableName
+	logt := db.NewScope(SendTasksLogs{}).TableName()
-	taskt := table.TasksTableName
+	taskt := db.NewScope(SendTasks{}).TableName()
 
 	query := db.
 		Table(logt).
@@ -64,8 +63,8 @@ func GetSendLogs(pageNum int, pageSize int, name string, taskId string, maps int
 // GetSendLogsTotal 获取所有日志总数
 func GetSendLogsTotal(name string, taskId string, maps interface{}) (int, error) {
 	var total int
-	logt := table.LogsTableName
+	logt := db.NewScope(SendTasksLogs{}).TableName()
-	taskt := table.TasksTableName
+	taskt := db.NewScope(SendTasks{}).TableName()
 	query := db.
 		Table(logt).
 		Joins(fmt.Sprintf("LEFT JOIN %s ON %s.task_id = %s.id", taskt, logt, taskt))
@@ -82,7 +81,7 @@ func GetSendLogsTotal(name string, taskId string, maps interface{}) (int, error)
 // GetSendLogsTotal 获取所有日志总数
 func DeleteOutDateLogs(keepNum int) (int, error) {
 	var affectedRows int
-	logt := table.LogsTableName
+	logt := db.NewScope(SendTasksLogs{}).TableName()
 	sql := fmt.Sprintf(`DELETE FROM %s
 			WHERE id NOT IN (
 				SELECT id FROM (

models/settings.go

@@ -3,7 +3,6 @@ package models
 import (
 	"errors"
 	"github.com/jinzhu/gorm"
-	"message-nest/pkg/table"
 )
 
 type Settings struct {
@@ -50,7 +49,7 @@ func GetSettingByKey(section string, key string) (Settings, error) {
 
 func GetSettingBySection(section string) ([]Settings, error) {
 	var settings []Settings
-	err := db.Table(table.SettingsTableName).Where("`section` = ? ", section).Scan(&settings).Error
+	err := db.Table(db.NewScope(Settings{}).TableName()).Where("`section` = ? ", section).Scan(&settings).Error
 	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
 		return settings, err
 	}

pkg/table/table.go

@@ -1,20 +0,0 @@
-package table
-
-import (
-	"fmt"
-	"message-nest/pkg/setting"
-)
-
-var InsTableName string
-var WayTableName string
-var LogsTableName string
-var TasksTableName string
-var SettingsTableName string
-
-func Setup() {
-	InsTableName = fmt.Sprintf("%ssend_tasks_ins", setting.DatabaseSetting.TablePrefix)
-	WayTableName = fmt.Sprintf("%ssend_ways", setting.DatabaseSetting.TablePrefix)
-	LogsTableName = fmt.Sprintf("%ssend_tasks_logs", setting.DatabaseSetting.TablePrefix)
-	TasksTableName = fmt.Sprintf("%ssend_tasks", setting.DatabaseSetting.TablePrefix)
-	SettingsTableName = fmt.Sprintf("%ssettings", setting.DatabaseSetting.TablePrefix)
-}