框架集成Config

yoyofx · Aug 12, 2020 · 6f26d98 · 6f26d98
1 parent 5bca353
commit 6f26d98
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/Abstractions/HostBuilder.go b/Abstractions/HostBuilder.go
@@ -91,22 +91,24 @@ func RunningHostEnvironmentSetting(hostEnv *Context.HostEnvironment) {
 func buildingHostEnvironmentSetting(context *HostBuildContext) {
 	hostEnv := context.HostingEnvironment
 	hostEnv.Version = YoyoGo.Version
+	hostEnv.Addr = DetectAddress("")
 	config := context.HostConfiguration
-	hostEnv.ApplicationName = config.Name
-	if config.Server.Address != "" {
-		hostEnv.Addr = config.Server.Address
-	} else {
-		hostEnv.Addr = DetectAddress("")
+	if config != nil {
+		hostEnv.ApplicationName = config.Name
+		if config.Server.Address != "" {
+			hostEnv.Addr = config.Server.Address
+		}
+		if config.Profile != "" {
+			hostEnv.Profile = config.Profile
+		}
 	}
+
 	hostEnv.Port = strings.Replace(hostEnv.Addr, ":", "", -1)
 	hostEnv.Args = os.Args
 
 	if hostEnv.Profile == "" {
 		hostEnv.Profile = Context.Dev
 	}
-	if config.Profile != "" {
-		hostEnv.Profile = config.Profile
-	}
 
 }
 

diff --git a/WebFramework/Middleware/StaticMiddleware.go b/WebFramework/Middleware/StaticMiddleware.go
@@ -32,10 +32,14 @@ func NewStatic(patten string, path string) *Static {
 }
 
 func NewStaticWithConfig(configuration Abstractions.IConfiguration) *Static {
-	config := configuration.GetSection("application.server.static")
-	patten := config.Get("patten").(string)
-	path := config.Get("webroot").(string)
-	return NewStatic(patten, path)
+	if configuration != nil {
+		config := configuration.GetSection("application.server.static")
+		patten := config.Get("patten").(string)
+		path := config.Get("webroot").(string)
+		return NewStatic(patten, path)
+	} else {
+		return NewStatic("/", "./Static")
+	}
 }
 
 func (s *Static) Inovke(ctx *Context.HttpContext, next func(ctx *Context.HttpContext)) {

diff --git a/WebFramework/WebHostBuilderDecorator.go b/WebFramework/WebHostBuilderDecorator.go
@@ -1,6 +1,9 @@
 package YoyoGo
 
-import "github.com/yoyofx/yoyogo/Abstractions"
+import (
+	YoyoGo "github.com/yoyofx/yoyogo"
+	"github.com/yoyofx/yoyogo/Abstractions"
+)
 
 type WebHostBuilderDecorator struct {
 }
@@ -31,6 +34,8 @@ func (decorator WebHostBuilderDecorator) OverrideNewHost(server Abstractions.ISe
 				server = DefaultHttpServer(address)
 			}
 		}
+	} else {
+		server = NewFastHttp(YoyoGo.DefaultAddress)
 	}
 	return NewWebHost(server, context)
 }