From 757342a6704332ae2630561a40f8ac2014f607d4 Mon Sep 17 00:00:00 2001
From: xuecong <>
Date: Fri, 19 Nov 2021 16:19:54 +0800
Subject: [PATCH] fix cleartimeout & vistor expire

---
 server/src/module/mp/controller/vistor/create.ts | 2 +-
 web/src/views/user/login/main.vue                | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/src/module/mp/controller/vistor/create.ts b/server/src/module/mp/controller/vistor/create.ts
index 7c0cda8..a3bdb6f 100644
--- a/server/src/module/mp/controller/vistor/create.ts
+++ b/server/src/module/mp/controller/vistor/create.ts
@@ -64,7 +64,7 @@ const MpVistorCreateAction = <Action>{
             {
                 name: 'expire',
                 regex: /^\d{13}$/,
-                validator: val => Date.now() < val,
+                validator: val => Date.now() < moment(val).endOf('day').valueOf(),
                 required: true
             }
         ]
diff --git a/web/src/views/user/login/main.vue b/web/src/views/user/login/main.vue
index 1e03d7f..3ee3ea4 100644
--- a/web/src/views/user/login/main.vue
+++ b/web/src/views/user/login/main.vue
@@ -153,6 +153,8 @@ export default {
                 this.state = res.data.state;
                 this.ready = true;
 
+                clearTimeout(this.stateTimer);
+
                 this.stateTimer = setTimeout(() => {
                     this.expired = true;
                 }, res.data.expire);
@@ -163,6 +165,9 @@ export default {
                 .get('/user/captcha')
                 .then(res => {
                     this.captchaImg = res.data.img;
+
+                    clearTimeout(this.capatchTimer);
+
                     this.capatchTimer = setTimeout(() => {
                         this.getCaptcha();
                     }, res.data.expire);