Browse Source

去除JWT验证/修正丢失flush的bug

liwei 1 week ago
parent
commit
51ec4c3683

+ 1 - 1
desc/openapi/chat.api

@@ -177,7 +177,7 @@ service Wechat {
 	
     group: chat
     prefix: /v1
-	jwt: Auth
+	//jwt: Auth
 	middleware: OpenAuthority
 )
 

+ 1 - 1
internal/handler/routes.go

@@ -876,7 +876,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				},
 			}...,
 		),
-		rest.WithJwt(serverCtx.Config.Auth.AccessSecret),
+		//rest.WithJwt(serverCtx.Config.Auth.AccessSecret),
 		rest.WithPrefix("/v1"),
 	)
 

+ 2 - 2
internal/middleware/openauthority_middleware.go

@@ -89,12 +89,12 @@ func (m *OpenAuthorityMiddleware) Handle(next http.HandlerFunc) http.HandlerFunc
 		ctx = contextkey.HttpResponseWriterKey.WithValue(ctx, w) //context存入http.ResponseWriter
 		authToken := jwt.StripBearerPrefixFromToken(r.Header.Get("Authorization"))
 		if len(authToken) == 0 {
-			httpx.Error(w, errorx.NewApiError(http.StatusForbidden, "无法获token"))
+			httpx.Error(w, errorx.NewApiError(http.StatusForbidden, "无法获token"))
 			return
 		}
 		apiKeyObj, err := m.checkTokenUserInfo(ctx, authToken)
 		if err != nil {
-			httpx.Error(w, errorx.NewApiError(http.StatusForbidden, "无法获得合理的授权信息"))
+			httpx.Error(w, errorx.NewApiError(http.StatusForbidden, "无法获取合适的授权信息"))
 			return
 		}
 		//ctx = contextkey.OpenapiTokenKey.WithValue(ctx, apiToken)

+ 1 - 0
internal/utils/compapi/func.go

@@ -91,6 +91,7 @@ func DoChatCompletionsStream(ctx context.Context, client *openai.Client, chatInf
 	for chatStream.Next() {
 		chunk := chatStream.Current()
 		fmt.Fprintf(hw, "event:%s\ndata:%s\n\n", chunk.Event, chunk.Data.RAW)
+		flusher.Flush()
 		//time.Sleep(1 * time.Millisecond)
 	}
 	fmt.Fprintf(hw, "event:%s\ndata:%s\n\n", "answer", "[DONE]")