Merge pull request #38 from maxzhang1985/dev

v1.4.8.2
yoyofx · Apr 14, 2020 · 1c5bd5c · 1c5bd5c
2 parents cb70cc0 + 8ec5717
commit 1c5bd5c
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 25 deletions.
diff --git a/Context/HostEnvironment.go b/Context/HostEnvironment.go
@@ -13,6 +13,7 @@ type HostEnvironment struct {
 	Args            []string
 	Addr            string
 	Port            string
+	Host            string
 	PID             int
 }
 

diff --git a/Controller/ActionMethodExecutor.go b/Controller/ActionMethodExecutor.go
@@ -3,6 +3,7 @@ package Controller
 import (
 	"github.com/maxzhang1985/yoyogo/Context"
 	"github.com/maxzhang1985/yoyogo/Utils"
+	"net/http"
 	"reflect"
 )
 
@@ -17,6 +18,10 @@ func (actionExecutor ActionMethodExecutor) Execute(ctx *ActionExecutorContext) i
 	if ctx.Controller != nil {
 		if ctx.In.MethodInovker == nil {
 			ctx.In.MethodInovker = Utils.NewMethodCaller(ctx.Controller, ctx.ActionName)
+			if ctx.In.MethodInovker == nil {
+				ctx.Context.Response.WriteHeader(http.StatusNotFound)
+				panic(ctx.ActionName + " action is not found! at " + ctx.ControllerName)
+			}
 			ctx.In.ActionParamTypes = ctx.In.MethodInovker.GetParamTypes()
 		}
 

diff --git a/Controller/ControllerActivator.go b/Controller/ControllerActivator.go
@@ -2,11 +2,8 @@ package Controller
 
 import "github.com/maxzhang1985/yoyogo/DependencyInjection"
 
-func ActivateController(serviceProvider DependencyInjection.IServiceProvider, controllerName string) IController {
+func ActivateController(serviceProvider DependencyInjection.IServiceProvider, controllerName string) (IController, error) {
 	var controller IController
 	err := serviceProvider.GetServiceByName(&controller, controllerName)
-	if err != nil {
-		panic("Controller not found! " + err.Error())
-	}
-	return controller
+	return controller, err
 }
diff --git a/Examples/SimpleWeb/main.go b/Examples/SimpleWeb/main.go
@@ -24,10 +24,11 @@ func CreateCustomBuilder() *YoyoGo.HostBuilder {
 		UseFastHttp().
 		//UseServer(YoyoGo.DefaultHttps(":8080", "./Certificate/server.pem", "./Certificate/server.key")).
 		Configure(func(app *YoyoGo.ApplicationBuilder) {
-			//app.SetEnvironment(Context.Prod)
+			app.SetEnvironment(Context.Dev)
 			app.UseStatic("Static")
-			app.UseMvc()
 			app.UseEndpoints(registerEndpointRouterConfig)
+
+			app.UseMvc()
 			app.ConfigureMvcParts(func(builder *Controller.ControllerBuilder) {
 				builder.AddController(contollers.NewUserController)
 			})

diff --git a/Framework/HostBuilder.go b/Framework/HostBuilder.go
@@ -1,8 +1,10 @@
 package YoyoGo
 
 import (
+	"fmt"
 	"github.com/maxzhang1985/yoyogo/Context"
 	"github.com/maxzhang1985/yoyogo/DependencyInjection"
+	"net"
 	"os"
 )
 
@@ -34,20 +36,42 @@ func (self *HostBuilder) UseServer(server IServer) *HostBuilder {
 	return self
 }
 
+func getLocalIP() string {
+	var localIp string
+	addrs, err := net.InterfaceAddrs()
+	if err != nil {
+		fmt.Println(err)
+	}
+	for _, address := range addrs {
+		// 检查ip地址判断是否回环地址
+		if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
+			if ipnet.IP.To4() != nil {
+				localIp = ipnet.IP.String()
+				break
+			}
+		}
+	}
+	return localIp
+}
+
 func runningHostEnvironmentSetting(hostEnv *Context.HostEnvironment) {
+	hostEnv.Host = getLocalIP()
 	hostEnv.Port = detectAddress(hostEnv.Addr)
 	hostEnv.PID = os.Getpid()
 }
 
 func buildingHostEnvironmentSetting(hostEnv *Context.HostEnvironment) {
 	// build each configuration by init , such as file or env or args ...
-	hostEnv.Args = os.Args
 	hostEnv.ApplicationName = "app"
 	hostEnv.Version = Version
+	hostEnv.Addr = ":8080"
+
+	hostEnv.Args = os.Args
+
 	if hostEnv.Profile == "" {
 		hostEnv.Profile = Context.Dev
 	}
-	hostEnv.Addr = ":8080"
+
 }
 
 func (self *HostBuilder) Build() WebHost {

diff --git a/Framework/Middleware.go b/Framework/Middleware.go
@@ -51,7 +51,11 @@ func wrapFunc(handlerFunc http.HandlerFunc) Handler {
 
 func voidMiddleware() middleware {
 	return newMiddleware(
-		HandlerFunc(func(ctx *Context.HttpContext, next func(ctx *Context.HttpContext)) {}),
+		HandlerFunc(func(ctx *Context.HttpContext, next func(ctx *Context.HttpContext)) {
+			if ctx.Response.Status() < 200 {
+				ctx.Response.WriteHeader(400)
+			}
+		}),
 		&middleware{},
 	)
 }

diff --git a/Framework/Version.go b/Framework/Version.go
@@ -1,5 +1,5 @@
 package YoyoGo
 
 const (
-	Version = "v1.4.8"
+	Version = "v1.4.8.2"
 )
diff --git a/Middleware/RecoveryMiddleware.go b/Middleware/RecoveryMiddleware.go
@@ -15,11 +15,7 @@ const (
 	// NoPrintStackBodyString is the body content returned when HTTP stack printing is suppressed
 	NoPrintStackBodyString = "500 Internal Server Error"
 
-	panicText = `{
-	 Result:0,
-	 Data: 'error',
-	 Message:'%s'
-}`
+	panicText = `{ "Result": -1 , "Data": "error", "Message": "%s" }`
 
 	panicHTML = `<html>
 <head><title>PANIC: {{.RecoveredPanic}}</title></head>
@@ -159,25 +155,35 @@ func NewRecovery() *Recovery {
 }
 
 func (rec *Recovery) Inovke(ctx *Context.HttpContext, next func(ctx *Context.HttpContext)) {
+
 	defer func() {
 		if err := recover(); err != nil {
 			var hostEnv *Context.HostEnvironment
 			envErr := ctx.RequiredServices.GetService(&hostEnv)
-			ctx.Response.WriteHeader(http.StatusInternalServerError)
+
 			if envErr == nil && hostEnv.IsDevelopment() {
 				rec.PrintStack = true
 				rec.LogStack = true
 				rec.StackAll = true
 				rec.Formatter = &HTMLPanicFormatter{}
 			}
+			if ctx.Response.Status() != http.StatusNotFound {
+				ctx.Response.WriteHeader(http.StatusInternalServerError)
+			}
 			stack := make([]byte, rec.StackSize)
-			stack = stack[:runtime.Stack(stack, rec.StackAll)]
+			if rec.StackAll {
+				stack = stack[:runtime.Stack(stack, rec.StackAll)]
+			}
 			infos := &PanicInformation{RecoveredPanic: err, Request: ctx.Request}
 
 			// PrintStack will write stack trace info to the ResponseWriter if set to true!
-			// If set to false it will respond with the standard response documented here https://httpstat.us/500
-			if rec.PrintStack {
+			if rec.LogStack {
 				infos.Stack = stack
+				//print console stack errors
+				rec.Logger.Printf(panicText, err, string(stack))
+			}
+
+			if rec.PrintStack {
 				rec.Formatter.FormatPanicError(ctx.Response, ctx.Request, infos)
 			} else {
 				if ctx.Response.Header().Get("Content-Type") == "" {
@@ -186,10 +192,6 @@ func (rec *Recovery) Inovke(ctx *Context.HttpContext, next func(ctx *Context.Htt
 				_, _ = fmt.Fprint(ctx.Response, NoPrintStackBodyString)
 			}
 
-			if rec.LogStack {
-				rec.Logger.Printf(panicText, err, string(stack))
-			}
-
 			if rec.PanicHandlerFunc != nil {
 				func() {
 					defer func() {

diff --git a/Router/MvcRouterHandler.go b/Router/MvcRouterHandler.go
@@ -4,6 +4,7 @@ import (
 	"github.com/maxzhang1985/yoyogo/ActionResult"
 	"github.com/maxzhang1985/yoyogo/Context"
 	"github.com/maxzhang1985/yoyogo/Controller"
+	"net/http"
 	"strings"
 )
 
@@ -21,7 +22,11 @@ func (handler *MvcRouterHandler) Invoke(ctx *Context.HttpContext, pathComponents
 	}
 	actionName := pathComponents[1]
 
-	controller := Controller.ActivateController(ctx.RequiredServices, controllerName)
+	controller, err := Controller.ActivateController(ctx.RequiredServices, controllerName)
+	if err != nil {
+		ctx.Response.WriteHeader(http.StatusNotFound)
+		panic(controllerName + " controller is not found! " + err.Error())
+	}
 
 	executorContext := &Controller.ActionExecutorContext{
 		ControllerName: controllerName,