From d277f1084fe5673ad74826439d32af516504c587 Mon Sep 17 00:00:00 2001
From: wsczx <wsc@wsczx.com>
Date: Mon, 17 Oct 2022 14:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=E6=A3=80=E6=B5=8B=E5=87=BD=E6=95=B0=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/dbdata/db_orm.go | 17 -----------------
 server/dbdata/user.go   | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/server/dbdata/db_orm.go b/server/dbdata/db_orm.go
index 887a5e8..3de1fe5 100644
--- a/server/dbdata/db_orm.go
+++ b/server/dbdata/db_orm.go
@@ -3,7 +3,6 @@ package dbdata
 import (
 	"errors"
 	"reflect"
-	"time"
 
 	"xorm.io/xorm"
 )
@@ -62,22 +61,6 @@ func One(fieldName string, value interface{}, data interface{}) error {
 	return nil
 }
 
-// 用户过期时间到达后，更新用户状态，并返回一个状态为过期的用户切片
-func CheckUserlimittime() []interface{} {
-	//初始化xorm时区
-	xdb.DatabaseTZ = time.Local
-	xdb.TZLocation = time.Local
-	u := &User{Status: 2}
-	xdb.Where("limittime <= ?", time.Now()).And("status = ?", 1).Update(u)
-	user := make(map[int64]User)
-	limitUser := make([]interface{}, 0)
-	xdb.Where("status= ?", 2).Find(user)
-	for _, v := range user {
-		limitUser = append(limitUser, v.Username)
-	}
-	return limitUser
-}
-
 func CountAll(data interface{}) int {
 	n, _ := xdb.Count(data)
 	return int(n)
diff --git a/server/dbdata/user.go b/server/dbdata/user.go
index 1ba6f6a..007d529 100644
--- a/server/dbdata/user.go
+++ b/server/dbdata/user.go
@@ -133,6 +133,22 @@ func checkLocalUser(name, pwd, group string) error {
 	return nil
 }
 
+// 用户过期时间到达后，更新用户状态，并返回一个状态为过期的用户切片
+func CheckUserlimittime() []interface{} {
+	//初始化xorm时区
+	xdb.DatabaseTZ = time.Local
+	xdb.TZLocation = time.Local
+	u := &User{Status: 2}
+	xdb.Where("limittime <= ?", time.Now()).And("status = ?", 1).Update(u)
+	user := make(map[int64]User)
+	limitUser := make([]interface{}, 0)
+	xdb.Where("status= ?", 2).Find(user)
+	for _, v := range user {
+		limitUser = append(limitUser, v.Username)
+	}
+	return limitUser
+}
+
 var (
 	userOtpMux = sync.Mutex{}
 	userOtp    = map[string]time.Time{}