fix: index redirect (#418)

Co-authored-by: fusikai <fusikai@douyu.tv>
douyu · Feb 21, 2023 · 2ab20cb · 2ab20cb
1 parent 884b171
commit 2ab20cb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/api/apiv1/static/static.go b/api/apiv1/static/static.go
@@ -22,7 +22,7 @@ var (
 	Prefix = ""
 )
 
-func Static(e *echo.Echo, prefix string) {
+func Static(e *echo.Echo, prefix string, sessionMW echo.MiddlewareFunc) {
 	Prefix = prefix
 	var err error
 	statikFS, err = assets.Assets()
@@ -35,11 +35,14 @@ func Static(e *echo.Echo, prefix string) {
 		if err != nil {
 			return err
 		}
+		if c.Request().URL.Path == "" || c.Request().URL.Path == "/" {
+			c.Request().URL.Path = "/index.html"
+		}
 		hanlde := FileServer(Dir("./"))
 		hanlde.ServeHTTP(c.Response(), c.Request())
 		return nil
 	}
-	e.GET("/", h, middleware.LoginAuth("/user/login", middleware.RedirectTypeHttp).Func())
+	e.GET("/", h, sessionMW, middleware.LoginAuth("/user/login", middleware.RedirectTypeHttp).Func())
 	e.GET(prefix, h)
 	e.GET(prefix+"/*", h)
 }
diff --git a/app/adminengine/router_admin.go b/app/adminengine/router_admin.go
@@ -80,7 +80,7 @@ func apiAdmin(server *xecho.Server) {
 		})
 	}
 	//构建前端资源
-	static.Static(server.Echo, "/ant")
+	static.Static(server.Echo, "/ant", sessionMW)
 	//默认目录
 	echo.NotFoundHandler = func(c echo.Context) error {
 		if strings.HasPrefix(c.Request().URL.Path, "/api/") {
@@ -112,7 +112,7 @@ func apiAdmin(server *xecho.Server) {
 	}
 
 	//common  proxy
-	proxy := server.Group("/proxy")
+	proxy := server.Group("/proxy", sessionMW, loginAuthRedirect)
 	{
 		AllMethods := []string{http.MethodGet, http.MethodPost, http.MethodPatch, http.MethodDelete,
 			http.MethodHead, http.MethodTrace, http.MethodPut, http.MethodConnect, http.MethodOptions}

diff --git a/internal/pkg/service/resource/app_node.go b/internal/pkg/service/resource/app_node.go
@@ -290,8 +290,8 @@ func (r *resource) AppNodeTransferPut(tx *gorm.DB, add, del map[string]interface
 			RegionName: node.RegionName,
 			ZoneCode:   node.ZoneCode,
 			ZoneName:   node.ZoneName,
-			CreateTime: time.Now().Unix(),
-			UpdateTime: time.Now().Unix(),
+			CreateTime: float64(time.Now().Unix()),
+			UpdateTime: float64(time.Now().Unix()),
 		}
 		itemjson, _ := json.Marshal(item)
 		xlog.Info("AppNode item: ", zap.String("item", string(itemjson)))

diff --git a/pkg/model/db/app_node.go b/pkg/model/db/app_node.go
@@ -8,19 +8,19 @@ type AppNodeAgentView struct {
 
 // AppNode ..
 type AppNode struct {
-	ID         int    `json:"id" gorm:"not null;column:id"` // id类型?
-	AppName    string `json:"app_name" gorm:"not null;column:app_name"`
-	Aid        int    `json:"aid" gorm:"not null;column:aid"` // id类型?
-	HostName   string `json:"host_name" gorm:"not null;column:host_name"`
-	IP         string `json:"ip" gorm:"not null;column:ip;index"`
-	DeviceID   int    `json:"device_id" gorm:"not null;column:device_id"`
-	Env        string `json:"env" gorm:"not null"`
-	RegionCode string `json:"region_code" gorm:"not null"`
-	RegionName string `json:"region_name" gorm:"not null"`
-	ZoneCode   string `json:"zone_code" gorm:"not null"`
-	ZoneName   string `json:"zone_name" gorm:"not null"`
-	CreateTime int64  `gorm:"not null;" json:"create_time"`
-	UpdateTime int64  `gorm:"not null;" json:"update_time"`
+	ID         int     `json:"id" gorm:"not null;column:id"` // id类型?
+	AppName    string  `json:"app_name" gorm:"not null;column:app_name"`
+	Aid        int     `json:"aid" gorm:"not null;column:aid"` // id类型?
+	HostName   string  `json:"host_name" gorm:"not null;column:host_name"`
+	IP         string  `json:"ip" gorm:"not null;column:ip;index"`
+	DeviceID   int     `json:"device_id" gorm:"not null;column:device_id"`
+	Env        string  `json:"env" gorm:"not null"`
+	RegionCode string  `json:"region_code" gorm:"not null"`
+	RegionName string  `json:"region_name" gorm:"not null"`
+	ZoneCode   string  `json:"zone_code" gorm:"not null"`
+	ZoneName   string  `json:"zone_name" gorm:"not null"`
+	CreateTime float64 `gorm:"not null;" json:"create_time"`
+	UpdateTime float64 `gorm:"not null;" json:"update_time"`
 }
 
 // TableName ..