回滚

Author: yumaojun03

http/middleware/recovery/recovery_test.go

@@ -30,7 +30,7 @@ func Test_Recovery(t *testing.T) {
 	should.NoError(err)
 
 	router.ServeHTTP(recorder, req)
-	should.Equal(recorder.Code, http.StatusOK)
+	should.Equal(recorder.Code, http.StatusInternalServerError)
 }
 
 func init() {

http/response/send.go

@@ -26,8 +26,13 @@ func Failed(w http.ResponseWriter, err error) {
 		errCode = exception.UnKnownException
 	}
 
-	// 统一使用业务code, http code固定200
-	httpCode = http.StatusOK
+	// 映射http status code 1xx - 5xx
+	// 如果为其他errCode, 统一成200
+	if errCode/100 >= 1 && errCode/100 <= 5 {
+		httpCode = errCode
+	} else {
+		httpCode = http.StatusOK
+	}
 
 	resp := Data{
 		Code:      &errCode,
@@ -38,7 +43,6 @@ func Failed(w http.ResponseWriter, err error) {
 
 	// set response heanders
 	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Err-Code", fmt.Sprintf("%d", errCode))
 
 	// if marshal json error, use string to response
 	respByt, err := json.Marshal(resp)

http/router/httprouter/httprouter_test.go

@@ -115,7 +115,7 @@ func TestWithAutherFailed(t *testing.T) {
 	r.Handle("GET", "/", IndexHandler).EnableAuth()
 	r.ServeHTTP(w, req)
 
-	should.Equal(200, w.Code)
+	should.Equal(401, w.Code)
 }
 
 func TestWithAutherOK(t *testing.T) {
@@ -160,7 +160,7 @@ func TestWithParamsFailed(t *testing.T) {
 	r.Handle("GET", "/:id", WithContextHandler)
 	r.ServeHTTP(w, req)
 
-	should.Equal(200, w.Code)
+	should.Equal(400, w.Code)
 }
 
 func TestSetLabel(t *testing.T) {