From fac7eb61b3fc57b715bd98387d728fda5f72a8e1 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Tue, 5 Sep 2023 17:52:46 +0800
Subject: [PATCH] remove username search for console user list page

---
 api/handler/admin/user_handler.go | 4 ----
 web/src/views/Login.vue           | 4 ++--
 web/src/views/admin/Login.vue     | 7 ++++++-
 web/src/views/admin/UserList.vue  | 1 -
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/handler/admin/user_handler.go b/api/handler/admin/user_handler.go
index d848cb26..8ffa7ef8 100644
--- a/api/handler/admin/user_handler.go
+++ b/api/handler/admin/user_handler.go
@@ -28,7 +28,6 @@ func (h *UserHandler) List(c *gin.Context) {
 	page := h.GetInt(c, "page", 1)
 	pageSize := h.GetInt(c, "page_size", 20)
 	mobile := h.GetTrim(c, "mobile")
-	username := h.GetTrim(c, "username")
 
 	offset := (page - 1) * pageSize
 	var items []model.User
@@ -39,9 +38,6 @@ func (h *UserHandler) List(c *gin.Context) {
 	if mobile != "" {
 		session = session.Where("mobile LIKE ?", "%"+mobile+"%")
 	}
-	if username != "" {
-		session = session.Where("username LIKE ?", "%"+username+"%")
-	}
 
 	session.Model(&model.User{}).Count(&total)
 	res := session.Offset(offset).Limit(pageSize).Find(&items)
diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue
index e6323092..0492f8c5 100644
--- a/web/src/views/Login.vue
+++ b/web/src/views/Login.vue
@@ -66,9 +66,9 @@ const password = ref(process.env.VUE_APP_PASS);
 
 checkSession().then(() => {
   if (isMobile()) {
-    router.replace('mobile')
+    router.push('mobile')
   } else {
-    router.replace('chat')
+    router.push('chat')
   }
 }).catch(() => {
 })
diff --git a/web/src/views/admin/Login.vue b/web/src/views/admin/Login.vue
index 6c107fdb..7edd09b2 100644
--- a/web/src/views/admin/Login.vue
+++ b/web/src/views/admin/Login.vue
@@ -47,12 +47,17 @@ import {ElMessage} from "element-plus";
 import {useRouter} from "vue-router";
 import FooterBar from "@/components/FooterBar.vue";
 import {setAdminToken} from "@/store/session";
+import {checkAdminSession} from "@/action/session";
 
 const router = useRouter();
 const title = ref('ChatGPT Plus Admin');
 const username = ref(process.env.VUE_APP_ADMIN_USER);
 const password = ref(process.env.VUE_APP_ADMIN_PASS);
 
+checkAdminSession().then(() => {
+  router.push("admin")
+}).catch(() => {
+})
 onMounted(() => {
   document.addEventListener('keyup', (e) => {
     if (e.key === 'Enter') {
@@ -71,7 +76,7 @@ const login = function () {
 
   httpPost('/api/admin/login', {username: username.value.trim(), password: password.value.trim()}).then(res => {
     setAdminToken(res.data)
-    router.push("/admin")
+    router.push("admin")
   }).catch((e) => {
     ElMessage.error('登录失败，' + e.message)
   })
diff --git a/web/src/views/admin/UserList.vue b/web/src/views/admin/UserList.vue
index c395edda..7bae330a 100644
--- a/web/src/views/admin/UserList.vue
+++ b/web/src/views/admin/UserList.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="container user-list" v-loading="loading">
     <div class="handle-box">
-      <el-input v-model="query.username" placeholder="用户名" class="handle-input mr10"></el-input>
       <el-input v-model="query.mobile" placeholder="手机号码" class="handle-input mr10"></el-input>
       <el-button type="primary" :icon="Search" @click="handleSearch">搜索</el-button>