增加登出接口和其他的配置

app/api/user/findpwd/route.ts

@@ -2,21 +2,16 @@ import { NextRequest } from "next/server";
 
 export async function POST(req: NextRequest) {
   try {
-    const token=req.headers.get("auth") ?? ""
-    const admin=process.env.ADMIN
-    const key=process.env.KEY
-    const user=req.nextUrl.searchParams.get("user")
-    let res=await fetch("https://dujiaoka.dwzynj.top/main/api/user/find_password.php?admin="+admin+"&key="+key+"&user="+user, {
-        method: "GET",
-        headers:{
-          "token":token
-        },
+    const mail=req.nextUrl.searchParams.get("mail")
+    const code=req.nextUrl.searchParams.get("code")
+    let res=await fetch("https://eladmin.dwzynj.top/api/users/restPwd?mail="+mail+"&code="+code, {
+        method: "POST"
       })
     let msg=await res.json()
     // console.log(msg)
     return new Response(JSON.stringify(msg))
   } catch (e) {
-    console.error("[shuixian] ", e);
+    console.error("[eladmin] ", e);
     return new Response(JSON.stringify(e));
   }
 }

app/api/user/logout/route.ts

@@ -0,0 +1,34 @@
+import { NextRequest, NextResponse } from "next/server";
+import { auth } from "../../auth";
+
+export async function POST(req: NextRequest) {
+  try {
+    const authResult = auth(req);
+    if (authResult.error) {
+      return NextResponse.json(authResult, {
+        status: 401,
+      });
+    }
+    const token=req.headers.get("auth") ?? ""
+    let res=await fetch("https://eladmin.dwzynj.top/auth/logout", {
+      method: "DELETE",
+      headers:{
+        "Authorization":token
+      }
+    })
+    if(res.status==401){
+      let msg={
+        flag:false,
+        msg:"未登录！"
+      }
+    // console.log(res.status)
+    return new Response(JSON.stringify(msg))
+    }
+    let msg=await res.json()
+    console.log(msg)
+    return new Response(JSON.stringify(msg))
+  } catch (e) {
+    console.error("[eladmin] ", e);
+    return new Response(JSON.stringify(e));
+  }
+}

app/api/user/restmail/route.ts

@@ -0,0 +1,16 @@
+import { NextRequest } from "next/server";
+
+export async function POST(req: NextRequest) {
+  try {
+    const mail=req.nextUrl.searchParams.get("mail")
+    let res=await fetch("https://eladmin.dwzynj.top/api/code/email/resetPass?email="+mail, {
+      method: "POST"
+    })
+    let msg=await res.json()
+    // console.log(res.status)
+    return new Response(JSON.stringify(msg))
+  } catch (e) {
+    console.error("[eladmin] ", e);
+    return new Response(JSON.stringify(e));
+  }
+}

app/api/user/sig/route.ts

@@ -28,7 +28,7 @@ export async function POST(req: NextRequest) {
     // console.log(msg)
     return new Response(JSON.stringify(msg))
   } catch (e) {
-    console.error("[shuixian] ", e);
+    console.error("[eladmin] ", e);
     return new Response(JSON.stringify(e));
   }
 }

app/api/user/updatePass/route.ts

@@ -0,0 +1,36 @@
+import { NextRequest, NextResponse } from "next/server";
+import { auth } from "../../auth";
+
+export async function POST(req: NextRequest) {
+  try {
+    const authResult = auth(req);
+    if (authResult.error) {
+      return NextResponse.json(authResult, {
+        status: 401,
+      });
+    }
+    const token=req.headers.get("auth") ?? ""
+    let res=await fetch("https://eladmin.dwzynj.top/api/users/updatePass", {
+        method: "POST",
+        headers:{
+          "Content-Type":'application/json;charset=utf-8',
+          "Authorization":token
+        },
+        body:JSON.stringify(await req.json())
+      })
+      if(res.status==401){
+        let msg={
+          flag:false,
+          message:"未登录！"
+        }
+      // console.log(res.status)
+      return new Response(JSON.stringify(msg))
+      }
+    let msg=await res.json()
+    // console.log(msg)
+    return new Response(JSON.stringify(msg))
+  } catch (e) {
+    console.error("[eladmin] ", e);
+    return new Response(JSON.stringify(e));
+  }
+}

app/api/user/vip/route.ts

@@ -28,7 +28,7 @@ export async function POST(req: NextRequest) {
     console.log(msg)
     return new Response(JSON.stringify(msg))
   } catch (e) {
-    console.error("[shuixian] ", e);
+    console.error("[eladmin] ", e);
     return new Response(JSON.stringify(e));
   }
 }

app/components/findpwd.module.scss

@@ -55,12 +55,12 @@
 }
 
 .wangji{
-  padding-right: 70px;
+  padding-right: 60px;
   font-size: 12px;
 }
 
 .zhuce{
-  padding-left: 70px;
+  padding-left: 60px;
   font-size: 12px;
 }
 
@@ -68,7 +68,36 @@
   background-color: #1db144;
   color: white;
   padding: 0;
-  width: 193px;
+  width: 183px;
   display: block;
   margin: 0 auto;
+}
+
+.code{
+  border: var(--border-in-light);
+  padding: 10px;
+  margin-right: 10px;
+  border-radius: 10px;
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          appearance: none;
+  cursor: pointer;
+  background-color: var(--white);
+  color: var(--black);
+  text-align: left;
+  width: 60px;
+}
+
+.codebox{
+  vertical-align: bottom;
+}
+
+.codeButton{
+  background-color: #1db144;
+  color: white;
+  padding: 0;
+  width: 93px;
+  display: inline;
+  margin: 0 auto;
+  font-size: 8px;
 }

app/components/findpwd.tsx

@@ -4,25 +4,59 @@ import ChatIcon from "../icons/chatgpt.svg"
 import styles from "./findpwd.module.scss";
 import { IconButton } from "./button";
 import { useUserStore } from "../store";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 
 export function FindPwd(){ 
-  const [user, setUser] = useState("");
+  const userStore=useUserStore() 
+  const [email, setEmail] = useState("");
   const [status, setStatus] = useState("");
+  const [code, setCode] = useState("");
+  const [codeStatus, setcodeStatus] = useState("");
+  const [getcode, setgetcode] = useState("");
 
-  const onUser = (text: string) => {
-    setUser(text)
+  const onEmail = (text: string) => {
+    setEmail(text)
   };
 
-  function findpwd(){
-    useUserStore.getState().findPwd(user)
+  const onCode = (text: string) => {
+    setCode(text)
+  };
+
+  async function findpwd(){
     setStatus("false")
+    await useUserStore.getState().findPwd(email,code)
     setTimeout(()=>{
       setStatus("")
     },4000)
   }
 
+  const getMailCode=()=>{
+    userStore.getRestPwdCode(email)
+    getCode()
+  }
+  var countdown=60;
+  const getCode=()=>{
+      if (countdown == 0) {
+          setcodeStatus("")
+          setgetcode("发送验证码")
+          countdown = 60;
+          return;
+      } else {
+          setcodeStatus("true")
+          setgetcode("(" + countdown + ")")
+          countdown--;
+      }
+      setTimeout(function() {
+              getCode() }
+          ,1000)
+  }
+
+  useEffect(()=>{
+    setcodeStatus("")
+    setgetcode("发送验证码")
+  },[])
+
   return (
     <ErrorBoundary>
       <div className="window-header">
@@ -43,10 +77,27 @@ export function FindPwd(){
             <input
               type="input"
               className={styles.name}
-              placeholder={Locale.User.User}
-              onInput={(e) => onUser(e.currentTarget.value)}
-              value={user}
+              placeholder={Locale.User.Email}
+              onInput={(e) => onEmail(e.currentTarget.value)}
+              value={email}
+            ></input>
+          </div>
+          <div className={styles.codebox}>
+            <input
+              type="input"
+              className={styles.code}
+              placeholder={Locale.User.Code}
+              onInput={(e) => onCode(e.currentTarget.value)}
+              value={code}
             ></input>
+            <IconButton
+              disabled={!!codeStatus}
+              text={getcode}
+              className={styles.codeButton}
+              onClick={()=>{
+                getMailCode()
+              }}
+            ></IconButton>
           </div>
           <div>
             <span className={styles.wangji}><a href="/#/login">{Locale.User.Login}</a></span>

app/components/login.module.scss

@@ -24,7 +24,7 @@
      -moz-appearance: none;
           appearance: none;
   cursor: pointer;
-  width: 100px;
+  width: 80px;
   background-color: var(--white);
   color: var(--black);
   text-align: left;
@@ -74,12 +74,12 @@
 }
 
 .wangji{
-  padding-right: 60px;
+  padding-right: 50px;
   font-size: 12px;
 }
 
 .zhuce{
-  padding-left: 60px;
+  padding-left: 50px;
   font-size: 12px;
 }
 
@@ -87,7 +87,7 @@
   background-color: #1db144;
   color: white;
   padding: 0;
-  width: 193px;
+  width: 183px;
   display: block;
   margin: 0 auto;
 }

app/components/login.tsx

@@ -27,8 +27,8 @@ export function Login(){
   };
 
   const loginTo=async ()=>{
-    await userStore.login(user,password,code)
     setStatus("false")
+    await userStore.login(user,password,code)
     setTimeout(()=>{
       setStatus("")
     },4000)

app/components/register.module.scss

@@ -23,7 +23,7 @@
   background-color: var(--white);
   color: var(--black);
   text-align: left;
-  width: 75px;
+  width: 60px;
 }
 
 .codebox{
@@ -74,12 +74,12 @@
 }
 
 .wangji{
-  padding-right: 60px;
+  padding-right: 50px;
   font-size: 12px;
 }
 
 .zhuce{
-  padding-left: 60px;
+  padding-left: 50px;
   font-size: 12px;
 }
 
@@ -87,7 +87,7 @@
   background-color: #1db144;
   color: white;
   padding: 0;
-  width: 193px;
+  width: 183px;
   display: block;
   margin: 0 auto;
 }

app/components/user.tsx

@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
 
 import styles from "./user.module.scss";
 import EditIcon from "../icons/edit.svg";
-import { List, ListItem, Popover, showModal, showToast } from "./ui-lib";
+import { List, ListItem, Modal, Popover, showModal, showToast } from "./ui-lib";
 
 import { IconButton } from "./button";
 import {
@@ -16,11 +16,84 @@ import { ErrorBoundary } from "./error";
 import { useNavigate } from "react-router-dom";
 import { Avatar, AvatarPicker } from "./emoji";
 import { useUserStore } from "../store/user";
-import { useStore } from "zustand";
+
+function UserPwdModal(props: { onClose?: () => void }) {
+  const useStor = useUserStore()
+  const [oldPwd, setOldPwd] = useState('');
+  const [newPwd, setNewPwd] = useState('');
+  const [newPwd1, setNewPwd1] = useState('');
+
+  async function updatePass():Promise<any>{
+    if(newPwd!=newPwd1){
+      showToast("两次输入的新密码不一致！")
+      return false
+    }
+    if(oldPwd==newPwd1||oldPwd==newPwd){
+      showToast("新密码与旧密码一致！")
+      return false
+    }
+    await useStor.updatePass(oldPwd,newPwd)
+  }
+
+  return (
+    <div className="modal-mask">
+      <Modal
+        title={Locale.User.Pass.Title}
+        onClose={() => props.onClose?.()}
+        actions={[
+          <IconButton
+            key="add"
+            icon={<EditIcon />}
+            onClick={()=>{
+              updatePass().then(()=>{
+                props.onClose?.()
+              })
+            }}
+            bordered
+            text={Locale.User.Save}
+          />,
+        ]}
+      >
+        <div>
+          <List>
+            <ListItem title={Locale.User.Pass.OldPwd}>
+                <input
+                  type="password"
+                  className={styles.kamicode}
+                  value={oldPwd}
+                  onChange={(e)=>{setOldPwd(e.currentTarget.value)}}
+                  >
+                </input>
+            </ListItem>
+            <ListItem title={Locale.User.Pass.NewPwd}>
+                <input
+                  type="password"
+                  className={styles.kamicode}
+                  value={newPwd}
+                  onChange={(e)=>{setNewPwd(e.currentTarget.value)}}
+                  >
+                </input>
+            </ListItem>
+            <ListItem title={Locale.User.Pass.NewPwd1}>
+                <input
+                  type="password"
+                  className={styles.kamicode}
+                  value={newPwd1}
+                  onChange={(e)=>{setNewPwd1(e.currentTarget.value)}}
+                  >
+                </input>
+            </ListItem>
+          </List>
+        </div>
+      </Modal>
+    </div>
+  );
+}
 
 export function User() {
   const navigate = useNavigate();
   const [showEmojiPicker, setShowEmojiPicker] = useState(false);
+  const [shouldShowPwdModal, setShowPwdModal] = useState(false);
   const config = useAppConfig();
   const updateConfig = config.update;
 
@@ -164,7 +237,6 @@ export function User() {
 
           <ListItem title="充值">
                 <IconButton
-                icon={<EditIcon />}
                 text="购买卡密"
                 onClick={()=>{
                   window.location.href="https://qtka.scgzfw.cn/links/879AEC7D"
@@ -174,7 +246,6 @@ export function User() {
 
           <ListItem title={Locale.User.SigState}>
                 <IconButton
-                icon={<EditIcon />}
                 disabled={!accessStore.auth}
                 text="签到(送积分)"
                 onClick={()=>{
@@ -182,6 +253,15 @@ export function User() {
                 }}
               />
           </ListItem>
+          <ListItem title={Locale.User.Pass.Title}>
+                <IconButton
+                disabled={!accessStore.auth}
+                text={Locale.User.Pass.Title}
+                onClick={()=>{
+                  setShowPwdModal(true)
+                }}
+              />
+          </ListItem>
           </List>
 
           <List>
@@ -191,14 +271,18 @@ export function User() {
                 disabled={!accessStore.auth}
                 text="登出"
                 onClick={()=>{
-                  accessStore.updateAuth("")
-                  useStor.reset()
-                  setUserName("")
+                  useStor.logOut().then(()=>{
+                    accessStore.updateAuth("")
+                    setUserName("")
+                  })
                   showToast("登出成功！")
                 }}
               />
           </ListItem>
           </List>
+          {shouldShowPwdModal && (
+          <UserPwdModal onClose={() => setShowPwdModal(false)} />
+        )}
       </div>
     </ErrorBoundary>
   );

app/locales/cn.ts

@@ -76,7 +76,14 @@ const cn = {
     User:"账号(纯数字)",
     Password:"密码(最少六位)",
     Email:"邮箱",
-    Code:"验证码"
+    Code:"验证码",
+    Pass:{
+      Title:"修改密码",
+      OldPwd:"旧密码",
+      NewPwd:"新密码",
+      NewPwd1:"确认密码"
+    },
+    Save:"保存"
   },
   Settings: {
     Title: "设置",

app/locales/de.ts

@@ -78,7 +78,14 @@ const de: LocaleType = {
     User:"Kontonummer (nur Nummern)",
     Password:"Passwort (mindestens 6-stellig)",
     Email:"Briefkasten",
-    Code:"Captcha"
+    Code:"Captcha",
+    Pass:{
+      Title:"修改密码",
+      OldPwd:"旧密码",
+      NewPwd:"新密码",
+      NewPwd1:"确认密码"
+    },
+    Save:"保存"
   },
   Settings: {
     Title: "Einstellungen",

app/locales/en.ts

@@ -78,7 +78,14 @@ const en: LocaleType = {
     User:"Account Number (Numbers Only)",
     Password:"Password (minimum 6 digits)",
     Email:"Email",
-    Code:"Captcha"
+    Code:"Captcha",
+    Pass:{
+      Title:"Update Password",
+      OldPwd:"Old Password",
+      NewPwd:"New Password",
+      NewPwd1:"Check Password"
+    },
+    Save:"保存"
   },
   Settings: {
     Title: "Settings",

app/locales/es.ts

@@ -78,7 +78,14 @@ const es: LocaleType = {
     User:"Número de cuenta (solo números)",
     Password:"Contraseña (mínimo 6 dígitos)",
     Email:"Buzón",
-    Code:"Captcha"
+    Code:"Captcha",
+    Pass:{
+      Title:"修改密码",
+      OldPwd:"旧密码",
+      NewPwd:"新密码",
+      NewPwd1:"确认密码"
+    },
+    Save:"保存"
   },
   Settings: {
     Title: "Configuración",

app/locales/it.ts

@@ -78,7 +78,14 @@ const it: LocaleType = {
     User:"Numero di conto (solo numeri)",
     Password:"Password (minimo 6 cifre)",
     Email:"Cassetta Postale",
-    Code:"Captcha"
+    Code:"Captcha",
+    Pass:{
+      Title:"修改密码",
+      OldPwd:"旧密码",
+      NewPwd:"新密码",
+      NewPwd1:"确认密码"
+    },
+    Save:"保存"
   },
   Settings: {
     Title: "Impostazioni",

app/locales/jp.ts

@@ -78,7 +78,14 @@ const jp: LocaleType = {
     User:"口座番号(番号のみ)",
     Password:"パスワード(最低6桁)",
     Email:"メールボックス",
-    Code:"キャプチャ"
+    Code:"キャプチャ",
+    Pass:{
+      Title:"修改密码",
+      OldPwd:"旧密码",
+      NewPwd:"新密码",
+      NewPwd1:"确认密码"
+    },
+    Save:"保存"
   },
   Settings: {
     Title: "設定",

app/locales/tr.ts

@@ -78,7 +78,14 @@ const tr: LocaleType = {
     User:"Hesap Numarası (Yalnızca Numaralar)",
     Password:"Şifre (en az 6 haneli)",
     Email:"Posta Kutusu",
-    Code:"Arjantin"
+    Code:"Arjantin",
+    Pass:{
+      Title:"修改密码",
+      OldPwd:"旧密码",
+      NewPwd:"新密码",
+      NewPwd1:"确认密码"
+    },
+    Save:"保存"
   },
   Settings: {
     Title: "Ayarlar",

app/locales/tw.ts

@@ -76,7 +76,14 @@ const tw: LocaleType = {
     User:"帳號（純數位）",
     Password:"密碼（最少六位）",
     Email:"郵箱",
-    Code:"驗證碼"
+    Code:"驗證碼",
+    Pass:{
+      Title:"修改密码",
+      OldPwd:"旧密码",
+      NewPwd:"新密码",
+      NewPwd1:"确认密码"
+    },
+    Save:"保存"
   },
   Settings: {
     Title: "設定",

app/store/user.ts

@@ -79,8 +79,11 @@ export interface UserStore {
   updateWallet: (wallet: number) => void;
   updateName: (name: string) => void;
   getUserInfo: () => void;
-  findPwd: (user: string) => void;
+  findPwd: (mail: string,code:string) => void;
   useKami: (code: string) => void;
+  logOut:()=>any;
+  getRestPwdCode:(mail:string)=>void;
+  updatePass:(oldPass:string,newPass:string)=>void;
 }
 export const DEFAULT_USER = {
   user: "",
@@ -202,7 +205,7 @@ export const useUserStore = create<UserStore>()(
           }, 1000);
           await this.getUserInfo();
         } else {
-          showToast("登录失败！");
+          showToast(response.message);
         }
       },
       async register(user, password, name, mail, code) {
@@ -285,19 +288,19 @@ export const useUserStore = create<UserStore>()(
           }
         }
       },
-      async findPwd(user) {
-        let res = await fetch("/api/user/findpwd?user=" + user, {
+      async findPwd(mail,code) {
+        let res = await fetch("/api/user/findpwd?mail=" + mail+"&code="+code, {
           method: "POST",
           headers: {
             ...getHeaders(),
           },
         });
-        let response = (await res.json()) as shuixianRes;
+        let response = (await res.json()) as eladminRes;
         console.log(response);
-        if (response.code == 1) {
+        if (response.flag) {
           showToast("密码已发送至您的邮箱，请注意查收！");
         } else {
-          showToast(response.msg);
+          showToast(response.message);
         }
       },
       async useKami(code) {
@@ -327,6 +330,53 @@ export const useUserStore = create<UserStore>()(
           }
         }
       },
+      async logOut(){
+        await fetch(
+          "/api/user/logout",
+          {
+            method: "POST",
+            headers: {
+              ...getHeaders(),
+            },
+          },
+        );
+        this.reset()
+      },
+      async getRestPwdCode(mail){
+        await fetch(
+          "/api/user/restmail?mail="+mail,
+          {
+            method: "POST",
+            headers: {
+              ...getHeaders(),
+            },
+          },
+        );
+        showToast("发送成功！可能在垃圾邮箱中！")
+      },
+      async updatePass(oldPass,newPass){
+        let body={
+          oldPass:encrypt(oldPass),
+          newPass:encrypt(newPass)
+        }
+        let res=await fetch(
+          "/api/user/updatePass",
+          {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json",
+              ...getHeaders(),
+            },
+            body:JSON.stringify(body)
+          },
+        );
+        res=await res.json()
+        if(res.message==null){
+          showToast("修改成功！")
+        }else{
+          showToast(res.message)
+        }
+      }
     }),
     {
       name: StoreKey.User,