Merge e808a36 into 565b97b

Hoshinonyaruko · Feb 18, 2024 · d1b863a · d1b863a
2 parents 565b97b + e808a36
commit d1b863a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/front/palworld-front/src/pages/LoginView.vue b/front/palworld-front/src/pages/LoginView.vue
@@ -84,7 +84,7 @@ async function login() {
       void $router.push('/index');
     } else {
       loginError.value =
-        '登录失败，请检查用户名和密码。请查看程序窗口输出的用户名密码，或在同目录下config.json中搜索：serverName、adminPassword 对应用户名，密码。';
+      'Login failed, please check the username and password. Please refer to the program\'s command line window for the default username and password.\n登录失败，请检查用户名和密码。请查看程序命令行窗口输出的默认用户名密码。';
       // 显示通知
       $q.notify({
         color: 'negative',
@@ -95,7 +95,7 @@ async function login() {
     }
   } catch (err) {
     loginError.value =
-      '登录失败，请检查用户名和密码。请查看程序窗口输出的用户名密码，或在同目录下config.json中搜索：serverName、adminPassword 对应用户名，密码。';
+    'Login failed, please check the username and password. Please refer to the program\'s command line window for the default username and password.\n登录失败，请检查用户名和密码。请查看程序命令行窗口输出的默认用户名密码。';
     $q.notify({
       color: 'negative',
       position: 'top',

diff --git a/webui/api.go b/webui/api.go
@@ -594,8 +594,11 @@ func HandleLoginRequest(c *gin.Context, config config.Config) {
 func checkCredentials(username, password string, jsonconfig config.Config) bool {
 	serverUsername := jsonconfig.WorldSettings.ServerName
 	serverPassword := jsonconfig.WorldSettings.AdminPassword
-	fmt.Printf("有用户使用serverUsername:%v serverPassword:%v 进行登入\n", username, password)
-	fmt.Printf("登入密码serverUsername:%v serverPassword:%v 进行登入\n", serverUsername, serverPassword)
+	fmt.Printf("有用户正尝试使用 用户名:%v 密码:%v 进行登入\n", username, password)
+	fmt.Printf("A user is attempting to log in with Username: %v Password: %v\n", username, password)
+
+	fmt.Printf("请使用默认登入密码[%v] 默认密码[%v] 进行登入,不包含[],遇到问题可到QQ群:587997911 请教\n", serverUsername, serverPassword)
+	fmt.Printf("please use default account[%v] default password[%v] to login, not include []\n", serverUsername, serverPassword)
 	return username == serverUsername && password == serverPassword
 }