From 70388e5fe613c171649d317e097eb499f391db6c Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 18 Mar 2024 11:11:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=88=E6=9D=83=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=A4=B4=E5=92=8C=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81accessToken=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/framework/config/config/config.default.yaml | 6 ++++--
 src/framework/config/config/config.prod.yaml    | 2 +-
 src/framework/constants/token/token.go          | 3 +++
 src/framework/utils/ctx/ctx.go                  | 9 +++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/framework/config/config/config.default.yaml b/src/framework/config/config/config.default.yaml
index 40ab8cc..ae82128 100644
--- a/src/framework/config/config/config.default.yaml
+++ b/src/framework/config/config/config.default.yaml
@@ -1,12 +1,12 @@
 # 项目信息
 framework:
   name: "CN EMS"
-  version: "2.2401.1"
+  version: "2.2403.1"
 
 # 应用服务配置
 server:
   # 服务端口
-  port: 3030
+  port: 33030
   # 是否开启代理
   proxy: false
 
@@ -100,6 +100,8 @@ cors:
     - "Accept-Language"
     - "Accept"
     - "Range"
+    # 非标准请求头
+    - "accessToken",
     - "Accesstoken"
     - "Operationtype"
   # 设置 Access-Control-Expose-Headers 的值
diff --git a/src/framework/config/config/config.prod.yaml b/src/framework/config/config/config.prod.yaml
index 36cccb2..3125e34 100644
--- a/src/framework/config/config/config.prod.yaml
+++ b/src/framework/config/config/config.prod.yaml
@@ -1,6 +1,6 @@
 # 应用服务配置
 server:
-  port: 3030
+  port: 33030
   proxy: true
 
 # security 安全
diff --git a/src/framework/constants/token/token.go b/src/framework/constants/token/token.go
index 5c71b08..04b8ee8 100644
--- a/src/framework/constants/token/token.go
+++ b/src/framework/constants/token/token.go
@@ -19,3 +19,6 @@ const JWT_KEY = "user_id"
 
 // 令牌-JWT标识用户登录账号字段
 const JWT_NAME = "user_name"
+
+// NMS北向使用-数据响应字段和请求头授权
+const ACCESS_TOKEN = "accessToken"
diff --git a/src/framework/utils/ctx/ctx.go b/src/framework/utils/ctx/ctx.go
index 2cdc954..1a13f5a 100644
--- a/src/framework/utils/ctx/ctx.go
+++ b/src/framework/utils/ctx/ctx.go
@@ -66,6 +66,15 @@ func IPAddrLocation(c *gin.Context) (string, string) {
 
 // Authorization 解析请求头
 func Authorization(c *gin.Context) string {
+	// Query请求查询
+	if authQuery, ok := c.GetQuery(token.ACCESS_TOKEN); ok && authQuery != "" {
+		return authQuery
+	}
+	// Header请求头
+	if authHeader := c.GetHeader(token.ACCESS_TOKEN); authHeader != "" {
+		return authHeader
+	}
+
 	// Query请求查询
 	if authQuery, ok := c.GetQuery(token.RESPONSE_FIELD); ok && authQuery != "" {
 		return authQuery