From 3d50388ee7852d433f09745c510712ec3071eee4 Mon Sep 17 00:00:00 2001
From: chenwj113 <chenwj113@gmail.com>
Date: Fri, 26 May 2023 23:10:13 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E8=81=94=E8=B5=9B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/v2/mini.go |  2 +-
 models/init.go | 28 +++++++---------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/api/v2/mini.go b/api/v2/mini.go
index 2880566..a9655d4 100644
--- a/api/v2/mini.go
+++ b/api/v2/mini.go
@@ -27,7 +27,7 @@ func GetLeagueList(c *gin.Context) {
 	session := models.DB.Session(&gorm.Session{})
 
 	var leagueList  []FootballLeague
-	session.Find(models.FootballLeague{}).Limit(10).Find(&leagueList)
+	session.Model(&models.FootballLeague{}).Limit(10).Find(&leagueList)
 
 	c.JSON(200, gin.H{
 		"data": leagueList,
diff --git a/models/init.go b/models/init.go
index 68fa2b6..b672ed8 100644
--- a/models/init.go
+++ b/models/init.go
@@ -2,9 +2,7 @@ package models
 
 import (
 	"fmt"
-	"log"
 	"time"
-	"github.com/go-ini/ini"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/driver/mysql"
@@ -13,28 +11,16 @@ import (
 var DB *gorm.DB
 
 func init() {
-	cfgs, err := ini.Load("conf/db.ini")
-	if err != nil {
-		log.Fatalln(err)
-	}
-	section := cfgs.Section("mysql")
-	user := section.Key("user").Value()
-	password := section.Key("password").Value()
-	host := section.Key("host").Value()
-	port , _ := section.Key("port").Int()
-	database := section.Key("database").Value()
-
-	constr := fmt.Sprintf("%s:%s@(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local", user, password, host, port, database)
-	fmt.Println(constr)
-	DB, err = gorm.Open(mysql.Open(constr), &gorm.Config{})
-	sqlDB, _ := DB.DB()
-	// 5秒内连接没有活跃的话则自动关闭连接
-	sqlDB.SetConnMaxLifetime(time.Second * 5)
-
-	DB.Logger = logger.Default.LogMode(logger.Silent)
+	dsn := "root:Chenweijia113!@(172.17.0.1:3306)/lottery?charset=utf8mb4&parseTime=True&loc=Local"
+	var err error
+	DB, err = gorm.Open(mysql.Open(dsn), &gorm.Config{})
 	if err != nil {
 		panic(err)
 	} else {
 		fmt.Println("数据库初始化成功...")
 	}
+	sqlDB, _ := DB.DB()
+	// 5秒内连接没有活跃的话则自动关闭连接
+	sqlDB.SetConnMaxLifetime(time.Second * 5)
+	DB.Logger = logger.Default.LogMode(logger.Silent)
 }
\ No newline at end of file