From 8b70b8f6bfe92d917afc83b33339ddf2bfd7a92c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B0=91=E5=A5=87?= <wb-wsq809545@alibaba-inc.com>
Date: Tue, 10 Aug 2021 00:45:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=20utils=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/network.go | 19 -------------------
 src/utils/path.go    | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 src/utils/path.go

diff --git a/src/utils/network.go b/src/utils/network.go
index 9374503..f0160cd 100644
--- a/src/utils/network.go
+++ b/src/utils/network.go
@@ -36,25 +36,6 @@ func GetLocalIP() (ipv4 string, err error) {
 	return
 }
 
-//运行的程序所在目录
-func BasePath() string {
-	executer, err := os.Executable()
-	if err != nil {
-		panic("Cannot get executable folder, just panic: " + err.Error())
-	}
-	basePath := filepath.Dir(executer)
-	return basePath
-}
-
-//当前目录(与运行程序所在目录无关)
-func CurrentPath() string {
-	basePath, err := filepath.Abs("./")
-	if err != nil {
-		panic(err)
-	}
-	return basePath
-}
-
 func NewRequestId() string {
 	return uuid.NewV4().String()
 }
diff --git a/src/utils/path.go b/src/utils/path.go
new file mode 100644
index 0000000..b8b8013
--- /dev/null
+++ b/src/utils/path.go
@@ -0,0 +1,24 @@
+package utils
+
+import (
+	"os"
+	"path/filepath"
+)
+//运行的程序所在目录
+func BasePath() string {
+	executer, err := os.Executable()
+	if err != nil {
+		panic("Cannot get executable folder, just panic: " + err.Error())
+	}
+	basePath := filepath.Dir(executer)
+	return basePath
+}
+
+//当前目录(与运行程序所在目录无关)
+func CurrentPath() string {
+	basePath, err := filepath.Abs("./")
+	if err != nil {
+		panic(err)
+	}
+	return basePath
+}
-- 
Gitee


From a92b066dd00891fa0a7f8dc0d8916119036dbaac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B0=91=E5=A5=87?= <wb-wsq809545@alibaba-inc.com>
Date: Wed, 11 Aug 2021 14:24:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20middleware?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/v1/httpserver/server_http_middlerware.go | 22 --------------------
 src/v1/httpserver/vars.go                    |  6 ++++++
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/v1/httpserver/server_http_middlerware.go b/src/v1/httpserver/server_http_middlerware.go
index 6fe55db..67ec7f7 100644
--- a/src/v1/httpserver/server_http_middlerware.go
+++ b/src/v1/httpserver/server_http_middlerware.go
@@ -1,7 +1,5 @@
 package httpserver
 
-import "runtime/debug"
-
 type Middleware func(ctx *Ctx, next func(ctx *Ctx))
 
 //处理中间件
@@ -25,23 +23,3 @@ var handlerMiddleware = func(f func(ctx *Ctx), middleware []Middleware) func(ctx
 
 	return funcArr[len(funcArr)-1]
 }
-
-//response
-var DefaultResponseMiddleware Middleware = func(ctx *Ctx, next func(*Ctx)) {
-	ctx.SetResponseHandler(NewHttpResponse(ctx.Writer()))
-	next(ctx)
-}
-
-//panic处理
-var DefaultPanicMiddleware Middleware = func(ctx *Ctx, next func(*Ctx)) {
-	defer func() {
-		if err := recover(); err != nil {
-			debug.PrintStack()
-
-			ctx.WriteHeader(500)
-			ctx.WriteStr("system busy")
-			return
-		}
-	}()
-	next(ctx)
-}
diff --git a/src/v1/httpserver/vars.go b/src/v1/httpserver/vars.go
index 0194bda..b4da7e5 100644
--- a/src/v1/httpserver/vars.go
+++ b/src/v1/httpserver/vars.go
@@ -8,6 +8,12 @@ import (
 	"runtime/debug"
 )
 
+//response
+var DefaultResponseMiddleware Middleware = func(ctx *Ctx, next func(*Ctx)) {
+	ctx.SetResponseHandler(NewHttpResponse(ctx.Writer()))
+	next(ctx)
+}
+
 //qps限流
 var GlobalMiddlewareQPSLimiter = func(r rate.Limit, b int) Middleware {
 	limiter := rate.NewLimiter(r, b)
-- 
Gitee