游戏更新公告修改

server/internal/admin/middleware/apitoken.go

@@ -21,3 +21,18 @@ func ApiToken() gin.HandlerFunc {
 		return
 	}
 }
+
+func GameApiToken() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		if os.Getenv("RELEASE_GM_API_TOKEN") != c.GetHeader("token") {
+			c.JSON(200, serializer.GameApiResponse{
+				ErrCode: consts.CodeCheckLogin,
+				Msg:     "token认证失败！",
+			})
+			c.Abort()
+			return
+		}
+		c.Next()
+		return
+	}
+}

server/internal/admin/middleware/cors.go

@@ -9,9 +9,9 @@ import (
 func Cors(c *gin.Context) {
 	method := c.Request.Method
 	c.Header("ACCESS-CONTROL-ALLOW-ORIGIN", "*")
-	c.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization, Token")
-	c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS")
-	c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type")
+	c.Header("Access-Control-Allow-Headers", "*")
+	c.Header("Access-Control-Allow-Methods", "*")
+	c.Header("Access-Control-Expose-Headers", "*")
 	c.Header("Access-Control-Allow-Credentials", "true")
 	if method == "OPTIONS" {
 		c.AbortWithStatus(http.StatusNoContent)

server/internal/admin/server/router.go

@@ -64,7 +64,10 @@ func NewEngine() *gin.Engine {
 		peripherals := group.Group("peripherals")
 		peripherals.Use(middleware.ApiToken())
 		peripherals.POST("receiveCdk", api.PeripheralsReceiveCdk)
-		peripherals.GET("announcement/info", api.AnnouncementInfo) // 获取游戏更新公告
+
+		game := group.Group("game")
+		//game.Use(middleware.GameApiToken())
+		game.GET("announcement/info", api.AnnouncementInfo) // 获取游戏更新公告
 
 		//feishu := group.Group("feishu")
 		//feishu.Use(middleware.ApiToken())

server/internal/admin/server/start.go

@@ -37,7 +37,7 @@ func Start() {
 	}
 
 	// web页面发送邮件 web -> gadmin-> nats -> world
-	gm_services.EmailCron()
+	//gm_services.EmailCron()
 
 	// 接收从word收到的消息推，准备发送给WEB前端
 	go gm_services.ListenRespMsg()

server/utility/serializer/serializer.go

@@ -8,6 +8,12 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+type GameApiResponse struct {
+	ErrCode int         `json:"errCode"`
+	Data    interface{} `json:"data,omitempty"`
+	Msg     string      `json:"msg"`
+}
+
 type Response struct {
 	Code  int         `json:"code"`
 	Data  interface{} `json:"data,omitempty"`

web/src/layout/components/Header/index.vue

@@ -126,7 +126,14 @@
       <!-- 个人中心 -->
       <div class="layout-header-trigger layout-header-trigger-min">
         <n-dropdown trigger="hover" @select="avatarSelect" :options="avatarOptions">
-          <div class="avatar">
+          <div class="avatar" v-if="user_avatar">
+            <n-avatar round :src="user_avatar">
+              <template #icon>
+                <UserOutlined />
+              </template>
+            </n-avatar>
+          </div>
+          <div class="avatar" v-else>
             <n-avatar round>
               {{ user_name }}
               <template #icon>
@@ -207,6 +214,7 @@
       const state = reactive({
         user_name:
           userStore.getUserInfo.user_name == undefined ? 'user' : userStore.getUserInfo.user_name,
+        user_avatar: userStore.getUserInfo.avatar == undefined ? '' : userStore.getUserInfo.avatar,
         fullscreenIcon: 'FullscreenOutlined',
         navMode: getNavMode,
         navTheme: getNavTheme,