|
|
@@ -7,6 +7,9 @@ import (
|
|
|
"net/http"
|
|
|
"strings"
|
|
|
|
|
|
+ "google.golang.org/grpc/codes"
|
|
|
+ status2 "google.golang.org/grpc/status"
|
|
|
+
|
|
|
"github.com/go-kratos/kratos/v2/errors"
|
|
|
|
|
|
"google.golang.org/protobuf/encoding/protojson"
|
|
|
@@ -110,15 +113,16 @@ func ErrHandle(w http.ResponseWriter, r *http.Request, err error) {
|
|
|
return
|
|
|
} else if code == 401 {
|
|
|
w.WriteHeader(401)
|
|
|
- status.Proto().Code = 10401
|
|
|
+ status = status2.New(codes.Code(10401), status.Message())
|
|
|
} else {
|
|
|
if code < 10000 {
|
|
|
code = 10000 + code
|
|
|
}
|
|
|
- status.Proto().Code = code
|
|
|
+ message := status.Message()
|
|
|
if code < 10100 && status.Message() == "" {
|
|
|
- status.Proto().Message = "系统错误"
|
|
|
+ message = "系统错误"
|
|
|
}
|
|
|
+ status = status2.New(codes.Code(code), message)
|
|
|
w.WriteHeader(400)
|
|
|
}
|
|
|
data, err := protojson.Marshal(status.Proto())
|
dcsunny