diff --git a/README.md b/README.md index e0d95a9..e02dac4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ * @Author: Vincent Young * @Date: 2022-10-18 07:32:29 * @LastEditors: Vincent Young - * @LastEditTime: 2024-04-16 14:52:46 + * @LastEditTime: 2024-04-16 15:10:38 * @FilePath: /DeepLX/README.md * @Telegram: https://t.me/missuo * @@ -71,10 +71,10 @@ - `-authkey` : DeepL Official `AuthKey`. If you have set it up, after the 429 response, the official AuthKey will be used for the request. If multiple authKeys are used simultaneously, they need to be separated by commas. - `/v2/translate` : This endpoint is fully compatible with the DeepL official API. When using this endpoint, please strictly adhere to the request styles outlined in the official DeepL documentation. Note that in this endpoint, please use `DeepL-Auth-Key $token` in the `Authorization`, which is actually the Access Token, not the official `Auth Key` of DeepL. +#### Example of requesting a token-protected `/v2/translate` endpoint ```bash -# Example of requesting a token-protected /v2/translate endpoint -curl -X POST 'http://127.0.0.1:1188/v2/translate' \ ---header 'Authorization: DeepL-Auth-Key [yourAccessToken]' \ +curl -X POST 'http://localhost:1188/v2/translate' \ +--header 'Authorization: DeepL-Auth-Key [yourAccessToken] [yourAuthKey]' \ --header 'Content-Type: application/json' \ --data '{ "text": [ @@ -82,6 +82,7 @@ curl -X POST 'http://127.0.0.1:1188/v2/translate' \ ], "target_lang": "DE" }' +# Please note that either `yourAccessToken` or `yourAuthKey` can be omitted. ``` #### Requesting a token-protected **DeepLX API** instance using the `curl` diff --git a/main.go b/main.go index 1a2d02e..0236f32 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,7 @@ * @Author: Vincent Yang * @Date: 2023-07-01 21:45:34 * @LastEditors: Vincent Young - * @LastEditTime: 2024-04-16 14:47:43 + * @LastEditTime: 2024-04-16 15:07:54 * @FilePath: /DeepLX/main.go * @Telegram: https://t.me/missuo * @GitHub: https://github.com/missuo @@ -434,21 +434,48 @@ func main() { r.POST("/v2/translate", authMiddleware(cfg), func(c *gin.Context) { authorizationHeader := c.GetHeader("Authorization") - parts := strings.Split(authorizationHeader, " ") var authKey string - if len(parts) == 2 { - authKey = parts[1] + + if strings.HasPrefix(authorizationHeader, "DeepL-Auth-Key") { + parts := strings.Split(authorizationHeader, " ") + if len(parts) >= 2 && strings.HasSuffix(parts[len(parts)-1], ":fx") { + authKey = parts[len(parts)-1] + } } - translateText := c.PostForm("text") - targetLang := c.PostForm("target_lang") + + var translateText string + var targetLang string + + translateText = c.PostForm("text") + targetLang = c.PostForm("target_lang") + + if translateText == "" || targetLang == "" { + var jsonData struct { + Text []string `json:"text"` + TargetLang string `json:"target_lang"` + } + + if err := c.BindJSON(&jsonData); err != nil { + c.JSON(http.StatusBadRequest, gin.H{ + "code": http.StatusBadRequest, + "message": "Invalid request payload", + }) + return + } + + translateText = strings.Join(jsonData.Text, "\n") + targetLang = jsonData.TargetLang + } + result, err := translateByDeepLX("", targetLang, translateText, authKey) if err != nil { log.Fatalf("Translation failed: %s", err) } + if result.Code == http.StatusOK { c.JSON(http.StatusOK, gin.H{ - "translations": []interface{}{ - map[string]interface{}{ + "translations": []map[string]interface{}{ + { "detected_source_language": result.SourceLang, "text": result.Data, },