From c43b23232c61c8e98178c5fc7170c00bf68240e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com> Date: Tue, 8 Aug 2023 15:19:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9B=AE=E5=BD=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/database.go | 2 +- {controllers => controller}/index.go | 2 +- {controllers => controller}/member/index.go | 2 +- {controllers => controller}/shop/index.go | 0 database/common.go | 2 +- main.go | 8 ++++---- {middlewares => middleware}/auth.go | 2 +- {models => model}/user/user.go | 2 +- {models => model}/usergroup/usergroup.go | 0 {routes => route}/index.go | 6 +++--- {routes => route}/member.go | 8 ++++---- {routes => route}/shop.go | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) rename {controllers => controller}/index.go (93%) rename {controllers => controller}/member/index.go (98%) rename {controllers => controller}/shop/index.go (100%) rename {middlewares => middleware}/auth.go (80%) rename {models => model}/user/user.go (97%) rename {models => model}/usergroup/usergroup.go (100%) rename {routes => route}/index.go (55%) rename {routes => route}/member.go (63%) rename {routes => route}/shop.go (78%) diff --git a/config/database.go b/config/database.go index d7b9952..5806d38 100644 --- a/config/database.go +++ b/config/database.go @@ -1,3 +1,3 @@ package config -var DSN string = "root:888888@tcp(127.0.0.1:3306)/dbname?charset=utf8" +var COMMON_DB string = "root:888888@tcp(127.0.0.1:3306)/xjsw?charset=utf8" diff --git a/controllers/index.go b/controller/index.go similarity index 93% rename from controllers/index.go rename to controller/index.go index 3e5384a..f1f0866 100644 --- a/controllers/index.go +++ b/controller/index.go @@ -1,4 +1,4 @@ -package controllers +package controller import ( "web/common/response" diff --git a/controllers/member/index.go b/controller/member/index.go similarity index 98% rename from controllers/member/index.go rename to controller/member/index.go index a92e051..b9e6a72 100644 --- a/controllers/member/index.go +++ b/controller/member/index.go @@ -4,7 +4,7 @@ import ( "strconv" "web/common/page" "web/common/response" - "web/models/user" + "web/model/user" "github.com/gin-gonic/gin" ) diff --git a/controllers/shop/index.go b/controller/shop/index.go similarity index 100% rename from controllers/shop/index.go rename to controller/shop/index.go diff --git a/database/common.go b/database/common.go index 15500cf..813b02b 100644 --- a/database/common.go +++ b/database/common.go @@ -11,7 +11,7 @@ var DB *gorm.DB func InitDB() { var err error - DB, err = gorm.Open(mysql.Open(config.DSN), &gorm.Config{}) + DB, err = gorm.Open(mysql.Open(config.COMMON_DB), &gorm.Config{}) if err != nil { panic("数据库连接失败") } diff --git a/main.go b/main.go index 4192171..edb0157 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,7 @@ package main import ( "web/database" - "web/routes" + "web/route" "web/server" ) @@ -12,9 +12,9 @@ func main() { database.InitDB() // 注册模块路由 - routes.RegistIndex(s) - routes.RegistMember(s) - routes.RegistShop(s) + route.RegistIndex(s) + route.RegistMember(s) + route.RegistShop(s) s.Listen(":8080") } diff --git a/middlewares/auth.go b/middleware/auth.go similarity index 80% rename from middlewares/auth.go rename to middleware/auth.go index 842ebdc..7eff528 100644 --- a/middlewares/auth.go +++ b/middleware/auth.go @@ -1,4 +1,4 @@ -package middlewares +package middleware import ( "github.com/gin-gonic/gin" diff --git a/models/user/user.go b/model/user/user.go similarity index 97% rename from models/user/user.go rename to model/user/user.go index 068732c..76ac61b 100644 --- a/models/user/user.go +++ b/model/user/user.go @@ -3,7 +3,7 @@ package user import ( "web/common/page" "web/database" - "web/models/usergroup" + "web/model/usergroup" ) type User struct { diff --git a/models/usergroup/usergroup.go b/model/usergroup/usergroup.go similarity index 100% rename from models/usergroup/usergroup.go rename to model/usergroup/usergroup.go diff --git a/routes/index.go b/route/index.go similarity index 55% rename from routes/index.go rename to route/index.go index 975f1e2..13752c8 100644 --- a/routes/index.go +++ b/route/index.go @@ -1,11 +1,11 @@ -package routes +package route import ( - "web/controllers" + "web/controller" "web/server" ) func RegistIndex(s *server.Server) { - c := controllers.IndexController{} + c := controller.IndexController{} s.GET("/", c.Index()) } diff --git a/routes/member.go b/route/member.go similarity index 63% rename from routes/member.go rename to route/member.go index a5fa157..42087d9 100644 --- a/routes/member.go +++ b/route/member.go @@ -1,13 +1,13 @@ -package routes +package route import ( - "web/controllers/member" - "web/middlewares" + "web/controller/member" + "web/middleware" "web/server" ) func RegistMember(s *server.Server) { - rg := s.Group("member", middlewares.Auth) + rg := s.Group("member", middleware.Auth) c := &member.MemberController{} rg.GET("/", c.Index()) diff --git a/routes/shop.go b/route/shop.go similarity index 78% rename from routes/shop.go rename to route/shop.go index 5b99041..884e8a5 100644 --- a/routes/shop.go +++ b/route/shop.go @@ -1,7 +1,7 @@ -package routes +package route import ( - "web/controllers/shop" + "web/controller/shop" "web/server" )