Skip to content

Commit 489a58d

Browse files
authored
Merge pull request #149 from zhu327/feat_cors
feat: application add UseGlobal method
2 parents fbdcec6 + d6e48da commit 489a58d

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

pkg/app/application.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"github.com/hidevopsio/hiboot/pkg/system/scheduler"
3333
"github.com/hidevopsio/hiboot/pkg/utils/cmap"
3434
"github.com/hidevopsio/hiboot/pkg/utils/io"
35+
"github.com/kataras/iris/core/router"
3536
)
3637

3738
const (
@@ -60,6 +61,7 @@ type ApplicationContext interface {
6061
Use(handlers ...context.Handler)
6162
GetProperty(name string) (value interface{}, ok bool)
6263
GetInstance(params ...interface{}) (instance interface{})
64+
WrapRouter(handler router.WrapperFunc)
6365
}
6466

6567
// BaseApplication is the base application
@@ -83,7 +85,7 @@ var (
8385
configContainer []*factory.MetaData
8486
componentContainer []*factory.MetaData
8587
// Profiles include profiles initially
86-
Profiles []string
88+
Profiles []string
8789

8890
// ErrInvalidObjectType indicates that configuration type is invalid
8991
ErrInvalidObjectType = errors.New("[app] invalid Configuration type, one of app.Configuration need to be embedded")

pkg/app/fake/application.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
// Package fake provides fake.ApplicationContext for unit testing
1616
package fake
1717

18-
import "github.com/hidevopsio/hiboot/pkg/app/web/context"
18+
import (
19+
"github.com/hidevopsio/hiboot/pkg/app/web/context"
20+
"github.com/kataras/iris/core/router"
21+
)
1922

2023
// ApplicationContext application context
2124
type ApplicationContext struct {
@@ -40,3 +43,6 @@ func (a *ApplicationContext) GetProperty(name string) (value interface{}, ok boo
4043
func (a *ApplicationContext) GetInstance(params ...interface{}) (instance interface{}) {
4144
return
4245
}
46+
47+
func (a *ApplicationContext) WrapRouter(handler router.WrapperFunc) {
48+
}

pkg/app/web/application.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ import (
2222
"regexp"
2323
"time"
2424

25-
"github.com/kataras/iris"
2625
"github.com/hidevopsio/hiboot/pkg/app"
2726
"github.com/hidevopsio/hiboot/pkg/app/web/context"
2827
"github.com/hidevopsio/hiboot/pkg/at"
2928
"github.com/hidevopsio/hiboot/pkg/log"
3029
"github.com/hidevopsio/hiboot/pkg/utils/io"
30+
"github.com/kataras/iris"
31+
"github.com/kataras/iris/core/router"
3132
)
3233

3334
const (
@@ -190,6 +191,10 @@ func (a *application) Use(handlers ...context.Handler) {
190191
}
191192
}
192193

194+
func (a *application) WrapRouter(handler router.WrapperFunc) {
195+
a.webApp.WrapRouter(handler)
196+
}
197+
193198
func (a *application) initialize(controllers ...interface{}) (err error) {
194199
io.EnsureWorkDir(3, "config/application.yml")
195200

0 commit comments

Comments
 (0)