Merge branch 'dev'

# Conflicts:
#	.github/workflows/go.yml
#	README_En.md

.github/workflows/Release.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.14
+        go-version: ^1.15
       id: go
 
     - name: Check out code into the Go module directory

.github/workflows/go.yml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.14
+    - name: Set up Go 1.15
       uses: actions/setup-go@v1
       with:
-        go-version: 1.14
+        go-version: 1.15
       id: go
 
     - name: Check out code into the Go module directory
@@ -25,10 +25,10 @@ jobs:
         fi
 
     - name: Build
-      run: go test -v ./Test/
-
+      run: go test -v ./tests/
+    
     - name: Invoke deployment hook
       uses: joelwmale/webhook-action@1.0.0
       env:
         WEBHOOK_URL: ${{ secrets.Dingding_WEBHOOK_URL }}
-        data: "{'msgtype': 'text', 'text': { 'content': 'build complated' } }"
+        data: "{'deployment': 'finished', 'project': 'actions'}"

Examples/GrafanaAlertWebHook/WechatRequests/QiyeWechat.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/yoyofx/yoyogo/Abstractions"
-	"github.com/yoyofx/yoyogo/Abstractions/XLog"
+	"github.com/yoyofx/yoyogo/abstractions"
+	"github.com/yoyofx/yoyogo/abstractions/xlog"
 	"io/ioutil"
 	"net/http"
 )
@@ -27,9 +27,9 @@ func postWechatMessage(sendUrl, msg string) string {
 	return strBody
 }
 
-func SendTxtMessage(request GrafanaAlertRequest, config Abstractions.IConfiguration) string {
+func SendTxtMessage(request GrafanaAlertRequest, config abstractions.IConfiguration) string {
 	tag := request.GetTag()
-	logger := XLog.GetXLogger("wechat")
+	logger := xlog.GetXLogger("wechat")
 	js, _ := json.Marshal(request)
 	logger.Info("Request json: %s", string(js))
 	if tag == "" {

Examples/GrafanaAlertWebHook/controller.go

@@ -2,17 +2,17 @@ package main
 
 import (
 	"GrafanaAlertWebHook/WechatRequests"
-	"github.com/yoyofx/yoyogo/Abstractions"
-	"github.com/yoyofx/yoyogo/WebFramework/Context"
+	"github.com/yoyofx/yoyogo/abstractions"
+	"github.com/yoyofx/yoyogo/web/context"
 )
 
-func PostAlert(ctx *Context.HttpContext) {
+func PostAlert(ctx *context.HttpContext) {
 	var request WechatRequests.GrafanaAlertRequest
 	_ = ctx.Bind(&request)
-	var config Abstractions.IConfiguration
+	var config abstractions.IConfiguration
 	_ = ctx.RequiredServices.GetService(&config)
 
-	ctx.JSON(200, Context.H{
+	ctx.JSON(200, context.H{
 		"Message": WechatRequests.SendTxtMessage(request, config),
 	})
 }

Examples/GrafanaAlertWebHook/main.go

@@ -1,21 +1,21 @@
 package main
 
 import (
-	"github.com/yoyofx/yoyogo/Abstractions"
-	"github.com/yoyofx/yoyogo/WebFramework"
-	"github.com/yoyofx/yoyogo/WebFramework/Endpoints"
-	"github.com/yoyofx/yoyogo/WebFramework/Router"
+	"github.com/yoyofx/yoyogo/abstractions"
+	"github.com/yoyofx/yoyogo/web"
+	"github.com/yoyofx/yoyogo/web/endpoints"
+	"github.com/yoyofx/yoyogo/web/router"
 )
 
 func main() {
-	configuration := Abstractions.NewConfigurationBuilder().AddYamlFile("config").Build()
+	configuration := abstractions.NewConfigurationBuilder().AddYamlFile("config").Build()
 	// --profile=prod , to read , config.yml
 	YoyoGo.NewWebHostBuilder().
 		UseConfiguration(configuration).
 		Configure(func(app *YoyoGo.WebApplicationBuilder) {
-			app.UseEndpoints(func(router Router.IRouterBuilder) {
+			app.UseEndpoints(func(router router.IRouterBuilder) {
 				router.POST("/alert", PostAlert)
-				Endpoints.UsePrometheus(router)
+				endpoints.UsePrometheus(router)
 			})
 		}).Build().Run()
 }

Examples/SimpleWeb/config_prod.yml

@@ -1,6 +1,6 @@
 application:
   name: demo_prod
-  metadata: "prod Env"
+  metadata: "prod hostenv"
   server:
     type: "fasthttp"
     address: ":8080"

Examples/SimpleWeb/contollers/usercontroller.go

@@ -2,66 +2,66 @@ package contollers
 
 import (
 	"SimpleWeb/models"
-	"github.com/yoyofx/yoyogo/Abstractions/ServiceDiscovery"
-	"github.com/yoyofx/yoyogo/WebFramework/ActionResult"
-	"github.com/yoyofx/yoyogo/WebFramework/Context"
-	"github.com/yoyofx/yoyogo/WebFramework/Mvc"
+	"github.com/yoyofx/yoyogo/abstractions/servicediscovery"
+	"github.com/yoyofx/yoyogo/web/actionresult"
+	"github.com/yoyofx/yoyogo/web/context"
+	"github.com/yoyofx/yoyogo/web/mvc"
 )
 
 type UserController struct {
-	Mvc.ApiController
+	mvc.ApiController
 	userAction      models.IUserAction
-	discoveryClient ServiceDiscovery.IServiceDiscovery
+	discoveryClient servicediscovery.IServiceDiscovery
 }
 
-func NewUserController(userAction models.IUserAction, sd ServiceDiscovery.IServiceDiscovery) *UserController {
+func NewUserController(userAction models.IUserAction, sd servicediscovery.IServiceDiscovery) *UserController {
 	return &UserController{userAction: userAction, discoveryClient: sd}
 }
 
 type RegisterRequest struct {
-	Mvc.RequestBody
+	mvc.RequestBody
 	UserName string `param:"UserName"`
 	Password string `param:"Password"`
 }
 
-func (controller UserController) Register(ctx *Context.HttpContext, request *RegisterRequest) ActionResult.IActionResult {
-	result := Mvc.ApiResult{Success: true, Message: "ok", Data: request}
+func (controller UserController) Register(ctx *context.HttpContext, request *RegisterRequest) actionresult.IActionResult {
+	result := mvc.ApiResult{Success: true, Message: "ok", Data: request}
 
-	return ActionResult.Json{Data: result}
+	return actionresult.Json{Data: result}
 }
 
-func (controller UserController) GetUserName(ctx *Context.HttpContext, request *RegisterRequest) ActionResult.IActionResult {
-	result := Mvc.ApiResult{Success: true, Message: "ok", Data: request}
+func (controller UserController) GetUserName(ctx *context.HttpContext, request *RegisterRequest) actionresult.IActionResult {
+	result := mvc.ApiResult{Success: true, Message: "ok", Data: request}
 
-	return ActionResult.Json{Data: result}
+	return actionresult.Json{Data: result}
 }
 
-func (controller UserController) PostUserInfo(ctx *Context.HttpContext, request *RegisterRequest) ActionResult.IActionResult {
+func (controller UserController) PostUserInfo(ctx *context.HttpContext, request *RegisterRequest) actionresult.IActionResult {
 
-	return ActionResult.Json{Data: Mvc.ApiResult{Success: true, Message: "ok", Data: Context.H{
+	return actionresult.Json{Data: mvc.ApiResult{Success: true, Message: "ok", Data: context.H{
 		"user":    ctx.GetUser(),
 		"request": request,
 	}}}
 }
 
-func (controller UserController) GetHtmlHello() ActionResult.IActionResult {
+func (controller UserController) GetHtmlHello() actionresult.IActionResult {
 	return controller.View("hello", map[string]interface{}{
 		"name": "hello world!",
 	})
 }
 
-func (controller UserController) GetHtmlBody() ActionResult.IActionResult {
+func (controller UserController) GetHtmlBody() actionresult.IActionResult {
 	return controller.View("raw", map[string]interface{}{
 		"body": "raw.htm hello world!",
 	})
 }
 
-func (controller UserController) GetInfo() Mvc.ApiResult {
+func (controller UserController) GetInfo() mvc.ApiResult {
 
 	return controller.OK(controller.userAction.Login("zhang"))
 }
 
-func (controller UserController) GetSD() Mvc.ApiResult {
+func (controller UserController) GetSD() mvc.ApiResult {
 	serviceList := controller.discoveryClient.GetAllInstances("yoyogo_demo_dev")
 	return controller.OK(serviceList)
 }

Examples/SimpleWeb/contollers/userfilter.go

@@ -2,17 +2,17 @@ package contollers
 
 import (
 	"fmt"
-	"github.com/yoyofx/yoyogo/WebFramework/Mvc"
+	"github.com/yoyofx/yoyogo/web/mvc"
 )
 
 type TestActionFilter struct {
 }
 
-func (f *TestActionFilter) OnActionExecuting(context Mvc.ActionFilterContext) bool {
+func (f *TestActionFilter) OnActionExecuting(context mvc.ActionFilterContext) bool {
 	fmt.Println("TestActionFilter OnActionExecuting")
 	return false
 }
 
-func (f *TestActionFilter) OnActionExecuted(context Mvc.ActionFilterContext) {
+func (f *TestActionFilter) OnActionExecuted(context mvc.ActionFilterContext) {
 	fmt.Println("TestActionFilter OnActionExecuted")
 }

Examples/SimpleWeb/go.mod

@@ -4,6 +4,8 @@ go 1.15
 
 require (
 	github.com/go-sql-driver/mysql v1.5.0
+	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
+	github.com/ugorji/go v1.2.1 // indirect
 	github.com/yoyofx/yoyogo v0.0.0
 )