xinyin025/geekai
1
0
Fork 0
mirror of https://github.com/yangjian102621/geekai.git synced 2025-11-13 12:43:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: email registration function is ready

Browse Source
This commit is contained in:
RockYang
2024-01-05 18:17:11 +08:00
parent 1ddd05302b
commit 71cd548c00
32 changed files with 233 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web/src/views/ChatPlus.vue
View File

@@ -231,12 +231,17 @@
<div class="notice">
<el-text type="primary">
注意：当前站点仅为开源项目
<a style="color: #F56C6C" href="https://github.com/yangjian102621/chatgpt-plus">ChatPlus</a>
<a style="color: #F56C6C" href="https://github.com/yangjian102621/chatgpt-plus" target="_blank">ChatPlus</a>
的演示项目，本项目单纯就是给大家体验项目功能使用。<br/>
体验额度用完之后请不要在当前站点进行任何充值操作！！！<br/>
体验额度用完之后请不要在当前站点进行任何充值操作！！！<br/>
体验额度用完之后请不要在当前站点进行任何充值操作！！！<br/>
如果觉得好用你就花几分钟自己部署一套，没有API KEY 的同学可以去
<a href="https://gpt.bemore.lol" target="_blank"
style="font-size: 20px;color:#F56C6C">https://gpt.bemore.lol</a>
购买，现在有超级优惠，价格远低于 OpenAI 官方。
</el-text>
<p style="text-align: right">
@@ -350,7 +355,7 @@ onMounted(() => {
httpGet("/api/admin/config/get?key=system").then(res => {
title.value = res.data.title
const show = localStorage.getItem(showNoticeKey.value + loginUser.value.mobile)
const show = localStorage.getItem(showNoticeKey.value + loginUser.value.username)
if (!show) {
showDemoNotice.value = res.data['show_demo_notice']
}
@@ -878,7 +883,7 @@ const getModelValue = (model_id) => {
const notShow = () => {
localStorage.setItem(showNoticeKey.value + loginUser.value.mobile, true)
localStorage.setItem(showNoticeKey.value + loginUser.value.username, true)
showDemoNotice.value = false
}
</script>

4
web/src/views/Home.vue
View File

@@ -2,9 +2,7 @@
<div class="home">
<div class="navigator">
<div class="logo">
<el-link href="/">
<el-image :src="logo"/>
</el-link>
<el-image :src="logo"/>
<div class="divider"></div>
</div>
<ul class="nav-items">

8
web/src/views/Login.vue
View File

@@ -9,7 +9,7 @@
<div class="header">{{ title }}</div>
<div class="content">
<div class="block">
<el-input placeholder="手机号" size="large" maxlength="11" v-model="username" autocomplete="off">
<el-input placeholder="手机号/邮箱地址" size="large" v-model="username" autocomplete="off">
<template #prefix>
<el-icon>
<UserFilled/>
@@ -59,7 +59,7 @@ import FooterBar from "@/components/FooterBar.vue";
import {isMobile} from "@/utils/libs";
import {checkSession} from "@/action/session";
import {setUserToken} from "@/store/session";
import {validateMobile} from "@/utils/validate";
import {validateEmail, validateMobile} from "@/utils/validate";
import {prevRoute} from "@/router";
import ResetPass from "@/components/ResetPass.vue";
@@ -92,8 +92,8 @@ onUnmounted(() => {
})
const login = function () {
if (!validateMobile(username.value)) {
return ElMessage.error('请输入合法的手机号');
if (!validateMobile(username.value) && !validateEmail(username.value)) {
return ElMessage.error("请输入合法的手机号/邮箱地址")
}
if (password.value.trim() === '') {
return ElMessage.error('请输入密码');

6
web/src/views/Member.vue
View File

@@ -14,7 +14,7 @@
<el-button type="primary" @click="showPasswordDialog = true">修改密码</el-button>
</el-col>
<el-col :span="12">
<el-button type="primary" @click="showBindMobileDialog = true">绑定手机号</el-button>
<el-button type="primary" @click="showBindMobileDialog = true">更改账号</el-button>
</el-col>
<el-col :span="12">
<el-button type="primary" v-if="enableReward" @click="showRewardDialog = true">加入众筹</el-button>
@@ -93,7 +93,7 @@
<password-dialog v-if="isLogin" :show="showPasswordDialog" @hide="showPasswordDialog = false"
@logout="logout"/>
<bind-mobile v-if="isLogin" :show="showBindMobileDialog" :mobile="user.mobile"
<bind-mobile v-if="isLogin" :show="showBindMobileDialog" :username="user.username"
@hide="showBindMobileDialog = false"/>
<reward-verify v-if="isLogin" :show="showRewardVerifyDialog" @hide="showRewardVerifyDialog = false"/>
@@ -158,7 +158,7 @@ import LoginDialog from "@/components/LoginDialog.vue";
import {checkSession} from "@/action/session";
import UserProfile from "@/components/UserProfile.vue";
import PasswordDialog from "@/components/PasswordDialog.vue";
import BindMobile from "@/components/BindMobile.vue";
import BindMobile from "@/components/ResetAccount.vue";
import RewardVerify from "@/components/RewardVerify.vue";
import {useRouter} from "vue-router";
import {removeUserToken} from "@/store/session";

58
web/src/views/Register.vue
View File

@@ -12,9 +12,9 @@
<div class="content">
<el-form :model="formData" label-width="120px" ref="formRef">
<div class="block">
<el-input placeholder="手机号码"
size="large" maxlength="11"
v-model="formData.mobile"
<el-input :placeholder="placeholder"
size="large"
v-model="formData.username"
autocomplete="off">
<template #prefix>
<el-icon>
@@ -49,10 +49,10 @@
</el-input>
</div>
<div class="block" v-if="enableMsg">
<div class="block">
<el-row :gutter="10">
<el-col :span="12">
<el-input placeholder="手机验证码"
<el-input placeholder="验证码"
size="large" maxlength="30"
v-model="formData.code"
autocomplete="off">
@@ -64,7 +64,7 @@
</el-input>
</el-col>
<el-col :span="12">
<send-msg size="large" :mobile="formData.mobile"/>
<send-msg size="large" :receiver="formData.username"/>
</el-col>
</el-row>
</div>
@@ -118,42 +118,44 @@
import {ref} from "vue";
import {Checked, Iphone, Lock, Message} from "@element-plus/icons-vue";
import {httpGet, httpPost} from "@/utils/http";
import {ElMessage, ElNotification} from "element-plus";
import {ElMessage} from "element-plus";
import {useRouter} from "vue-router";
import FooterBar from "@/components/FooterBar.vue";
import SendMsg from "@/components/SendMsg.vue";
import {validateMobile} from "@/utils/validate";
import {isMobile} from "@/utils/libs";
import {validateEmail, validateMobile} from "@/utils/validate";
import {arrayContains} from "@/utils/libs";
import {setUserToken} from "@/store/session";
import {checkSession} from "@/action/session";
const router = useRouter();
const title = ref('ChatPlus 用户注册');
const formData = ref({
mobile: '',
username: '',
password: '',
code: '',
repass: '',
invite_code: router.currentRoute.value.query['invite_code'],
})
const formRef = ref(null)
const enableMsg = ref(false)
const enableMobile = ref(false)
const enableEmail = ref(false)
const enableRegister = ref(true)
const wxImg = ref("/images/wx.png")
const ways = []
const placeholder = ref("用户名：")
httpGet("/api/admin/config/get?key=system").then(res => {
if (res.data) {
enableMsg.value = res.data['enabled_msg']
enableRegister.value = res.data['enabled_register']
if (res.data['force_invite'] && !formData.value.invite_code) {
ElNotification({
title: '提示：',
dangerouslyUseHTMLString: true,
message: '当前系统开启了强制邀请注册功能，必须有邀请码才能注册哦。扫描下面二维码获取邀请码。<br/> <img alt="qrcode" src="/images/wx.png" />',
type: 'info',
duration: 5000,
})
const registerWays = res.data['register_ways']
if (arrayContains(registerWays, "mobile")) {
enableMobile.value = true
ways.push("手机号")
}
if (arrayContains(registerWays, "email")) {
enableEmail.value = true
ways.push("邮箱地址")
}
placeholder.value += ways.join("/")
}
}).catch(e => {
ElMessage.error("获取系统配置失败：" + e.message)
@@ -165,9 +167,19 @@ httpGet("/api/invite/hits", {code: formData.value.invite_code}).then(() => {
const register = function () {
if (!validateMobile(formData.value.mobile)) {
if (formData.value.username === '') {
return ElMessage.error('请输入用户名');
}
if (!enableMobile.value && !validateEmail(formData.value.username)) {
return ElMessage.error('请输入合法的邮箱地址');
}
if (!enableEmail.value && !validateMobile(formData.value.username)) {
return ElMessage.error('请输入合法的手机号');
}
if (!validateMobile(formData.value.username) && !validateEmail(formData.value.username)) {
return ElMessage.error('请输入合法的手机号或者邮箱地址');
}
if (formData.value.password.length < 8) {
return ElMessage.error('密码的长度为8-16个字符');
}
@@ -175,7 +187,7 @@ const register = function () {
return ElMessage.error('两次输入密码不一致');
}
if (enableMsg.value && formData.value.code === '') {
if (formData.value.code === '') {
return ElMessage.error('请输入短信验证码');
}
httpPost('/api/user/register', formData.value).then((res) => {

5
web/src/views/admin/ApiKey.vue
View File

@@ -3,6 +3,9 @@
<div class="handle-box">
<el-button type="primary" :icon="Plus" @click="add">新增</el-button>
<a href="https://gpt.bemore.lol" target="_blank" style="margin-left: 10px">
<el-button type="success" :icon="ShoppingCart" @click="add" plain>购买API-KEY</el-button>
</a>
</div>
<el-row>
@@ -129,7 +132,7 @@ import {reactive, ref} from "vue";
import {httpGet, httpPost} from "@/utils/http";
import {ElMessage} from "element-plus";
import {dateFormat, disabledDate, removeArrayItem} from "@/utils/libs";
import {InfoFilled, Plus} from "@element-plus/icons-vue";
import {InfoFilled, Plus, ShoppingCart} from "@element-plus/icons-vue";
// 变量定义
const items = ref([])

16
web/src/views/admin/Users.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="container user-list" v-loading="loading">
<div class="handle-box">
<el-input v-model="query.mobile" placeholder="手机号码" class="handle-input mr10"></el-input>
<el-input v-model="query.username" placeholder="账号" class="handle-input mr10"></el-input>
<el-button type="primary" :icon="Search" @click="handleSearch">搜索</el-button>
<el-button type="success" :icon="Plus" @click="addUser">新增用户</el-button>
@@ -13,7 +13,7 @@
<el-table-column type="selection" width="38"/>
<el-table-column prop="mobile" label="账号">
<template #default="scope">
<span>{{ scope.row.mobile }}</span>
<span>{{ scope.row.username }}</span>
<el-image v-if="scope.row.vip" :src="vipImg" style="height: 20px;position: relative; top:5px; left: 5px"/>
</template>
</el-table-column>
@@ -69,7 +69,7 @@
width="50%"
>
<el-form :model="user" label-width="100px" ref="userEditFormRef" :rules="rules">
<el-form-item label="手机号：" prop="mobile">
<el-form-item label="手机号：" prop="username">
<el-input v-model="user.mobile" autocomplete="off"/>
</el-form-item>
<el-form-item v-if="add" label="密码：" prop="password">
@@ -150,7 +150,7 @@
>
<el-form label-width="100px" ref="userEditFormRef">
<el-form-item label="账户：">
<el-input v-model="pass.mobile" autocomplete="off" readonly disabled/>
<el-input v-model="pass.username" autocomplete="off" readonly disabled/>
</el-form-item>
<el-form-item label="新密码：">
@@ -177,13 +177,13 @@ import {Plus, Search} from "@element-plus/icons-vue";
// 变量定义
const users = ref({page: 1, page_size: 15, items: []})
const query = ref({mobile: '', page: 1, page_size: 15})
const query = ref({username: '', page: 1, page_size: 15})
const title = ref('添加用户')
const vipImg = ref("/images/vip.png")
const add = ref(true)
const user = ref({chat_roles: [], chat_models: []})
const pass = ref({mobile: '', password: '', id: 0})
const pass = ref({username: '', password: '', id: 0})
const roles = ref([])
const models = ref([])
const showUserEditDialog = ref(false)
@@ -191,7 +191,7 @@ const showResetPassDialog = ref(false)
const rules = reactive({
nickname: [{required: true, message: '请输入昵称', trigger: 'change',}],
password: [{required: true, message: '请输入密码', trigger: 'change',}],
mobile: [{required: true, message: '请输入手机号码', trigger: 'change',}],
username: [{required: true, message: '请输入手机号码', trigger: 'change',}],
calls: [
{required: true, message: '请输入提问次数'},
{type: 'number', message: '请输入有效数字'},
@@ -309,7 +309,7 @@ const handleSelectionChange = function (rows) {
const resetPass = (row) => {
showResetPassDialog.value = true
pass.value.id = row.id
pass.value.mobile = row.mobile
pass.value.username = row.mobile
}
const doResetPass = () => {

4
web/src/views/mobile/ChatList.vue
View File

@@ -73,8 +73,6 @@
<van-field v-model="tmpChatTitle" label="" placeholder="请输入对话标题" class="field"/>
</van-dialog>
<bind-mobile v-if="isLogin" :show="showBindMobileDialog" :mobile="loginUser.mobile"
@hide="showBindMobileDialog = false"/>
</div>
</template>
@@ -86,7 +84,6 @@ import {checkSession} from "@/action/session";
import {router} from "@/router";
import {setChatConfig} from "@/store/chat";
import {removeArrayItem} from "@/utils/libs";
import BindMobile from "@/components/mobile/BindMobile.vue";
const title = ref("会话列表")
const chatName = ref("")
@@ -101,7 +98,6 @@ const roles = ref([])
const models = ref([])
const showPicker = ref(false)
const columns = ref([roles.value, models.value])
const showBindMobileDialog = ref(false)
const showEditChat = ref(false)
const item = ref({})
const tmpChatTitle = ref("")

8
web/src/views/mobile/Profile.vue
View File

@@ -52,9 +52,6 @@
<el-col :span="12">
<el-button type="primary" @click="showPasswordDialog = true">修改密码</el-button>
</el-col>
<el-col :span="12">
<el-button type="primary" @click="showBindMobileDialog = true">绑定手机号</el-button>
</el-col>
<el-col :span="12">
<el-button type="primary" v-if="enableReward" @click="showRewardDialog = true">加入众筹</el-button>
</el-col>
@@ -72,8 +69,6 @@
<login-dialog :show="showLoginDialog" @hide="showLoginDialog = false"/>
<password-dialog v-if="isLogin" :show="showPasswordDialog" width="100%" @hide="showPasswordDialog = false"
@logout="logout"/>
<bind-mobile v-if="isLogin" :show="showBindMobileDialog" width="100%" :mobile="user.mobile"
@hide="showBindMobileDialog = false"/>
<reward-verify v-if="isLogin" :show="showRewardVerifyDialog" @hide="showRewardVerifyDialog = false"/>
<el-dialog
v-model="showRewardDialog"
@@ -135,11 +130,9 @@ import LoginDialog from "@/components/LoginDialog.vue";
import {checkSession} from "@/action/session";
import UserProfile from "@/components/UserProfile.vue";
import PasswordDialog from "@/components/PasswordDialog.vue";
import BindMobile from "@/components/BindMobile.vue";
import RewardVerify from "@/components/RewardVerify.vue";
import {useRouter} from "vue-router";
import {removeUserToken} from "@/store/session";
import UserOrder from "@/components/UserOrder.vue";
import CountDown from "@/components/CountDown.vue";
const listBoxHeight = window.innerHeight - 97
@@ -151,7 +144,6 @@ const enableReward = ref(false) // 是否启用众筹功能
const rewardImg = ref('/images/reward.png')
const qrcode = ref("")
const showPasswordDialog = ref(false);
const showBindMobileDialog = ref(false);
const showRewardDialog = ref(false);
const showRewardVerifyDialog = ref(false);
const text = ref("")