before merge

This commit is contained in:
jinye_huang 2025-07-29 20:39:20 +08:00
parent 4919dfc0ec
commit 6c4f1a21e4
2 changed files with 1 additions and 5 deletions

View File

@ -5,7 +5,7 @@
"temperature": 0.3, "temperature": 0.3,
"top_p": 0.4, "top_p": 0.4,
"presence_penalty": 1.2, "presence_penalty": 1.2,
"timeout": 120, "timeout": 60000,
"max_retries": 3, "max_retries": 3,
"stream": true "stream": true
} }

View File

@ -1,11 +1,7 @@
{ {
"host": "localhost", "host": "localhost",
"user": "root", "user": "root",
<<<<<<< HEAD
"password": "civmek-rezTed-0hovre", "password": "civmek-rezTed-0hovre",
=======
"password": "Kj#9mP2$",
>>>>>>> 29551abc2e623c9624b7f72252e1b6a3b0c2a7ac
"database": "travel_content", "database": "travel_content",
"port": 3306, "port": 3306,
"charset": "utf8mb4" "charset": "utf8mb4"