新增自定义的 Cors

goctl_template/api/main.tpl

@@ -15,7 +15,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+		server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

goctl_template_backend/api/main.tpl

@@ -15,7 +15,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+		server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

proxyserver/main.go

@@ -30,7 +30,7 @@ func SetCors(w http.ResponseWriter, r *http.Request) {
 
 func main() {
 	rootDir := "../server" // Change this to your root directory
-	vueBuild := "/home/ldm/workdir/fusenpack-vue-created"
+	vueBuild := "/home/eson/workspace/fusenpack-vue-created"
 	apiURL, err := url.Parse("http://localhost:9900")
 	if err != nil {
 		panic(err)
@@ -130,7 +130,7 @@ func NewBackend(mux *http.ServeMux, httpAddress string, muxPaths ...string) *Bac
 			return
 		}
 
-		hasBridge := strings.Contains(r.Header.Get("Access-Control-Request-Headers"), "bridge")
+		// hasBridge := strings.Contains(r.Header.Get("Access-Control-Request-Headers"), "bridge")
 
 		// 解析目标URL时已经包含了查询参数
 		targetURL.RawQuery = r.URL.RawQuery
@@ -166,9 +166,9 @@ func NewBackend(mux *http.ServeMux, httpAddress string, muxPaths ...string) *Bac
 			}
 		}
 
-		if hasBridge {
+		// if hasBridge {
-			w.Header().Add("Access-Control-Allow-Headers", "Bridge")
+		// 	w.Header().Add("Access-Control-Allow-Headers", "Bridge")
-		}
+		// }
 
 		// 转发目标服务器的响应状态码和主体
 		w.WriteHeader(resp.StatusCode)
@@ -177,8 +177,8 @@ func NewBackend(mux *http.ServeMux, httpAddress string, muxPaths ...string) *Bac
 			http.Error(w, "Error copying proxy response", http.StatusInternalServerError)
 			return
 		}
-
 	}
+
 	for _, muxPath := range muxPaths {
 		mux.HandleFunc(muxPath, handleRequest)
 	}

server/backend/backend.go

@@ -3,10 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 
 	"fusenapi/server/backend/internal/config"
 	"fusenapi/server/backend/internal/handler"
 	"fusenapi/server/backend/internal/svc"
+	"fusenapi/utils/auth"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,7 +22,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

server/canteen/canteen.go

@@ -3,10 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 
 	"fusenapi/server/canteen/internal/config"
 	"fusenapi/server/canteen/internal/handler"
 	"fusenapi/server/canteen/internal/svc"
+	"fusenapi/utils/auth"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,7 +22,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

server/data-transfer/data-transfer.go

@@ -6,6 +6,8 @@ import (
 	config2 "fusenapi/server/data-transfer/internal/config"
 	handler2 "fusenapi/server/data-transfer/internal/handler"
 	svc2 "fusenapi/server/data-transfer/internal/svc"
+	"fusenapi/utils/auth"
+	"net/http"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -19,7 +21,9 @@ func main() {
 	var c config2.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc2.NewServiceContext(c)

server/home-user-auth/home-user-auth.go

@@ -3,10 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 
 	"fusenapi/server/home-user-auth/internal/config"
 	"fusenapi/server/home-user-auth/internal/handler"
 	"fusenapi/server/home-user-auth/internal/svc"
+	"fusenapi/utils/auth"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,7 +22,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

server/inventory/inventory.go

@@ -3,10 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 
 	"fusenapi/server/inventory/internal/config"
 	"fusenapi/server/inventory/internal/handler"
 	"fusenapi/server/inventory/internal/svc"
+	"fusenapi/utils/auth"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,7 +22,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

server/map-library/map-library.go

@@ -3,10 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 
 	"fusenapi/server/map-library/internal/config"
 	"fusenapi/server/map-library/internal/handler"
 	"fusenapi/server/map-library/internal/svc"
+	"fusenapi/utils/auth"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,7 +22,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

server/orders/orders.go

@@ -3,10 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 
 	"fusenapi/server/orders/internal/config"
 	"fusenapi/server/orders/internal/handler"
 	"fusenapi/server/orders/internal/svc"
+	"fusenapi/utils/auth"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,7 +22,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

server/product-model/product-model.go

@@ -3,10 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 
 	"fusenapi/server/product-model/internal/config"
 	"fusenapi/server/product-model/internal/handler"
 	"fusenapi/server/product-model/internal/svc"
+	"fusenapi/utils/auth"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,7 +22,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

server/product-template/product-template.go

@@ -3,10 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 
 	"fusenapi/server/product-template/internal/config"
 	"fusenapi/server/product-template/internal/handler"
 	"fusenapi/server/product-template/internal/svc"
+	"fusenapi/utils/auth"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,7 +22,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

server/product/product.go

@@ -3,10 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 
 	"fusenapi/server/product/internal/config"
 	"fusenapi/server/product/internal/handler"
 	"fusenapi/server/product/internal/svc"
+	"fusenapi/utils/auth"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,7 +22,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 	ctx := svc.NewServiceContext(c)
 	handler.RegisterHandlers(server, ctx)

server/shopping-cart-confirmation/shopping-cart-confirmation.go

@@ -3,10 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 
 	"fusenapi/server/shopping-cart-confirmation/internal/config"
 	"fusenapi/server/shopping-cart-confirmation/internal/handler"
 	"fusenapi/server/shopping-cart-confirmation/internal/svc"
+	"fusenapi/utils/auth"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,7 +22,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

server/upload/upload.go

@@ -3,10 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 
 	"fusenapi/server/upload/internal/config"
 	"fusenapi/server/upload/internal/handler"
 	"fusenapi/server/upload/internal/svc"
+	"fusenapi/utils/auth"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,7 +22,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

server/webset/webset.go

@@ -3,10 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 
 	"fusenapi/server/webset/internal/config"
 	"fusenapi/server/webset/internal/handler"
 	"fusenapi/server/webset/internal/svc"
+	"fusenapi/utils/auth"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -20,7 +22,9 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	server := rest.MustNewServer(c.RestConf, rest.WithCors())
+	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
+
+	}))
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

utils/auth/cors.go

@@ -0,0 +1,11 @@
+package auth
+
+import "net/http"
+
+func FsCors(header http.Header) {
+	header.Set("Access-Control-Allow-Origin", "*")
+	header.Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE")
+	header.Set("Access-Control-Allow-Headers", "*")
+	header.Set("Access-Control-Expose-Headers", "*")
+	header.Set("Access-Control-Allow-Credentials", "true")
+}