Skip to content

semour / semour_web

Go to a project
Commit 0dc9b2db by 杨树贤
Options

邮箱

parent f432d22b
Inline Side-by-side
Showing with 12 additions and 15 deletions
.idea/workspace.xml
...@@ -2,14 +2,9 @@ ...@@ -2,14 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="fb90add0-1393-48c2-9f26-72365d42cd03" name="变更" comment=""> <list default="true" id="fb90add0-1393-48c2-9f26-72365d42cd03" name="变更" comment="">
<change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/AuthApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/AuthApiController.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/AuthApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/AuthApiController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Controller.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Kernel.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Kernel.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/database.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/database.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/api.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/api.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/.gitignore" afterDir="false" /> <change beforePath="$PROJECT_DIR$/storage/app/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/.gitignore" afterDir="false" /> <change beforePath="$PROJECT_DIR$/storage/app/public/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/framework/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/framework/.gitignore" afterDir="false" /> <change beforePath="$PROJECT_DIR$/storage/framework/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/framework/.gitignore" afterDir="false" />
...@@ -188,7 +183,7 @@ ...@@ -188,7 +183,7 @@
<updated>1666170258203</updated> <updated>1666170258203</updated>
<workItem from="1666170260162" duration="17108000" /> <workItem from="1666170260162" duration="17108000" />
<workItem from="1666835076791" duration="693000" /> <workItem from="1666835076791" duration="693000" />
<workItem from="1667266026118" duration="8640000" /> <workItem from="1667266026118" duration="10293000" />
</task> </task>
<servers /> <servers />
</component> </component>
......
app/Http/Controllers/Api/AuthApiController.php
...@@ -73,6 +73,7 @@ class AuthApiController extends Controller ...@@ -73,6 +73,7 @@ class AuthApiController extends Controller
public function resetPassword(Request $request) public function resetPassword(Request $request)
{ {
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
'old_password' => 'required|min:8', 'old_password' => 'required|min:8',
'password' => ['required', 'string', 'min:8', 'confirmed'], 'password' => ['required', 'string', 'min:8', 'confirmed'],
...@@ -85,15 +86,15 @@ class AuthApiController extends Controller ...@@ -85,15 +86,15 @@ class AuthApiController extends Controller
if ($validator->fails()) { if ($validator->fails()) {
return $this->setError($validator->errors()->first()); return $this->setError($validator->errors()->first());
} }
$password = $request->get('password'); $password = $request->get('password');
$oldPassword = $request->get('old_password');
$match = User::where('password', Hash::make($request->get('old_password')))->exists(); $userId = Auth::user()->id;
if (!$match) { $hashedPassword = User::where('id', $userId)->value('password');
if (!Hash::check($oldPassword, $hashedPassword)) {
return $this->setError('Wrong Password!'); return $this->setError('Wrong Password!');
} }
$user = new User(); $user = User::find($userId);
$user->password = Hash::make($password); $user->password = Hash::make($password);
$user->update_time = time(); $user->update_time = time();
$result = $user->save(); $result = $user->save();
...@@ -113,14 +114,14 @@ class AuthApiController extends Controller ...@@ -113,14 +114,14 @@ class AuthApiController extends Controller
return $this->setError('Email address required'); return $this->setError('Email address required');
} }
$info = User::where('email', $email)->first(); $info = User::where('email', $email)->first();
if ($info) { if ($info && $type == 'register') {
return $this->setError('This email had been registered'); return $this->setError('This email had been registered');
} }
//发送验证码 //发送验证码
$code = mt_rand(1000, 9999); $code = mt_rand(1000, 9999);
$redisKey = 'sem_email_code_' . $type; $redisKey = 'sem_email_code_' . $type . '_' . $email;
Redis::hset($redisKey, $code); Redis::set($redisKey, $code);
Redis::expire($redisKey, 60); Redis::expire($redisKey, 60);
$subject = config('mail.from.name'); $subject = config('mail.from.name');
$msg = 'Email Code：' . $code . '.'; $msg = 'Email Code：' . $code . '.';
......
routes/api.php
...@@ -22,8 +22,9 @@ Route::middleware(['api'])->namespace('Api')->group(function () { ...@@ -22,8 +22,9 @@ Route::middleware(['api'])->namespace('Api')->group(function () {
Route::middleware(['api','api.check'])->namespace('Api')->group(function () { Route::middleware(['api','api.check'])->namespace('Api')->group(function () {
Route::GET('/user/logout', 'AuthApiController@logout'); Route::GET('/user/logout', 'AuthApiController@logout');
Route::Any('user/reset_password', 'AuthApiController@resetPassword');
Route::Any('user/send_email_code', 'AuthApiController@sendEmailCode');
}); });
Route::middleware(['api','api.check'])->namespace('Auth')->group(function () { Route::middleware(['api','api.check'])->namespace('Auth')->group(function () {
Route::Any('user/reset_password', 'ResetPasswordController@reset');
}); });
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment