fix: remove openai domain config

tisfeng · Feb 1, 2024 · 9579b3e · 9579b3e
1 parent 1109f1f
commit 9579b3e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 49 deletions.
diff --git a/Easydict/App/Localizable.xcstrings b/Easydict/App/Localizable.xcstrings
@@ -2613,39 +2613,7 @@
         }
       }
     },
-    "service.configuration.openai.domain.placeholder" : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "api.openai.com"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "api.openai.com"
-          }
-        }
-      }
-    },
-    "service.configuration.openai.domain.title" : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Domain"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "域名"
-          }
-        }
-      }
-    },
-    "service.configuration.openai.endpoint_key.placeholder" : {
+    "service.configuration.openai.endpoint.placeholder" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
@@ -2661,7 +2629,7 @@
         }
       }
     },
-    "service.configuration.openai.endpoint_key.title" : {
+    "service.configuration.openai.endpoint.title" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
@@ -3894,4 +3862,4 @@
     }
   },
   "version" : "1.0"
-}
+}
diff --git a/Easydict/Feature/Service/Gemini/GeminiService.swift b/Easydict/Feature/Service/Gemini/GeminiService.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2024 izual. All rights reserved.
 //
 
+import Defaults
 import Foundation
 import GoogleGenerativeAI
 
@@ -59,7 +60,7 @@ public final class GeminiService: QueryService {
 
     // easydict://writeKeyValue?EZGeminiAPIKey=xxx
     private var apiKey: String {
-        let apiKey = UserDefaults.standard.string(forKey: EZGeminiAPIKey)
+        let apiKey = Defaults[.geminiAPIKey]
         if let apiKey, !apiKey.isEmpty {
             return apiKey
         } else {

diff --git a/Easydict/NewApp/Configuration/Configuration+Defaults.swift b/Easydict/NewApp/Configuration/Configuration+Defaults.swift
@@ -137,7 +137,6 @@ extension Defaults.Keys {
     static let openAIDictionary = Key<String>("EZOpenAIDictionaryKey", default: "1")
     static let openAISentence = Key<String>("EZOpenAISentenceKey", default: "1")
     static let openAIServiceUsageStatus = Key<String>("EZOpenAIServiceUsageStatusKey", default: "0")
-    static let openAIDomain = Key<String?>("EZOpenAIDomainKey")
     static let openAIEndPoint = Key<String?>("EZOpenAIEndPointKey")
     static let openAIModel = Key<String>("EZOpenAIModelKey", default: OpenAIModels.gpt3_5_turbo.rawValue)
 

diff --git a/...ility/Extensions/QueryService+ConfigurableService/OpenAIService+ConfigurableService.swift b/...ility/Extensions/QueryService+ConfigurableService/OpenAIService+ConfigurableService.swift
@@ -39,17 +39,11 @@ extension EZOpenAIService: ConfigurableService {
                 key: .openAIAPIKey,
                 placeholder: "service.configuration.openai.api_key.placeholder"
             )
-            // domain
+            // endpoint
             ServiceConfigurationInputCell(
-                textFieldTitleKey: "service.configuration.openai.domain.title",
-                key: .openAIDomain,
-                placeholder: "service.configuration.openai.domain.placeholder"
-            )
-            // endpoint key
-            ServiceConfigurationInputCell(
-                textFieldTitleKey: "service.configuration.openai.endpoint_key.title",
+                textFieldTitleKey: "service.configuration.openai.endpoint.title",
                 key: .openAIEndPoint,
-                placeholder: "service.configuration.openai.endpoint_key.placeholder"
+                placeholder: "service.configuration.openai.endpoint.placeholder"
             )
             // model
             ServiceConfigurationPickerCell(

diff --git a/Easydict/NewApp/View/SettingView/Tabs/ServiceConfiguration/ServiceConfigurationCells.swift b/Easydict/NewApp/View/SettingView/Tabs/ServiceConfiguration/ServiceConfigurationCells.swift
@@ -104,9 +104,9 @@ struct ServiceConfigurationToggleCell: View {
         )
 
         ServiceConfigurationInputCell(
-            textFieldTitleKey: "service.configuration.openai.domain.title",
-            key: .openAIDomain,
-            placeholder: "service.configuration.openai.domain.placeholder"
+            textFieldTitleKey: "service.configuration.openai.endpoint.title",
+            key: .openAIEndPoint,
+            placeholder: "service.configuration.openai.endpoint.placeholder"
         )
 
         // model