Merge branch 'dev' of https://github.com/wenjianzhang/go-admin into dev
This commit is contained in:
commit
cc6c333372
1 file changed
+8
-4
+8
-4
@@ -1,9 +1,6 @@
|
|||||||
package router
|
package router
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/gin-gonic/gin"
|
|
||||||
ginSwagger "github.com/swaggo/gin-swagger"
|
|
||||||
"github.com/swaggo/gin-swagger/swaggerFiles"
|
|
||||||
log2 "go-admin/apis/log"
|
log2 "go-admin/apis/log"
|
||||||
"go-admin/apis/monitor"
|
"go-admin/apis/monitor"
|
||||||
"go-admin/apis/public"
|
"go-admin/apis/public"
|
||||||
@@ -16,6 +13,11 @@ import (
|
|||||||
"go-admin/middleware"
|
"go-admin/middleware"
|
||||||
jwt "go-admin/pkg/jwtauth"
|
jwt "go-admin/pkg/jwtauth"
|
||||||
"go-admin/pkg/ws"
|
"go-admin/pkg/ws"
|
||||||
|
"mime"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
ginSwagger "github.com/swaggo/gin-swagger"
|
||||||
|
"github.com/swaggo/gin-swagger/swaggerFiles"
|
||||||
)
|
)
|
||||||
|
|
||||||
func InitSysRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.RouterGroup {
|
func InitSysRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.RouterGroup {
|
||||||
@@ -50,6 +52,8 @@ func sysBaseRouter(r *gin.RouterGroup) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func sysStaticFileRouter(r *gin.RouterGroup) {
|
func sysStaticFileRouter(r *gin.RouterGroup) {
|
||||||
|
mime.AddExtensionType(".js", "application/javascript")
|
||||||
|
|
||||||
r.Static("/static", "./static")
|
r.Static("/static", "./static")
|
||||||
r.Static("/form-generator", "./static/form-generator")
|
r.Static("/form-generator", "./static/form-generator")
|
||||||
}
|
}
|
||||||
@@ -290,4 +294,4 @@ func registerPublicRouter(v1 *gin.RouterGroup) {
|
|||||||
{
|
{
|
||||||
p.POST("/uploadFile", public.UploadFile)
|
p.POST("/uploadFile", public.UploadFile)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user