Buriburizaemon/nezha_domains
1
0
Fork 0
mirror of https://github.com/Buriburizaem0n/nezha_domains.git synced 2026-02-04 04:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: v1.1

Browse Source
This commit is contained in:
naiba
2024-12-07 01:18:34 +08:00
parent 5bb013af04
commit 251bc10af9
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/dashboard/controller/controller.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/nezhahq/nezha/service/singleton"
)
func ServeWeb(adminFrontend, userFrontend fs.FS) http.Handler {
func ServeWeb(frontendDist fs.FS) http.Handler {
gin.SetMode(gin.ReleaseMode)
r := gin.Default()
@@ -40,12 +40,12 @@ func ServeWeb(adminFrontend, userFrontend fs.FS) http.Handler {
r.Use(waf.Waf)
r.Use(recordPath)
routers(r, adminFrontend, userFrontend)
routers(r, frontendDist)
return r
}
func routers(r *gin.Engine, adminFrontend, userFrontend fs.FS) {
func routers(r *gin.Engine, frontendDist fs.FS) {
authMiddleware, err := jwt.New(initParams())
if err != nil {
log.Fatal("JWT Error:" + err.Error())
@@ -133,7 +133,7 @@ func routers(r *gin.Engine, adminFrontend, userFrontend fs.FS) {
auth.PATCH("/setting", commonHandler(updateConfig))
r.NoRoute(fallbackToFrontend(adminFrontend, userFrontend))
r.NoRoute(fallbackToFrontend(frontendDist))
}
func recordPath(c *gin.Context) {
@@ -212,7 +212,7 @@ func commonHandler[T any](handler handlerFunc[T]) func(*gin.Context) {
}
}
func fallbackToFrontend(adminFrontend, userFrontend fs.FS) func(*gin.Context) {
func fallbackToFrontend(frontendDist fs.FS) func(*gin.Context) {
checkLocalFileOrFs := func(c *gin.Context, fs fs.FS, path string) bool {
if _, err := os.Stat(path); err == nil {
c.File(path)
@@ -241,19 +241,19 @@ func fallbackToFrontend(adminFrontend, userFrontend fs.FS) func(*gin.Context) {
if strings.HasPrefix(c.Request.URL.Path, "/dashboard") {
stripPath := strings.TrimPrefix(c.Request.URL.Path, "/dashboard")
localFilePath := path.Join("admin-dist", stripPath)
if checkLocalFileOrFs(c, adminFrontend, localFilePath) {
if checkLocalFileOrFs(c, frontendDist, localFilePath) {
return
}
if !checkLocalFileOrFs(c, adminFrontend, "admin-dist/index.html") {
if !checkLocalFileOrFs(c, frontendDist, "admin-dist/index.html") {
c.JSON(http.StatusOK, newErrorResponse(errors.New("404 Not Found")))
}
return
}
localFilePath := path.Join(singleton.Conf.UserTemplate, c.Request.URL.Path)
if checkLocalFileOrFs(c, userFrontend, localFilePath) {
if checkLocalFileOrFs(c, frontendDist, localFilePath) {
return
}
if !checkLocalFileOrFs(c, userFrontend, singleton.Conf.UserTemplate+"/index.html") {
if !checkLocalFileOrFs(c, frontendDist, singleton.Conf.UserTemplate+"/index.html") {
c.JSON(http.StatusOK, newErrorResponse(errors.New("404 Not Found")))
}
}

8
cmd/dashboard/main.go
View File

@@ -34,10 +34,8 @@ type DashboardCliParam struct {
var (
dashboardCliParam DashboardCliParam
//go:embed admin-dist
adminFrontend embed.FS
//go:embed user-dist
userFrontend embed.FS
//go:embed *-dist
frontendDist embed.FS
)
func initSystem() {
@@ -125,7 +123,7 @@ func main() {
singleton.NewServiceSentinel(serviceSentinelDispatchBus)
grpcHandler := rpc.ServeRPC()
httpHandler := controller.ServeWeb(adminFrontend, userFrontend)
httpHandler := controller.ServeWeb(frontendDist)
controller.InitUpgrader()
muxHandler := newHTTPandGRPCMux(httpHandler, grpcHandler)