From 0901afc22409472ffb043931cf10d296b4ffe850 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 17 十月 2024 19:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/folder/index.vue | 2 +-
src/views/login/index.vue | 5 +++--
src/views/exam/index.vue | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue
index 99aa396..29ad708 100644
--- a/src/views/exam/index.vue
+++ b/src/views/exam/index.vue
@@ -200,7 +200,7 @@
const timeDialog = ref(false);
const { status, message, error, connect, disconnect, sendMessage } = useWebScoket({
- url: 'wss://42.193.1.25:8000/websocket/' + userInfo.value.id,
+ url: 'wss://www.kgmeet.com:18443/websocket/' + userInfo.value.id,
heartBeatData: 'ping'
});
diff --git a/src/views/folder/index.vue b/src/views/folder/index.vue
index 619f72f..0de9890 100644
--- a/src/views/folder/index.vue
+++ b/src/views/folder/index.vue
@@ -201,7 +201,7 @@
const { userInfo } = storeToRefs(userStore);
const { status, message, error, connect, disconnect, sendMessage } =
useWebScoket({
- url: "wss://42.193.1.25:8000/websocket/" + userInfo.value.id,
+ url: "wss://www.kgmeet.com:18443/websocket/" + userInfo.value.id,
heartBeatData: "ping",
});
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f0d0e6c..53bca50 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -110,8 +110,8 @@
remember: false
});
const loginRules = reactive({
- userName: [{required: true, trigger: 'blur', validator: validateUsername}],
- password: [{required: true, trigger: 'blur', validator: validatePassword}]
+ userName: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ョ敤鎴峰悕' }],
+ password: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ュ瘑鐮�' }]
});
const updatePasswordRules = reactive({
newPassword: [{required: true, trigger: 'blur', validator: validateNewPassword}]
@@ -472,3 +472,4 @@
}
}
</style>
+
--
Gitblit v1.8.0