marge: 合并代码

src/framework/utils/ctx/ctx.go

@@ -65,6 +65,11 @@ func IPAddrLocation(c *gin.Context) (string, string) {
 
 // Authorization 解析请求头
 func Authorization(c *gin.Context) string {
+	// Query请求查询
+	if authQuery, ok := c.GetQuery(token.RESPONSE_FIELD); ok && authQuery != "" {
+		return authQuery
+	}
+	// Header请求头
 	authHeader := c.GetHeader(token.HEADER_KEY)
 	if authHeader == "" {
 		return ""
@@ -99,11 +104,22 @@ func UaOsBrowser(c *gin.Context) (string, string) {
 // AcceptLanguage 解析客户端接收语言 zh：中文 en: 英文
 func AcceptLanguage(c *gin.Context) string {
 	preferredLanguage := language.English
-	acceptLanguage := c.GetHeader("Accept-Language")
-	tags, _, _ := language.ParseAcceptLanguage(acceptLanguage)
-	if len(tags) > 0 {
-		preferredLanguage = tags[0]
+
+	// Query请求查询
+	if v, ok := c.GetQuery("language"); ok && v != "" {
+		tags, _, _ := language.ParseAcceptLanguage(v)
+		if len(tags) > 0 {
+			preferredLanguage = tags[0]
+		}
 	}
+	//  Header请求头
+	if v := c.GetHeader("Accept-Language"); v != "" {
+		tags, _, _ := language.ParseAcceptLanguage(v)
+		if len(tags) > 0 {
+			preferredLanguage = tags[0]
+		}
+	}
+
 	// 只取前缀
 	lang := preferredLanguage.String()
 	arr := strings.Split(lang, "-")