This commit is contained in:
Sense T
2024-04-09 16:28:18 +08:00
parent 2369734230
commit 7dd3af3707
20 changed files with 419 additions and 392 deletions

View File

@@ -2,13 +2,14 @@ package server
import (
"net/http"
"reCoreD-UI/controllers"
"reCoreD-UI/models"
"github.com/gin-gonic/gin"
)
func (s *Server) getDomains(c *gin.Context) {
domains, err := s.controller.GetDomains("")
domains, err := controllers.GetDomains("")
if err != nil {
errorHandler(c, err)
return
@@ -31,7 +32,7 @@ func (s *Server) createDomain(c *gin.Context) {
return
}
domain, err := s.controller.CreateDomain(domain)
domain, err := controllers.CreateDomain(domain)
if err != nil {
errorHandler(c, err)
return
@@ -54,7 +55,7 @@ func (s *Server) updateDomain(c *gin.Context) {
return
}
if err := s.controller.UpdateDomain(domain); err != nil {
if err := controllers.UpdateDomain(domain); err != nil {
errorHandler(c, err)
return
}
@@ -66,7 +67,7 @@ func (s *Server) updateDomain(c *gin.Context) {
func (s *Server) deleteDomain(c *gin.Context) {
id := c.Param("id")
if err := s.controller.DeleteDomain(id); err != nil {
if err := controllers.DeleteDomain(id); err != nil {
errorHandler(c, err)
return
}

View File

@@ -1,14 +1,16 @@
package server
import (
"fmt"
"net/http"
"reCoreD-UI/controllers"
"reCoreD-UI/models"
"github.com/gin-gonic/gin"
)
func (s *Server) getRecords(c *gin.Context) {
query := make(map[string]string)
query := models.Record{}
if err := c.BindQuery(&query); err != nil {
c.JSON(http.StatusBadRequest, Response{
Succeed: false,
@@ -17,9 +19,9 @@ func (s *Server) getRecords(c *gin.Context) {
return
}
domain := c.Param("domain")
query["zone"] = domain
query.Zone = fmt.Sprintf("%s.", domain)
records, err := s.controller.GetRecords(query)
records, err := controllers.GetRecords(query)
if err != nil {
errorHandler(c, err)
return
@@ -50,15 +52,15 @@ func (s *Server) createRecord(c *gin.Context) {
return
}
record, err := s.controller.CreateRecord(record)
if err != nil {
record, err := controllers.CreateRecord(record)
if err != nil {
errorHandler(c, err)
return
}
c.JSON(http.StatusCreated, Response{
Succeed: true,
Data: record,
Data: record,
})
}
@@ -72,7 +74,7 @@ func (s *Server) createRecords(c *gin.Context) {
return
}
if err := s.controller.CreateRecords(records); err != nil {
if err := controllers.CreateRecords(records); err != nil {
errorHandler(c, err)
return
}
@@ -101,7 +103,7 @@ func (s *Server) updateRecord(c *gin.Context) {
return
}
if err := s.controller.UpdateRecord(record); err != nil {
if err := controllers.UpdateRecord(record); err != nil {
errorHandler(c, err)
return
}
@@ -115,7 +117,7 @@ func (s *Server) deleteRecord(c *gin.Context) {
domain := c.Param("domain")
id := c.Param("id")
if err := s.controller.DeleteRecord(domain, id); err != nil {
if err := controllers.DeleteRecord(domain, id); err != nil {
errorHandler(c, err)
return
}

View File

@@ -1,10 +1,12 @@
package server
import (
"errors"
"net/http"
"github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
"gorm.io/gorm"
)
type Response struct {
@@ -15,9 +17,16 @@ type Response struct {
func errorHandler(c *gin.Context, err error) {
logrus.Error(err)
c.JSON(http.StatusInternalServerError, Response{
Succeed: false,
Message: err.Error(),
Data: nil,
})
if errors.Is(err, gorm.ErrRecordNotFound) {
c.JSON(http.StatusNotFound, Response{
Succeed: false,
Message: err.Error(),
})
} else {
c.JSON(http.StatusInternalServerError, Response{
Succeed: false,
Message: err.Error(),
Data: nil,
})
}
}

View File

@@ -2,6 +2,7 @@ package server
import (
"path"
"reCoreD-UI/controllers"
"strings"
"github.com/gin-gonic/gin"
@@ -15,14 +16,14 @@ const (
)
func (s *Server) setupRoute() {
username, password, err := s.controller.GetAdmin()
username, password, err := controllers.GetAdmin()
if err != nil {
logrus.Fatal(err)
}
metricHandler := gin.New()
metricHandler.GET(metricPrefix, func(ctx *gin.Context) {
if err := s.controller.RefreshMetrics(); err != nil {
if err := controllers.RefreshMetrics(); err != nil {
logrus.Error(err)
}
promhttp.Handler().ServeHTTP(ctx.Writer, ctx.Request)

View File

@@ -2,7 +2,7 @@ package server
import (
"net"
"reCoreD-UI/controllers"
"reCoreD-UI/database"
"github.com/gin-gonic/gin"
"github.com/sirupsen/logrus"
@@ -10,21 +10,18 @@ import (
)
type Server struct {
controller *controllers.Controller
webServer *gin.Engine
listen string
prefix string
webServer *gin.Engine
listen string
prefix string
}
func NewServer(c *cli.Context) (*Server, error) {
controller, err := controllers.NewController(c.String("mysql-dsn"))
if err != nil {
if err := database.Connect(c.String("mysql-dsn")); err != nil {
return nil, err
}
return &Server{
controller: controller,
webServer: gin.New(),
webServer: gin.New(),
listen: net.JoinHostPort(
c.String("listen"),
c.String("port"),