fanxb/bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

feat:去掉注册时的验证码要求

Browse Source
This commit is contained in:
fanxb 2020-02-02 00:30:54 +08:00
parent 9cc1b83357
commit 1f430c3b48
2 changed files with 75 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/UserService.java
View File

@ -81,15 +81,6 @@ public class UserService {
* @date 2019/7/6 11:30
*/
public void register(RegisterBody body) {
String codeKey = Constant.authCodeKey(body.getEmail());
String realCode = RedisUtil.get(codeKey, String.class);
if (Constant.isDev) {
realCode = "123456";
}
if (StringUtil.isEmpty(realCode) || (!realCode.equals(body.getAuthCode()))) {
throw new FormDataException("验证码错误");
}
RedisUtil.delete(codeKey);
User user = userDao.selectByUsernameOrEmail(body.getUsername(), body.getEmail());
if (user != null) {
if (user.getUsername().equals(body.getUsername())) {

99
front/src/pages/public/RegisterOrReset/index.jsx
View File

@ -1,7 +1,11 @@
import React from "react";
import IconFont from "../../../components/IconFont";
import { Button, Input, message } from "antd";
import { LoginLayout, REGISTER_TYPE, RESET_PASSWORD_TYPE } from "../../../layout/LoginLayout";
import {
LoginLayout,
REGISTER_TYPE,
RESET_PASSWORD_TYPE
} from "../../../layout/LoginLayout";
import styles from "./index.module.less";
import axios from "../../../util/httpUtil";
@ -109,16 +113,28 @@ export default class Register extends React.Component {
* 提交表单
*/
submit = () => {
const { current, username, email, password, repassword, authCode } = this.state;
const {
current,
username,
email,
password,
repassword,
authCode
} = this.state;
let form = { username, email, password, authCode };
if (current === REGISTER_TYPE && !this.checkParam("username", username)) {
return;
}
if (
current === RESET_PASSWORD_TYPE &&
!this.checkParam("authCode", authCode)
) {
return;
}
const isOk =
this.checkParam("email", email) &&
this.checkParam("password", password) &&
this.checkParam("repassword", repassword) &&
this.checkParam("authCode", authCode);
this.checkParam("repassword", repassword);
if (!isOk) {
return;
}
@ -146,7 +162,18 @@ export default class Register extends React.Component {
};
render() {
const { current, username, email, password, repassword, authCode, authCodeText, isCountDown, errorText, isLoading } = this.state;
const {
current,
username,
email,
password,
repassword,
authCode,
authCodeText,
isCountDown,
errorText,
isLoading
} = this.state;
return (
<LoginLayout type={current}>
<div className={styles.main}>
@ -158,7 +185,9 @@ export default class Register extends React.Component {
name="username"
value={username}
onChange={this.changeData}
addonBefore={<IconFont type="icon-person" style={{ fontSize: "0.3rem" }} />}
addonBefore={
<IconFont type="icon-person" style={{ fontSize: "0.3rem" }} />
}
placeholder="用户名"
/>
) : null}
@ -168,7 +197,9 @@ export default class Register extends React.Component {
name="email"
value={email}
onChange={this.changeData}
addonBefore={<IconFont type="icon-mail" style={{ fontSize: "0.3rem" }} />}
addonBefore={
<IconFont type="icon-mail" style={{ fontSize: "0.3rem" }} />
}
placeholder="邮箱"
/>
<Input
@ -177,7 +208,9 @@ export default class Register extends React.Component {
name="password"
value={password}
onChange={this.changeData}
addonBefore={<IconFont type="icon-password" style={{ fontSize: "0.3rem" }} />}
addonBefore={
<IconFont type="icon-password" style={{ fontSize: "0.3rem" }} />
}
placeholder="密码"
/>
<Input
@ -186,24 +219,42 @@ export default class Register extends React.Component {
name="repassword"
value={repassword}
onChange={this.changeData}
addonBefore={<IconFont type="icon-password" style={{ fontSize: "0.3rem" }} />}
addonBefore={
<IconFont type="icon-password" style={{ fontSize: "0.3rem" }} />
}
placeholder="重复密码"
/>
<Input
type="text"
size="large"
name="authCode"
value={authCode}
onChange={this.changeData}
addonBefore={<IconFont type="icon-yanzhengma54" style={{ fontSize: "0.3rem" }} />}
addonAfter={
<span style={{ cursor: isCountDown ? "" : "pointer" }} onClick={this.getCode}>
{authCodeText}
</span>
}
placeholder="验证码"
/>
<Button type="primary" className={styles.submit} onClick={this.submit} block loading={isLoading}>
{current === RESET_PASSWORD_TYPE ? (
<Input
type="text"
size="large"
name="authCode"
value={authCode}
onChange={this.changeData}
addonBefore={
<IconFont
type="icon-yanzhengma54"
style={{ fontSize: "0.3rem" }}
/>
}
addonAfter={
<span
style={{ cursor: isCountDown ? "" : "pointer" }}
onClick={this.getCode}
>
{authCodeText}
</span>
}
placeholder="验证码"
/>
) : null}
<Button
type="primary"
className={styles.submit}
onClick={this.submit}
block
loading={isLoading}
>
{current === REGISTER_TYPE ? "注册" : "重置密码"}
</Button>
</div>