Showing
4 changed files
with
37 additions
and
4 deletions
... | @@ -126,7 +126,7 @@ class AuthController extends Controller | ... | @@ -126,7 +126,7 @@ class AuthController extends Controller |
126 | { | 126 | { |
127 | $validator = Validator::make($request->all(), [ | 127 | $validator = Validator::make($request->all(), [ |
128 | 'email' => 'required|email|unique:users|max:255', | 128 | 'email' => 'required|email|unique:users|max:255', |
129 | - 'password' => 'required', | 129 | + 'password' => 'required|min:6', |
130 | 'verify_code' => 'required' | 130 | 'verify_code' => 'required' |
131 | ]); | 131 | ]); |
132 | 132 | ... | ... |
... | @@ -181,8 +181,14 @@ class ImmerseController extends Controller | ... | @@ -181,8 +181,14 @@ class ImmerseController extends Controller |
181 | } | 181 | } |
182 | } | 182 | } |
183 | 183 | ||
184 | - if ($lists == []) return Response::noContent(); | 184 | +// if ($lists == []) return Response::success(\response($lists, 'success')); |
185 | - | 185 | +// return Response::success($lists); |
186 | - return Response::success($lists); | 186 | + |
187 | + return \response([ | ||
188 | + 'status' => 'success', | ||
189 | + 'code' => 200, | ||
190 | + 'message' => 'Http ok', | ||
191 | + 'data' => $lists, | ||
192 | + ], 200); | ||
187 | } | 193 | } |
188 | } | 194 | } | ... | ... |
... | @@ -10,6 +10,7 @@ use Illuminate\Support\Facades\Auth; | ... | @@ -10,6 +10,7 @@ use Illuminate\Support\Facades\Auth; |
10 | use Illuminate\Support\Facades\Hash; | 10 | use Illuminate\Support\Facades\Hash; |
11 | use Illuminate\Support\Facades\Storage; | 11 | use Illuminate\Support\Facades\Storage; |
12 | use Illuminate\Support\Facades\Validator; | 12 | use Illuminate\Support\Facades\Validator; |
13 | +use Illuminate\Validation\Rules\Password; | ||
13 | use Jiannei\Response\Laravel\Support\Facades\Response; | 14 | use Jiannei\Response\Laravel\Support\Facades\Response; |
14 | 15 | ||
15 | class UserController extends Controller | 16 | class UserController extends Controller |
... | @@ -170,4 +171,27 @@ class UserController extends Controller | ... | @@ -170,4 +171,27 @@ class UserController extends Controller |
170 | 171 | ||
171 | return Response::success(['destroy' => true]); | 172 | return Response::success(['destroy' => true]); |
172 | } | 173 | } |
174 | + | ||
175 | + public function changePassword(Request $request) | ||
176 | + { | ||
177 | + $validator = Validator::make($request->all(), [ | ||
178 | + 'password' => 'required|confirmed|min:6', | ||
179 | + 'password_confirmation' => 'required|same:password', | ||
180 | + ]); | ||
181 | + | ||
182 | + if ($validator->fails()){ | ||
183 | + return Response::fail('',500,$validator->errors()); | ||
184 | + } | ||
185 | + | ||
186 | + try{ | ||
187 | + $validated = $validator->validated(); | ||
188 | + $user = Auth::user(); | ||
189 | + $user->password= Hash::make($validated['password']); | ||
190 | + $user->save(); | ||
191 | + }catch (\Exception $exception){ | ||
192 | + return Response::fail('',500,'修改密码失败'); | ||
193 | + } | ||
194 | + | ||
195 | + return Response::success(); | ||
196 | + } | ||
173 | } | 197 | } | ... | ... |
... | @@ -67,6 +67,9 @@ Route::prefix('v1')->namespace('App\Http\Controllers\V1')->middleware('auth:sanc | ... | @@ -67,6 +67,9 @@ Route::prefix('v1')->namespace('App\Http\Controllers\V1')->middleware('auth:sanc |
67 | /** 用户信息修改*/ | 67 | /** 用户信息修改*/ |
68 | $api->put('/user/{id}', 'UserController@update'); | 68 | $api->put('/user/{id}', 'UserController@update'); |
69 | 69 | ||
70 | + /** 用户密码修改*/ | ||
71 | + $api->post('/user/changePassword', 'UserController@changePassword'); | ||
72 | + | ||
70 | /** 用户注销*/ | 73 | /** 用户注销*/ |
71 | $api->delete('/user/{id}', 'UserController@destroy'); | 74 | $api->delete('/user/{id}', 'UserController@destroy'); |
72 | 75 | ... | ... |
-
Please register or login to post a comment