Merge remote-tracking branch 'origin/main'

# Conflicts:
#	udeserver.go

udeserver.go

@@ -7,13 +7,14 @@ import (
 	"flag"
 	"fmt"
 
+	"udeServer/internal/apierr"
 	"udeServer/internal/config"
 	"udeServer/internal/handler"
-	"udeServer/internal/response"
 	"udeServer/internal/svc"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
+	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 var configFile = flag.String("f", "etc/udeserver-api.yaml", "the config file")
@@ -24,11 +25,15 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	// 所有成功/失败响应统一封装为 {"code":100000/100xxx,"message":...,"data":...}，
-	// HTTP 状态恒为 200。
-	response.Register()
-
-	server := rest.MustNewServer(c.RestConf)
+	httpx.SetErrorHandler(func(err error) (int, any) {
+		status := apierr.Status(err)
+		return status, map[string]any{
+			"code": status,
+			"msg":  err.Error(),
+		}
+	})
+	//  rest.WithCors() 解决跨域
+	server := rest.MustNewServer(c.RestConf, rest.WithCors())
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)