Merge branch 'feature/fork_241105'

# Conflicts: # main.go # translate/translate.go
luzov · Nov 5, 2024 · 43fc0b6 · 43fc0b6
2 parents a82ecfd + b0de517
commit 43fc0b6
Show file tree

Hide file tree

Showing 4 changed files with 305 additions and 328 deletions.
diff --git a/main.go b/main.go
@@ -1,8 +1,8 @@
 /*
  * @Author: Vincent Yang
  * @Date: 2023-07-01 21:45:34
- * @LastEditors: Vincent Young
- * @LastEditTime: 2024-09-16 12:12:35
+ * @LastEditors: Vincent Yang
+ * @LastEditTime: 2024-11-01 13:04:50
  * @FilePath: /DeepLX/main.go
  * @Telegram: https://t.me/missuo
  * @GitHub: https://github.com/missuo
@@ -131,7 +131,7 @@ func main() {
 			return
 		}
 
-		result, err := translate.TranslateByDeepLX(sourceLang, targetLang, translateText, tagHandling, proxyURL)
+		result, err := translate.TranslateByDeepLX(sourceLang, targetLang, translateText, tagHandling, proxyURL, "")
 		if err != nil {
 			log.Fatalf("Translation failed: %s", err)
 		}
@@ -168,8 +168,6 @@ func main() {
 
 		dlSession := cfg.DlSession
 
-		// fmt.Printf("ENV DL_SESSION: %s\n", cfg.DlSession)
-
 		if tagHandling != "" && tagHandling != "html" && tagHandling != "xml" {
 			c.JSON(http.StatusBadRequest, gin.H{
 				"code":    http.StatusBadRequest,
@@ -187,12 +185,10 @@ func main() {
 			}
 		}
 
-		// log.Printf("dlSession: %s\n", dlSession)
-
 		if dlSession == "" {
 			c.JSON(http.StatusUnauthorized, gin.H{
 				"code":    http.StatusUnauthorized,
-				"message": "No dl_session Found.",
+				"message": "No dl_session Found",
 			})
 			return
 		} else if strings.Contains(dlSession, ".") {
@@ -203,7 +199,7 @@ func main() {
 			return
 		}
 
-		result, err := translate.TranslateByDeepLXPro(sourceLang, targetLang, translateText, tagHandling, dlSession, proxyURL)
+		result, err := translate.TranslateByDeepLX(sourceLang, targetLang, translateText, tagHandling, proxyURL, dlSession)
 		if err != nil {
 			log.Fatalf("Translation failed: %s", err)
 		}
@@ -262,7 +258,7 @@ func main() {
 			return
 		}
 
-		result, err := translate.TranslateByDeepLXPro(sourceLang, targetLang, translateText, tagHandling, dlSession, proxyURL)
+		result, err := translate.TranslateByDeepLX(sourceLang, targetLang, translateText, tagHandling, proxyURL, dlSession)
 		if err != nil {
 			log.Fatalf("Translation failed: %s", err)
 		}
@@ -314,7 +310,7 @@ func main() {
 			targetLang = jsonData.TargetLang
 		}
 
-		result, err := translate.TranslateByDeepLX("", targetLang, translateText, "", proxyURL)
+		result, err := translate.TranslateByDeepLX("", targetLang, translateText, "", proxyURL, "")
 		if err != nil {
 			log.Fatalf("Translation failed: %s", err)
 		}