mirror of
https://github.com/aykhans/slash-e.git
synced 2025-04-18 21:19:44 +00:00
feat: migrate system to api v1
This commit is contained in:
parent
96704162d8
commit
24d42694c8
@ -1,7 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import "github.com/boojack/shortify/server/profile"
|
|
||||||
|
|
||||||
type SystemStatus struct {
|
|
||||||
Profile *profile.Profile `json:"profile"`
|
|
||||||
}
|
|
26
api/v1/system.go
Normal file
26
api/v1/system.go
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
package v1
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/boojack/shortify/server/profile"
|
||||||
|
"github.com/labstack/echo/v4"
|
||||||
|
)
|
||||||
|
|
||||||
|
type SystemStatus struct {
|
||||||
|
Profile *profile.Profile `json:"profile"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *APIV1Service) registerSystemRoutes(g *echo.Group) {
|
||||||
|
g.GET("/ping", func(c echo.Context) error {
|
||||||
|
return c.JSON(http.StatusOK, s.Profile)
|
||||||
|
})
|
||||||
|
|
||||||
|
g.GET("/status", func(c echo.Context) error {
|
||||||
|
systemStatus := SystemStatus{
|
||||||
|
Profile: s.Profile,
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.JSON(http.StatusOK, systemStatus)
|
||||||
|
})
|
||||||
|
}
|
@ -20,6 +20,7 @@ func NewAPIV1Service(profile *profile.Profile, store *store.Store) *APIV1Service
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *APIV1Service) Start(apiV1Group *echo.Group, secret string) {
|
func (s *APIV1Service) Start(apiV1Group *echo.Group, secret string) {
|
||||||
|
s.registerSystemRoutes(apiV1Group)
|
||||||
s.registerAuthRoutes(apiV1Group, secret)
|
s.registerAuthRoutes(apiV1Group, secret)
|
||||||
s.registerUserRoutes(apiV1Group)
|
s.registerUserRoutes(apiV1Group)
|
||||||
s.registerWorkspaceRoutes(apiV1Group)
|
s.registerWorkspaceRoutes(apiV1Group)
|
||||||
|
@ -12,14 +12,14 @@ import (
|
|||||||
|
|
||||||
// Profile is the configuration to start main server.
|
// Profile is the configuration to start main server.
|
||||||
type Profile struct {
|
type Profile struct {
|
||||||
|
// Data is the data directory
|
||||||
|
Data string `json:"-"`
|
||||||
|
// DSN points to where Shortify stores its own data
|
||||||
|
DSN string `json:"-"`
|
||||||
// Mode can be "prod" or "dev"
|
// Mode can be "prod" or "dev"
|
||||||
Mode string `json:"mode"`
|
Mode string `json:"mode"`
|
||||||
// Port is the binding port for server
|
// Port is the binding port for server
|
||||||
Port int `json:"port"`
|
Port int `json:"port"`
|
||||||
// Data is the data directory
|
|
||||||
Data string `json:"data"`
|
|
||||||
// DSN points to where Shortify stores its own data
|
|
||||||
DSN string `json:"dsn"`
|
|
||||||
// Version is the current version of server
|
// Version is the current version of server
|
||||||
Version string `json:"version"`
|
Version string `json:"version"`
|
||||||
}
|
}
|
||||||
|
@ -64,7 +64,6 @@ func NewServer(profile *profile.Profile, store *store.Store) (*Server, error) {
|
|||||||
apiGroup.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
|
apiGroup.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
|
||||||
return JWTMiddleware(s, next, string(secret))
|
return JWTMiddleware(s, next, string(secret))
|
||||||
})
|
})
|
||||||
s.registerSystemRoutes(apiGroup)
|
|
||||||
s.registerWorkspaceUserRoutes(apiGroup)
|
s.registerWorkspaceUserRoutes(apiGroup)
|
||||||
s.registerShortcutRoutes(apiGroup)
|
s.registerShortcutRoutes(apiGroup)
|
||||||
|
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
package server
|
|
||||||
|
|
||||||
import (
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"github.com/boojack/shortify/api"
|
|
||||||
|
|
||||||
"github.com/labstack/echo/v4"
|
|
||||||
)
|
|
||||||
|
|
||||||
func (s *Server) registerSystemRoutes(g *echo.Group) {
|
|
||||||
g.GET("/ping", func(c echo.Context) error {
|
|
||||||
return c.JSON(http.StatusOK, composeResponse(s.Profile))
|
|
||||||
})
|
|
||||||
|
|
||||||
g.GET("/status", func(c echo.Context) error {
|
|
||||||
systemStatus := api.SystemStatus{
|
|
||||||
Profile: s.Profile,
|
|
||||||
}
|
|
||||||
|
|
||||||
return c.JSON(http.StatusOK, composeResponse(systemStatus))
|
|
||||||
})
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user