From dd89582443fde7742dc845a55f3bb616578b4cf6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 30 Oct 2024 11:30:53 +0800
Subject: [PATCH] 1

---
 server/wheelserver/api/v1/enter.go           | 16 +++++++++++--
 server/wheelserver/api/v1/shop/enter.go      |  2 +-
 server/wheelserver/middleware/cors.go        | 24 ++++++++++++++++++++
 server/wheelserver/router/activity/enter.go  |  2 +-
 server/wheelserver/router/chip/chip.go       |  2 +-
 server/wheelserver/router/chip/enter.go      |  2 +-
 server/wheelserver/router/friend/enter.go    |  2 +-
 server/wheelserver/router/friend/friend.go   |  2 +-
 server/wheelserver/router/item/enter.go      |  2 +-
 server/wheelserver/router/item/item.go       |  2 +-
 server/wheelserver/router/mission/enter.go   |  2 +-
 server/wheelserver/router/mission/mission.go |  2 +-
 server/wheelserver/router/routermgr.go       | 20 ++++++++++++----
 server/wheelserver/router/shop/enter.go      |  2 +-
 server/wheelserver/router/shop/shop.go       |  2 +-
 server/wheelserver/router/user/enter.go      |  2 +-
 server/wheelserver/router/user/user.go       |  2 +-
 17 files changed, 68 insertions(+), 20 deletions(-)
 create mode 100644 server/wheelserver/middleware/cors.go

diff --git a/server/wheelserver/api/v1/enter.go b/server/wheelserver/api/v1/enter.go
index 6dc5e6b9..386f0646 100644
--- a/server/wheelserver/api/v1/enter.go
+++ b/server/wheelserver/api/v1/enter.go
@@ -1,11 +1,23 @@
 package v1
 
 import (
-	"main/api/v1/nft"
+	"main/api/v1/activity"
+	"main/api/v1/chip"
+	"main/api/v1/friend"
+	"main/api/v1/item"
+	"main/api/v1/mission"
+	"main/api/v1/shop"
+	"main/api/v1/user"
 )
 
 type ApiGroup struct {
-	NftApiGroup  nft.ApiGroup
+	ActivityApiGroup activity.ApiGroup
+	ChipApiGroup chip.ApiGroup
+	FriendApiGroup friend.ApiGroup
+	ItemApiGroup item.ApiGroup
+	MissionApiGroup mission.ApiGroup
+	ShopApiGroup shop.ApiGroup
+	UserApiGroup user.ApiGroup
 }
 
 var ApiGroupApp = new(ApiGroup)
diff --git a/server/wheelserver/api/v1/shop/enter.go b/server/wheelserver/api/v1/shop/enter.go
index 9072d106..b2d2e804 100644
--- a/server/wheelserver/api/v1/shop/enter.go
+++ b/server/wheelserver/api/v1/shop/enter.go
@@ -1,4 +1,4 @@
-package enter
+package shop
 
 type ApiGroup struct {
 	ShopApi
diff --git a/server/wheelserver/middleware/cors.go b/server/wheelserver/middleware/cors.go
new file mode 100644
index 00000000..6dc36b67
--- /dev/null
+++ b/server/wheelserver/middleware/cors.go
@@ -0,0 +1,24 @@
+package middleware
+
+import (
+	"github.com/gin-gonic/gin"
+	//	"net/http"
+)
+
+func Cors() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		method := c.Request.Method
+		//origin := c.Request.Header.Get("Origin")
+		//if origin != "" {
+		//c.Header("Access-Control-Allow-Origin", "*") // 可将将 * 替换为指定的域名
+		c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE, UPDATE")
+		c.Header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization")
+		c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Cache-Control, Content-Language, Content-Type")
+		c.Header("Access-Control-Allow-Credentials", "true")
+		//}
+		if method == "OPTIONS" {
+			c.AbortWithStatus(200)
+		}
+		c.Next()
+	}
+}
diff --git a/server/wheelserver/router/activity/enter.go b/server/wheelserver/router/activity/enter.go
index 190bdc09..b6bfc5c8 100644
--- a/server/wheelserver/router/activity/enter.go
+++ b/server/wheelserver/router/activity/enter.go
@@ -1,5 +1,5 @@
 package activity
 
-type ApiGroup struct {
+type RouterGroup struct {
 	ActivityRouter
 }
diff --git a/server/wheelserver/router/chip/chip.go b/server/wheelserver/router/chip/chip.go
index da8e9e40..a7c18a11 100644
--- a/server/wheelserver/router/chip/chip.go
+++ b/server/wheelserver/router/chip/chip.go
@@ -7,7 +7,7 @@ import (
 
 type ChipRouter struct{}
 
-func (this *CipRouter) InitRouter() {
+func (this *ChipRouter) InitRouter() {
 	api := v1.ApiGroupApp.ChipApiGroup
 	f5.GetApp().GetGinEngine().GET("/api/v1/chip/list", api.ChipApi.List)
 }
diff --git a/server/wheelserver/router/chip/enter.go b/server/wheelserver/router/chip/enter.go
index 7e7c9baf..3474deb4 100644
--- a/server/wheelserver/router/chip/enter.go
+++ b/server/wheelserver/router/chip/enter.go
@@ -1,5 +1,5 @@
 package chip
 
-type ApiGroup struct {
+type RouterGroup struct {
 	ChipRouter
 }
diff --git a/server/wheelserver/router/friend/enter.go b/server/wheelserver/router/friend/enter.go
index e59a12a2..00333f38 100644
--- a/server/wheelserver/router/friend/enter.go
+++ b/server/wheelserver/router/friend/enter.go
@@ -1,5 +1,5 @@
 package friend
 
-type ApiGroup struct {
+type RouterGroup struct {
 	FriendRouter
 }
diff --git a/server/wheelserver/router/friend/friend.go b/server/wheelserver/router/friend/friend.go
index a4cac18f..5f4c8665 100644
--- a/server/wheelserver/router/friend/friend.go
+++ b/server/wheelserver/router/friend/friend.go
@@ -7,7 +7,7 @@ import (
 
 type FriendRouter struct{}
 
-func (this *CipRouter) InitRouter() {
+func (this *FriendRouter) InitRouter() {
 	api := v1.ApiGroupApp.FriendApiGroup
 	f5.GetApp().GetGinEngine().GET("/api/v1/friend/list", api.FriendApi.List)
 	f5.GetApp().GetGinEngine().GET("/api/v1/friend/invite", api.FriendApi.Invite)
diff --git a/server/wheelserver/router/item/enter.go b/server/wheelserver/router/item/enter.go
index fadd6195..2d35ef7e 100644
--- a/server/wheelserver/router/item/enter.go
+++ b/server/wheelserver/router/item/enter.go
@@ -1,5 +1,5 @@
 package item
 
-type ApiGroup struct {
+type RouterGroup struct {
 	ItemRouter
 }
diff --git a/server/wheelserver/router/item/item.go b/server/wheelserver/router/item/item.go
index efdf7d49..2cff3431 100644
--- a/server/wheelserver/router/item/item.go
+++ b/server/wheelserver/router/item/item.go
@@ -7,7 +7,7 @@ import (
 
 type ItemRouter struct{}
 
-func (this *CipRouter) InitRouter() {
+func (this *ItemRouter) InitRouter() {
 	api := v1.ApiGroupApp.ItemApiGroup
 	f5.GetApp().GetGinEngine().GET("/api/v1/item/list", api.ItemApi.List)
 }
diff --git a/server/wheelserver/router/mission/enter.go b/server/wheelserver/router/mission/enter.go
index e1322967..6af0c564 100644
--- a/server/wheelserver/router/mission/enter.go
+++ b/server/wheelserver/router/mission/enter.go
@@ -1,5 +1,5 @@
 package mission
 
-type ApiGroup struct {
+type RouterGroup struct {
 	MissionRouter
 }
diff --git a/server/wheelserver/router/mission/mission.go b/server/wheelserver/router/mission/mission.go
index 4f5dc29d..ed19b2a5 100644
--- a/server/wheelserver/router/mission/mission.go
+++ b/server/wheelserver/router/mission/mission.go
@@ -7,7 +7,7 @@ import (
 
 type MissionRouter struct{}
 
-func (this *CipRouter) InitRouter() {
+func (this *MissionRouter) InitRouter() {
 	api := v1.ApiGroupApp.MissionApiGroup
 	f5.GetApp().GetGinEngine().GET("/api/v1/mission/list", api.MissionApi.List)
 }
diff --git a/server/wheelserver/router/routermgr.go b/server/wheelserver/router/routermgr.go
index f7ae2a0f..37cae317 100644
--- a/server/wheelserver/router/routermgr.go
+++ b/server/wheelserver/router/routermgr.go
@@ -2,17 +2,29 @@ package router
 
 import (
 	"f5"
-	//"main/router/nft"
+	"main/middleware"
+	"main/router/activity"
+	"main/router/chip"
+	"main/router/friend"
+	"main/router/item"
+	"main/router/mission"
+	"main/router/shop"
+	"main/router/user"
 )
 
 type routerMgr struct {
+	activity activity.RouterGroup
+	chip chip.RouterGroup
+	friend friend.RouterGroup
+	item item.RouterGroup
+	mission mission.RouterGroup
+	shop shop.RouterGroup
+	user user.RouterGroup
 }
 
 func (this *routerMgr) Init() {
-	/*
 	f5.GetApp().GetGinEngine().Use(middleware.Cors())
-	*/
-	//this.nft.NftMetaRouter.InitRouter()
+	this.activity.ActivityRouter.InitRouter()
 	//this.nft.NftDetailRouter.InitRouter()
 
 	f5.GetSysLog().Info("routerMgr.init")
diff --git a/server/wheelserver/router/shop/enter.go b/server/wheelserver/router/shop/enter.go
index 30a7cc80..63044359 100644
--- a/server/wheelserver/router/shop/enter.go
+++ b/server/wheelserver/router/shop/enter.go
@@ -1,5 +1,5 @@
 package shop
 
-type ApiGroup struct {
+type RouterGroup struct {
 	ShopRouter
 }
diff --git a/server/wheelserver/router/shop/shop.go b/server/wheelserver/router/shop/shop.go
index 43730ed1..d684c1e8 100644
--- a/server/wheelserver/router/shop/shop.go
+++ b/server/wheelserver/router/shop/shop.go
@@ -7,7 +7,7 @@ import (
 
 type ShopRouter struct{}
 
-func (this *CipRouter) InitRouter() {
+func (this *ShopRouter) InitRouter() {
 	api := v1.ApiGroupApp.ShopApiGroup
 	f5.GetApp().GetGinEngine().GET("/api/v1/shop/goods", api.ShopApi.Goods)
 }
diff --git a/server/wheelserver/router/user/enter.go b/server/wheelserver/router/user/enter.go
index 2ea6d6e4..2ec59bde 100644
--- a/server/wheelserver/router/user/enter.go
+++ b/server/wheelserver/router/user/enter.go
@@ -1,5 +1,5 @@
 package user
 
-type ApiGroup struct {
+type RouterGroup struct {
 	UserRouter
 }
diff --git a/server/wheelserver/router/user/user.go b/server/wheelserver/router/user/user.go
index 67eb43f9..9b1fa03e 100644
--- a/server/wheelserver/router/user/user.go
+++ b/server/wheelserver/router/user/user.go
@@ -7,7 +7,7 @@ import (
 
 type UserRouter struct{}
 
-func (this *CipRouter) InitRouter() {
+func (this *UserRouter) InitRouter() {
 	api := v1.ApiGroupApp.UserApiGroup
 	f5.GetApp().GetGinEngine().POST("/api/v1/user/login", api.UserApi.Login)
 }