From 40d9a20780acadc509e7e38cb3e1a9bf8e04e70e Mon Sep 17 00:00:00 2001 From: topnuomi <1130395124@qq.com> Date: Wed, 24 Apr 2024 22:28:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/home/index.go | 29 ++++++++ app/controllers/home/setting.go | 29 ++++++++ app/controllers/websocket/im.go | 116 ++++++++++++++++++++++++++++++++ app/middlewares/auth.go | 18 +++++ app/models/home/books.go | 23 +++++++ app/models/init.go | 17 +++++ common/page/page.go | 29 -------- common/response/response.go | 29 -------- config/common.go | 14 ++++ config/database.go | 3 - controller/index.go | 19 ------ controller/member/index.go | 57 ---------------- controller/shop/index.go | 19 ------ core/controller.go | 16 +++++ core/model.go | 3 + core/server.go | 52 ++++++++++++++ core/websocket_manager.go | 69 +++++++++++++++++++ database/common.go | 18 ----- go.mod | 27 +++++--- go.sum | 70 +++++++++++-------- main.go | 25 ++++--- middleware/auth.go | 9 --- model/user/user.go | 53 --------------- model/usergroup/usergroup.go | 10 --- route/index.go | 11 --- route/member.go | 16 ----- route/shop.go | 14 ---- routers/home.go | 13 ++++ routers/websocket.go | 12 ++++ server/Server.go | 26 ------- test/db_test.go | 59 ++++++++++++++++ utils/tcp/server.go | 28 ++++++++ views/home/about.html | 31 +++++++++ 33 files changed, 603 insertions(+), 361 deletions(-) create mode 100644 app/controllers/home/index.go create mode 100644 app/controllers/home/setting.go create mode 100644 app/controllers/websocket/im.go create mode 100644 app/middlewares/auth.go create mode 100644 app/models/home/books.go create mode 100644 app/models/init.go delete mode 100644 common/page/page.go delete mode 100644 common/response/response.go create mode 100644 config/common.go delete mode 100644 config/database.go delete mode 100644 controller/index.go delete mode 100644 controller/member/index.go delete mode 100644 controller/shop/index.go create mode 100644 core/controller.go create mode 100644 core/model.go create mode 100644 core/server.go create mode 100644 core/websocket_manager.go delete mode 100644 database/common.go delete mode 100644 middleware/auth.go delete mode 100644 model/user/user.go delete mode 100644 model/usergroup/usergroup.go delete mode 100644 route/index.go delete mode 100644 route/member.go delete mode 100644 route/shop.go create mode 100644 routers/home.go create mode 100644 routers/websocket.go delete mode 100644 server/Server.go create mode 100644 test/db_test.go create mode 100644 utils/tcp/server.go create mode 100644 views/home/about.html diff --git a/app/controllers/home/index.go b/app/controllers/home/index.go new file mode 100644 index 0000000..1176699 --- /dev/null +++ b/app/controllers/home/index.go @@ -0,0 +1,29 @@ +package home + +import ( + "net/http" + "site/app/middlewares" + + "github.com/gin-gonic/gin" +) + +type IndexController struct{} + +func NewIndexController() *IndexController { + return &IndexController{} +} + +func (ic *IndexController) Register(rg *gin.RouterGroup) { + rg.GET("/", middlewares.Auth(), ic.Index) + rg.GET("/about", ic.About) +} + +func (ic *IndexController) Index(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{"data": "HelloWorld!"}) +} + +func (ic *IndexController) About(c *gin.Context) { + c.HTML(http.StatusOK, "home/about.html", gin.H{ + "title": "About", + }) +} diff --git a/app/controllers/home/setting.go b/app/controllers/home/setting.go new file mode 100644 index 0000000..afe0aa5 --- /dev/null +++ b/app/controllers/home/setting.go @@ -0,0 +1,29 @@ +package home + +import ( + "net/http" + + "github.com/gin-gonic/gin" +) + +type SettingController struct{} + +func NewSettingController() *SettingController { + return &SettingController{} +} + +func (sc *SettingController) Register(rg *gin.RouterGroup) { + setting := rg.Group("/setting") + { + setting.GET("", sc.Index) + setting.GET("/save", sc.Save) + } +} + +func (sc *SettingController) Index(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{"message": "SettingController->index"}) +} + +func (sc *SettingController) Save(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{"message": "SettingController->save"}) +} diff --git a/app/controllers/websocket/im.go b/app/controllers/websocket/im.go new file mode 100644 index 0000000..e21b39a --- /dev/null +++ b/app/controllers/websocket/im.go @@ -0,0 +1,116 @@ +package websocket + +import ( + "encoding/json" + "fmt" + "log" + "net" + "net/http" + "site/core" + "site/utils/tcp" + + "github.com/gin-gonic/gin" + "github.com/gorilla/websocket" +) + +type ImController struct { + core.Controller + WsManager *core.WebSocketConnManager +} + +func NewImController() *ImController { + return &ImController{ + WsManager: core.NewWebSocketConnManager(), + } +} + +func (ic *ImController) Register(r *gin.RouterGroup) { + r.GET("/ws", ic.WebSocketServer) +} + +type TcpData struct { + ConnId string `json:"conn_id"` + Message string `json:"message"` +} + +func init() { + // 创建一个TCP服务，作为数据发送接口 + go func() { + tcp.NewServer().Listen("127.0.0.1:8081", func(conn net.Conn) { + // 从连接读取数据 + buf := make([]byte, 1024) + n, err := conn.Read(buf) + if err != nil { + log.Println("read error:", err) + } + // 解析数据 + var data TcpData + err = json.Unmarshal(buf[:n], &data) + if err != nil { + log.Println("json unmarshal error:", err) + } + // 发送数据到所有WebSocket连接 + wsManage := core.NewWebSocketConnManager() + wsConn, ok := wsManage.GetConn(data.ConnId) + if ok { + fmt.Printf("conn: %v\n", wsConn) + } + }) + }() +} + +// WebSocket服务 +func (ic *ImController) WebSocketServer(c *gin.Context) { + upgrader := &websocket.Upgrader{ + CheckOrigin: func(r *http.Request) bool { + return true + }, + } + conn, err := upgrader.Upgrade(c.Writer, c.Request, nil) + if err != nil { + http.NotFound(c.Writer, c.Request) + } + + // 生成连接ID并加入到管理器 + connId := ic.UUID() + ic.WsManager.AddConn(connId, conn) + ic.WsManager.SendMessageToUser(connId, []byte("连接ID: "+connId)) + ic.WsManager.SendMessageToAll([]byte("用户" + connId + "上线了")) + + defer ic.closeWebSocketConn(connId) + + log.Printf("连接已建立，连接ID：%s", connId) + + go func() { + tcpConn, err := net.Dial("tcp", "127.0.0.1:8081") + if err != nil { + log.Println("tcp dial error:", err) + } + defer tcpConn.Close() + td := TcpData{ + ConnId: connId, + Message: "hello tcp", + } + sd, _ := json.Marshal(td) + tcpConn.Write([]byte(sd)) + }() + + for { + _, msg, err := conn.ReadMessage() + if err != nil { + ic.closeWebSocketConn(connId) + break + } + log.Println("客户端" + connId + "消息：" + string(msg)) + } +} + +// 关闭连接 +func (ic *ImController) closeWebSocketConn(connId string) { + conn, ok := ic.WsManager.GetConn(connId) + if ok { + log.Printf("连接已关闭，连接ID：%s", connId) + conn.Close() + ic.WsManager.RemoveConn(connId) + } +} diff --git a/app/middlewares/auth.go b/app/middlewares/auth.go new file mode 100644 index 0000000..b6fe2b7 --- /dev/null +++ b/app/middlewares/auth.go @@ -0,0 +1,18 @@ +package middlewares + +import ( + "net/http" + + "github.com/gin-gonic/gin" +) + +func Auth() gin.HandlerFunc { + return func(c *gin.Context) { + if 1 < 2 { + c.JSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"}) + c.Abort() + } else { + c.Next() + } + } +} diff --git a/app/models/home/books.go b/app/models/home/books.go new file mode 100644 index 0000000..701f482 --- /dev/null +++ b/app/models/home/books.go @@ -0,0 +1,23 @@ +package home + +import ( + "site/app/models" + "site/core" +) + +type BookModel struct { + *core.Model + ID int `json:"id"` + Name string `json:"name"` +} + +func (b *BookModel) TableName() string { + return "book" +} + +func (b *BookModel) GetBookById(id int) *BookModel { + book := new(BookModel) + models.DB.Where("id", id).Find(&book) + + return book +} diff --git a/app/models/init.go b/app/models/init.go new file mode 100644 index 0000000..5d07a37 --- /dev/null +++ b/app/models/init.go @@ -0,0 +1,17 @@ +package models + +import ( + "site/config" + + "gorm.io/driver/mysql" + "gorm.io/gorm" +) + +var DB *gorm.DB + +func ConnectDB() error { + var err error + DB, err = gorm.Open(mysql.Open(config.Common.DSN), &gorm.Config{}) + + return err +} diff --git a/common/page/page.go b/common/page/page.go deleted file mode 100644 index 83012da..0000000 --- a/common/page/page.go +++ /dev/null @@ -1,29 +0,0 @@ -package page - -import ( - "strconv" - - "github.com/gin-gonic/gin" -) - -type PageData struct { - PageSize int `json:"page_size"` - PageNumber int `json:"page_number"` - Offset int `json:"-"` - Total interface{} `json:"total"` - Data interface{} `json:"data"` -} - -func Build(ctx *gin.Context, pageSize int) PageData { - s := ctx.Query("p") - i, err := strconv.Atoi(s) - if err != nil { - i = 1 - } - - return PageData{ - PageNumber: i, - PageSize: pageSize, - Offset: (i - 1) * pageSize, - } -} diff --git a/common/response/response.go b/common/response/response.go deleted file mode 100644 index 37d3e06..0000000 --- a/common/response/response.go +++ /dev/null @@ -1,29 +0,0 @@ -package response - -import ( - "net/http" - - "github.com/gin-gonic/gin" -) - -type Struct struct { - Code int `json:"code"` - Message string `json:"message"` - Data interface{} `json:"data"` -} - -func Ok(ctx *gin.Context, resp Struct) { - ctx.JSON(http.StatusOK, resp) -} - -func NotModified(ctx *gin.Context, resp Struct) { - ctx.JSON(http.StatusNotModified, resp) -} - -func NotFound(ctx *gin.Context, resp Struct) { - ctx.JSON(http.StatusNotFound, resp) -} - -func BadRequest(ctx *gin.Context, resp Struct) { - ctx.JSON(http.StatusBadRequest, resp) -} diff --git a/config/common.go b/config/common.go new file mode 100644 index 0000000..75b9005 --- /dev/null +++ b/config/common.go @@ -0,0 +1,14 @@ +package config + +type commonConfig struct { + DSN string +} + +var Common *commonConfig + +func InitCommon() { + // 初始化公共配置 + Common = &commonConfig{ + DSN: "root:888888@tcp(127.0.0.1:3306)/golesson?charset=utf8mb4", + } +} diff --git a/config/database.go b/config/database.go deleted file mode 100644 index 5806d38..0000000 --- a/config/database.go +++ /dev/null @@ -1,3 +0,0 @@ -package config - -var COMMON_DB string = "root:888888@tcp(127.0.0.1:3306)/xjsw?charset=utf8" diff --git a/controller/index.go b/controller/index.go deleted file mode 100644 index f1f0866..0000000 --- a/controller/index.go +++ /dev/null @@ -1,19 +0,0 @@ -package controller - -import ( - "web/common/response" - - "github.com/gin-gonic/gin" -) - -type IndexController struct{} - -func (c *IndexController) Index() gin.HandlerFunc { - return func(ctx *gin.Context) { - response.Ok(ctx, response.Struct{ - Code: 1, - Message: "ok", - Data: "Hello World", - }) - } -} diff --git a/controller/member/index.go b/controller/member/index.go deleted file mode 100644 index b9e6a72..0000000 --- a/controller/member/index.go +++ /dev/null @@ -1,57 +0,0 @@ -package member - -import ( - "strconv" - "web/common/page" - "web/common/response" - "web/model/user" - - "github.com/gin-gonic/gin" -) - -type MemberController struct{} - -func (c *MemberController) Index() gin.HandlerFunc { - u := user.GetUser() - return func(ctx *gin.Context) { - response.Ok(ctx, response.Struct{ - Code: 1, - Message: "ok", - Data: u, - }) - } -} - -func (c *MemberController) Update() gin.HandlerFunc { - return func(ctx *gin.Context) { - i := ctx.PostForm("id") - name := ctx.PostForm("name") - id, _ := strconv.Atoi(i) - - if user.SetName(id, name) { - response.Ok(ctx, response.Struct{ - Code: 1, - Message: "ok", - Data: id, - }) - } else { - response.BadRequest(ctx, response.Struct{ - Code: 0, - Message: "error", - Data: nil, - }) - } - } -} - -func (c *MemberController) List() gin.HandlerFunc { - return func(ctx *gin.Context) { - pd := page.Build(ctx, 1) - data := user.GetUserList(pd) - response.Ok(ctx, response.Struct{ - Code: 1, - Message: "ok", - Data: data, - }) - } -} diff --git a/controller/shop/index.go b/controller/shop/index.go deleted file mode 100644 index 4dd3ab4..0000000 --- a/controller/shop/index.go +++ /dev/null @@ -1,19 +0,0 @@ -package shop - -import ( - "web/common/response" - - "github.com/gin-gonic/gin" -) - -type ShopController struct{} - -func (c *ShopController) Index() gin.HandlerFunc { - return func(ctx *gin.Context) { - response.Ok(ctx, response.Struct{ - Code: 1, - Message: "shop/index", - Data: nil, - }) - } -} diff --git a/core/controller.go b/core/controller.go new file mode 100644 index 0000000..1cc15be --- /dev/null +++ b/core/controller.go @@ -0,0 +1,16 @@ +package core + +import ( + "github.com/gin-gonic/gin" + "github.com/google/uuid" +) + +type ControllerInterface interface { + Register(server *gin.RouterGroup) +} + +type Controller struct{} + +func (c *Controller) UUID() string { + return uuid.New().String() +} diff --git a/core/model.go b/core/model.go new file mode 100644 index 0000000..80d801e --- /dev/null +++ b/core/model.go @@ -0,0 +1,3 @@ +package core + +type Model struct{} diff --git a/core/server.go b/core/server.go new file mode 100644 index 0000000..eb0dbfa --- /dev/null +++ b/core/server.go @@ -0,0 +1,52 @@ +package core + +import ( + "github.com/gin-gonic/gin" +) + +type Server struct { + Engine *gin.Engine +} + +func NewServer(release bool, templatesDir string) *Server { + if release { + gin.SetMode(gin.ReleaseMode) + } + + s := &Server{ + Engine: gin.New(), + } + + // 加载模板目录 + if templatesDir != "" { + s.Engine.LoadHTMLGlob(templatesDir) + } + + return s +} + +// 注册路由 +func (s *Server) registerRouters(rg *gin.RouterGroup, controllers ...ControllerInterface) { + for _, v := range controllers { + v.Register(rg) + } +} + +// 直接注册 +func (s *Server) Router(controllers ...ControllerInterface) *Server { + s.registerRouters(s.Engine.Group("/"), controllers...) + return s +} + +// 整体分组注册 +func (s *Server) RouterGroup(group string, controllers ...ControllerInterface) *Server { + rg := s.Engine.Group(group) + s.registerRouters(rg, controllers...) + + return s +} + +// 运行服务 +func (s *Server) Run(addr string) { + s.Engine.Run(addr) +} diff --git a/core/websocket_manager.go b/core/websocket_manager.go new file mode 100644 index 0000000..aa1848e --- /dev/null +++ b/core/websocket_manager.go @@ -0,0 +1,69 @@ +package core + +import ( + "github.com/gorilla/websocket" +) + +// WebSocketConnManager 管理WebSocket连接 +type WebSocketConnManager struct { + ConnMap map[string]*websocket.Conn +} + +// 创建一个新的WebSocketConnManager +func NewWebSocketConnManager() *WebSocketConnManager { + return &WebSocketConnManager{ + ConnMap: make(map[string]*websocket.Conn), + } +} + +// 添加连接 +func (ws *WebSocketConnManager) AddConn(id string, conn *websocket.Conn) { + ws.ConnMap[id] = conn +} + +// 根据ID移除连接 +func (ws *WebSocketConnManager) RemoveConn(id string) { + delete(ws.ConnMap, id) +} + +// 根据ID获取连接 +func (ws *WebSocketConnManager) GetConn(id string) (*websocket.Conn, bool) { + conn, ok := ws.ConnMap[id] + return conn, ok +} + +// 向所有连接发送消息 +func (ws *WebSocketConnManager) SendMessageToAll(message []byte) { + for _, conn := range ws.ConnMap { + err := conn.WriteMessage(websocket.TextMessage, message) + if err != nil { + continue + } + } +} + +// 向特定用户发送消息 +func (ws *WebSocketConnManager) SendMessageToUser(id string, message []byte) { + conn, ok := ws.GetConn(id) + if !ok { + return + } + err := conn.WriteMessage(websocket.TextMessage, message) + if err != nil { + return + } +} + +// 向多个用户发送消息 +func (ws *WebSocketConnManager) SendMessageToUsers(ids []string, message []byte) { + for _, id := range ids { + conn, ok := ws.GetConn(id) + if !ok { + continue + } + err := conn.WriteMessage(websocket.TextMessage, message) + if err != nil { + continue + } + } +} diff --git a/database/common.go b/database/common.go deleted file mode 100644 index 813b02b..0000000 --- a/database/common.go +++ /dev/null @@ -1,18 +0,0 @@ -package database - -import ( - "web/config" - - "gorm.io/driver/mysql" - "gorm.io/gorm" -) - -var DB *gorm.DB - -func InitDB() { - var err error - DB, err = gorm.Open(mysql.Open(config.COMMON_DB), &gorm.Config{}) - if err != nil { - panic("数据库连接失败") - } -} diff --git a/go.mod b/go.mod index 3553f90..b70ddd9 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,12 @@ -module web +module site go 1.19 require ( github.com/gin-gonic/gin v1.9.1 - gorm.io/driver/mysql v1.5.1 - gorm.io/gorm v1.25.2 + github.com/gorilla/websocket v1.5.1 + gorm.io/driver/mysql v1.5.4 + gorm.io/gorm v1.25.7 ) require ( @@ -18,22 +19,28 @@ require ( github.com/go-playground/validator/v10 v10.14.0 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/goccy/go-json v0.10.2 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect + github.com/kr/pretty v0.3.1 // indirect github.com/leodido/go-urn v1.2.4 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.0.8 // indirect + github.com/pelletier/go-toml/v2 v2.1.1 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/stretchr/testify v1.9.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.11 // indirect golang.org/x/arch v0.3.0 // indirect - golang.org/x/crypto v0.9.0 // indirect - golang.org/x/net v0.10.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect - google.golang.org/protobuf v1.30.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/text v0.14.0 // indirect + google.golang.org/protobuf v1.32.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 9e76438..3709b08 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,7 @@ github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZX github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -24,10 +25,13 @@ github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= @@ -37,19 +41,30 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= -github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= +github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= +github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -59,8 +74,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= @@ -68,29 +84,27 @@ github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZ golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/driver/mysql v1.5.1 h1:WUEH5VF9obL/lTtzjmML/5e6VfFR/788coz2uaVCAZw= -gorm.io/driver/mysql v1.5.1/go.mod h1:Jo3Xu7mMhCyj8dlrb3WoCaRd1FhsVh+yMXb1jUInf5o= -gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= -gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho= -gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/driver/mysql v1.5.4 h1:igQmHfKcbaTVyAIHNhhB888vvxh8EdQ2uSUT0LPcBso= +gorm.io/driver/mysql v1.5.4/go.mod h1:9rYxJph/u9SWkWc9yY4XJ1F/+xO0S/ChOmbk3+Z5Tvs= +gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= +gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A= +gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/main.go b/main.go index edb0157..a64cb85 100644 --- a/main.go +++ b/main.go @@ -1,20 +1,25 @@ package main import ( - "web/database" - "web/route" - "web/server" + "site/config" + "site/core" + "site/routers" ) func main() { - s := server.Init() + // 初始化服务 + s := core.NewServer(true, "views/**/*") - database.InitDB() + // 初始化配置 + config.InitCommon() - // 注册模块路由 - route.RegistIndex(s) - route.RegistMember(s) - route.RegistShop(s) + // 初始化数据库 + // models.ConnectDB() - s.Listen(":8080") + // 注册路由 + routers.RegisterHome(s) + routers.RegisterWebSocket(s) + + // 启动服务 + s.Run(":8080") } diff --git a/middleware/auth.go b/middleware/auth.go deleted file mode 100644 index 7eff528..0000000 --- a/middleware/auth.go +++ /dev/null @@ -1,9 +0,0 @@ -package middleware - -import ( - "github.com/gin-gonic/gin" -) - -func Auth(ctx *gin.Context) { - ctx.Next() -} diff --git a/model/user/user.go b/model/user/user.go deleted file mode 100644 index 76ac61b..0000000 --- a/model/user/user.go +++ /dev/null @@ -1,53 +0,0 @@ -package user - -import ( - "web/common/page" - "web/database" - "web/model/usergroup" -) - -type User struct { - ID int `gorm:"primaryKey;column:id" json:"id"` - Username string `gorm:"column:username" json:"username"` - GroupID int `gorm:"column:group_id" json:"group_id"` - UserGroup usergroup.UserGroup `gorm:"foreignKey:ID;references:GroupID" json:"user_group"` -} - -func (User) TableName() string { - return "users" -} - -func GetUser() User { - u := User{} - database.DB.Preload("UserGroup").First(&u, "id = ?", 2) - - return u -} - -func GetUserList(pd page.PageData) page.PageData { - var ( - list []User - count int64 - ) - database.DB.Model(&User{}). - Count(&count). - Preload("UserGroup"). - Limit(pd.PageSize). - Offset(pd.Offset). - Find(&list) - - pd.Data = list - pd.Total = count - - return pd -} - -func SetName(id int, name string) bool { - u := User{ - ID: id, - Username: name, - } - d := database.DB.Save(&u) - - return d.Error == nil -} diff --git a/model/usergroup/usergroup.go b/model/usergroup/usergroup.go deleted file mode 100644 index bd03e80..0000000 --- a/model/usergroup/usergroup.go +++ /dev/null @@ -1,10 +0,0 @@ -package usergroup - -type UserGroup struct { - ID int `gorm:"primaryKey;column:id" json:"id"` - Name string `gorm:"column:name" json:"name"` -} - -func (UserGroup) TableName() string { - return "users_group" -} diff --git a/route/index.go b/route/index.go deleted file mode 100644 index 13752c8..0000000 --- a/route/index.go +++ /dev/null @@ -1,11 +0,0 @@ -package route - -import ( - "web/controller" - "web/server" -) - -func RegistIndex(s *server.Server) { - c := controller.IndexController{} - s.GET("/", c.Index()) -} diff --git a/route/member.go b/route/member.go deleted file mode 100644 index 42087d9..0000000 --- a/route/member.go +++ /dev/null @@ -1,16 +0,0 @@ -package route - -import ( - "web/controller/member" - "web/middleware" - "web/server" -) - -func RegistMember(s *server.Server) { - rg := s.Group("member", middleware.Auth) - - c := &member.MemberController{} - rg.GET("/", c.Index()) - rg.POST("update", c.Update()) - rg.GET("list", c.List()) -} diff --git a/route/shop.go b/route/shop.go deleted file mode 100644 index 884e8a5..0000000 --- a/route/shop.go +++ /dev/null @@ -1,14 +0,0 @@ -package route - -import ( - "web/controller/shop" - "web/server" -) - -func RegistShop(s *server.Server) { - - rg := s.Group("shop") - - c := &shop.ShopController{} - rg.GET("/", c.Index()) -} diff --git a/routers/home.go b/routers/home.go new file mode 100644 index 0000000..1ea6de1 --- /dev/null +++ b/routers/home.go @@ -0,0 +1,13 @@ +package routers + +import ( + "site/app/controllers/home" + "site/core" +) + +func RegisterHome(s *core.Server) { + s.Router( + home.NewIndexController(), + home.NewSettingController(), + ) +} diff --git a/routers/websocket.go b/routers/websocket.go new file mode 100644 index 0000000..5a5439e --- /dev/null +++ b/routers/websocket.go @@ -0,0 +1,12 @@ +package routers + +import ( + "site/app/controllers/websocket" + "site/core" +) + +func RegisterWebSocket(s *core.Server) { + s.Router( + websocket.NewImController(), + ) +} diff --git a/server/Server.go b/server/Server.go deleted file mode 100644 index eee4d41..0000000 --- a/server/Server.go +++ /dev/null @@ -1,26 +0,0 @@ -package server - -import ( - "github.com/gin-gonic/gin" -) - -type Server struct { - *gin.Engine -} - -// Init -// 初始化 -// -// @return *Server -func Init() *Server { - return &Server{Engine: gin.New()} -} - -// Listen -// 启动服务 -// -// @receiver s -// @param addr -func (s *Server) Listen(addr string) { - s.Run(addr) -} diff --git a/test/db_test.go b/test/db_test.go new file mode 100644 index 0000000..3387755 --- /dev/null +++ b/test/db_test.go @@ -0,0 +1,59 @@ +package test + +import ( + "site/app/models" + "site/app/models/home" + "testing" +) + +func init() { + // 连接数据库 + models.ConnectDB() +} + +// 测试数据库连接 +func TestDbConnect(t *testing.T) { + if models.DB == nil { + t.Error("db connect failed") + } +} + +// 测试查询 +func TestFind(t *testing.T) { + book := new(home.BookModel) + models.DB.Find(&book) + if book.ID == 0 { + t.Error("not found") + } +} + +// 测试创建 +func TestCreate(t *testing.T) { + models.DB.Create(&home.BookModel{ + Name: "<>", + }) + if models.DB.Error != nil { + t.Error(models.DB.Error) + } +} + +// 测试修改 +func TestUpdate(t *testing.T) { + models.DB. + Model(&home.BookModel{}). + Where("name = ?", "<>"). + Update("name", "<>") + if models.DB.Error != nil { + t.Error(models.DB.Error) + } +} + +// 测试删除 +func TestDelete(t *testing.T) { + models.DB. + Where("name = ?", "<>"). + Delete(&home.BookModel{}) + if models.DB.Error != nil { + t.Error(models.DB.Error) + } +} diff --git a/utils/tcp/server.go b/utils/tcp/server.go new file mode 100644 index 0000000..9798c63 --- /dev/null +++ b/utils/tcp/server.go @@ -0,0 +1,28 @@ +package tcp + +import ( + "log" + "net" +) + +type Server struct{} + +func NewServer() *Server { + return &Server{} +} + +func (s *Server) Listen(addr string, handler func(net.Conn)) { + tcpServer, err := net.Listen("tcp", addr) + if err != nil { + log.Fatal(err) + } + defer tcpServer.Close() + + for { + tcpServerConn, err := tcpServer.Accept() + if err != nil { + log.Fatal(err) + } + handler(tcpServerConn) + } +} diff --git a/views/home/about.html b/views/home/about.html new file mode 100644 index 0000000..a0ca7b2 --- /dev/null +++ b/views/home/about.html @@ -0,0 +1,31 @@ +{{define "home/about.html"}} + + + + + + + {{.title}} + + + + + + + +{{end}} \ No newline at end of file