Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-17 0901afc22409472ffb043931cf10d296b4ffe850

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/login/index.vue

 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'
});


 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",
  });


 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>