before merge

2025-07-29 20:39:20 +08:00 · 2025-07-29 20:39:20 +08:00 · 6c4f1a21e4
commit 6c4f1a21e4
parent 4919dfc0ec
2 changed files with 1 additions and 5 deletions
--- a/config/ai_model.json
+++ b/config/ai_model.json
@ -5,7 +5,7 @@
    "temperature": 0.3,
    "top_p": 0.4,
    "presence_penalty": 1.2,
-    "timeout": 120,
+    "timeout": 60000,
    "max_retries": 3,
    "stream": true
 } 
--- a/config/database.json
+++ b/config/database.json
@ -1,11 +1,7 @@
 {
    "host": "localhost",
    "user": "root",
-<<<<<<< HEAD
    "password": "civmek-rezTed-0hovre",
-=======
-    "password": "Kj#9mP2$",
->>>>>>> 29551abc2e623c9624b7f72252e1b6a3b0c2a7ac
    "database": "travel_content",
    "port": 3306,
    "charset": "utf8mb4"