diff --git a/server/adminserver/app/app.go b/server/adminserver/app/app.go index ed80346c..2b4da46e 100644 --- a/server/adminserver/app/app.go +++ b/server/adminserver/app/app.go @@ -27,9 +27,10 @@ func (this *app) Run(initCb func(), unInitCb func()) { func (this *app) Init() { f5.LoadMetaTable(mt.Table) this.registerDataSources() - //this.ginEngine = gin.New() - //this.ginEngine.Use(gin.Recovery()) + this.ginEngine = gin.New() + this.ginEngine.Use(gin.Recovery()) this.initCb() + go this.ginEngine.Run(":3000") } func (this *app) UnInit() { diff --git a/server/adminserver/ginmgr.go b/server/adminserver/ginmgr.go deleted file mode 100644 index 2f2b2beb..00000000 --- a/server/adminserver/ginmgr.go +++ /dev/null @@ -1,57 +0,0 @@ -package main - -import ( - //"adminsever/api" - //"adminsever/db" - "f5" - "main/router" - "github.com/gin-gonic/gin" - "golang.org/x/sync/errgroup" - "net/http" -) - -type GinMgr struct { - group errgroup.Group -} - -func (this *GinMgr) init() { - runGinServer() - //server01 := &http.Server{ - // Addr: ":8080", - // Handler: this.router(), - // ReadTimeout: 5 * time.Second, - // WriteTimeout: 10 * time.Second, - //} - //this.group.Go(func() error { - // return server01.ListenAndServe() - //}) - f5.GetSysLog().Info("%s", router.RouterGroupApp) -} - -func (this *GinMgr) unInit() { -} - -func (this *GinMgr) router() http.Handler { - r := gin.New() - r.Use(gin.Recovery()) - r.GET("/webapp/index.php", func(c *gin.Context) { - c.JSON(200, gin.H{ - "errcode": 0, - "errmsg": "", - }) - }) - return r -} - -func runGinServer() { - /* - store := db.GetDB() - server, err := api.NewServer(store) - if err != nil { - f5.GetSysLog().Info("cannot create server err:%v \n", err) - } - err = server.Start("localhost:8080") - if err != nil { - f5.GetSysLog().Info("cannot start server err:%v \n", err) - }*/ -} diff --git a/server/adminserver/router/enter.go b/server/adminserver/router/enter.go deleted file mode 100644 index 19308d15..00000000 --- a/server/adminserver/router/enter.go +++ /dev/null @@ -1,11 +0,0 @@ -package router - -import ( - "main/router/system" -) - -type RouterGroup struct { - System system.RouterGroup -} - -var RouterGroupApp = new(RouterGroup)