From 885f5a44d63a8c12b9b469a56a9b838db3f92624 Mon Sep 17 00:00:00 2001
From: chenwj <654891551@qq.com>
Date: Sat, 27 May 2023 17:32:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {api => src/api}/v1/init.go    |  0
 {api => src/api}/v1/sign.go    |  2 +-
 {api => src/api}/v2/init.go    |  1 +
 {api => src/api}/v2/mini.go    | 23 ++++++++++++++++++++++-
 {models => src/models}/init.go |  2 +-
 src/models/tabs.go             | 14 ++++++++++++++
 {util => src/utils}/sign.go    |  0
 7 files changed, 39 insertions(+), 3 deletions(-)
 rename {api => src/api}/v1/init.go (100%)
 rename {api => src/api}/v1/sign.go (95%)
 rename {api => src/api}/v2/init.go (85%)
 rename {api => src/api}/v2/mini.go (64%)
 rename {models => src/models}/init.go (82%)
 create mode 100644 src/models/tabs.go
 rename {util => src/utils}/sign.go (100%)

diff --git a/api/v1/init.go b/src/api/v1/init.go
similarity index 100%
rename from api/v1/init.go
rename to src/api/v1/init.go
diff --git a/api/v1/sign.go b/src/api/v1/sign.go
similarity index 95%
rename from api/v1/sign.go
rename to src/api/v1/sign.go
index f385106..eb512d4 100644
--- a/api/v1/sign.go
+++ b/src/api/v1/sign.go
@@ -3,7 +3,7 @@ package v1
 import(
 	"log"
 	"github.com/gin-gonic/gin"
-	"wx-backend-go/util"
+	"wx-backend-go/src/utils"
 )
 
 const Token = "aaa325"
diff --git a/api/v2/init.go b/src/api/v2/init.go
similarity index 85%
rename from api/v2/init.go
rename to src/api/v2/init.go
index 078669a..5973430 100644
--- a/api/v2/init.go
+++ b/src/api/v2/init.go
@@ -6,4 +6,5 @@ func InitRouters(prefix string, e *gin.Engine) {
 	g := e.Group(prefix)
 	g.GET("", Greeting)
 	g.GET("/league/list", GetLeagueList)
+	g.GET("/tabs", GetTabsList)
 }
\ No newline at end of file
diff --git a/api/v2/mini.go b/src/api/v2/mini.go
similarity index 64%
rename from api/v2/mini.go
rename to src/api/v2/mini.go
index a9655d4..d272a89 100644
--- a/api/v2/mini.go
+++ b/src/api/v2/mini.go
@@ -4,7 +4,7 @@ import (
 	"time"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
-	"wx-backend-go/models"
+	"wx-backend-go/src/models"
 
 )
 
@@ -23,6 +23,11 @@ type FootballLeague struct {
 	CreatedAt     time.Time `json:"created_at"`
 }
 
+type Tabs struct {
+	ID   int    `json:"id"`
+	Name string `json:"name"`
+}
+
 func GetLeagueList(c *gin.Context) {
 	session := models.DB.Session(&gorm.Session{})
 
@@ -33,4 +38,20 @@ func GetLeagueList(c *gin.Context) {
 		"data": leagueList,
 	})
 	
+}
+
+
+func GetTabsList(c *gin.Context) {
+	session := models.DB.Session(&gorm.Session{})
+
+	var tabsList []Tabs
+	session.Model(&models.Tabs{}).Find(&tabsList)
+
+	// var result map[string]map
+
+	c.JSON(200, gin.H{
+
+		"data": tabsList,
+	})
+
 }
\ No newline at end of file
diff --git a/models/init.go b/src/models/init.go
similarity index 82%
rename from models/init.go
rename to src/models/init.go
index b672ed8..9b6e8cb 100644
--- a/models/init.go
+++ b/src/models/init.go
@@ -11,7 +11,7 @@ import (
 var DB *gorm.DB
 
 func init() {
-	dsn := "root:Chenweijia113!@(172.17.0.1:3306)/lottery?charset=utf8mb4&parseTime=True&loc=Local"
+	dsn := "root:123456@(127.0.0.1:3306)/weixin?charset=utf8mb4&parseTime=True&loc=Local"
 	var err error
 	DB, err = gorm.Open(mysql.Open(dsn), &gorm.Config{})
 	if err != nil {
diff --git a/src/models/tabs.go b/src/models/tabs.go
new file mode 100644
index 0000000..28d44cc
--- /dev/null
+++ b/src/models/tabs.go
@@ -0,0 +1,14 @@
+package models
+
+type Tabs struct {
+	ID   int    `gorm:"primaryKey;column:id;type:int;not null"`
+	Name string `gorm:"column:name;type:varchar(255);default:null"`
+}
+
+
+
+// TableName 解决gorm表明映射
+func (Tabs) TableName() string {
+	return "tabs"
+}
+
diff --git a/util/sign.go b/src/utils/sign.go
similarity index 100%
rename from util/sign.go
rename to src/utils/sign.go