李帅

1.修改用户信息优化

2.新增用户反馈相关接口。
3.新增点赞列表接口。
...@@ -218,8 +218,8 @@ class AuthController extends Controller ...@@ -218,8 +218,8 @@ class AuthController extends Controller
218 return Response::fail('', 500, $validator->errors()); 218 return Response::fail('', 500, $validator->errors());
219 } 219 }
220 220
221 + try {
221 $redis = Redis::connection(); 222 $redis = Redis::connection();
222 -
223 if ($request->verify_code != '123123') { 223 if ($request->verify_code != '123123') {
224 if ($redis->get($request->email) !== $request->verify_code) { 224 if ($redis->get($request->email) !== $request->verify_code) {
225 return Response::fail('verify code failed', 500); 225 return Response::fail('verify code failed', 500);
...@@ -231,7 +231,6 @@ class AuthController extends Controller ...@@ -231,7 +231,6 @@ class AuthController extends Controller
231 231
232 if (!$user) return Response::fail("查无此人"); 232 if (!$user) return Response::fail("查无此人");
233 233
234 - try {
235 $user->password = bcrypt($data['password']); 234 $user->password = bcrypt($data['password']);
236 $user->save(); 235 $user->save();
237 return Response::success([],"The new password establishes the success. "); 236 return Response::success([],"The new password establishes the success. ");
...@@ -269,6 +268,8 @@ class AuthController extends Controller ...@@ -269,6 +268,8 @@ class AuthController extends Controller
269 }) 268 })
270 ->first(); 269 ->first();
271 270
271 + if (!$user) Response::fail('The user does not exist');
272 +
272 $token = $user->createToken($request->account)->plainTextToken; 273 $token = $user->createToken($request->account)->plainTextToken;
273 274
274 $response = ['token' => $token]; 275 $response = ['token' => $token];
......
...@@ -176,12 +176,7 @@ class ImmerseController extends Controller ...@@ -176,12 +176,7 @@ class ImmerseController extends Controller
176 } 176 }
177 } 177 }
178 178
179 - return \response([ 179 + return Response::success($lists);
180 - 'status' => 'success',
181 - 'code' => 200,
182 - 'message' => 'Http ok',
183 - 'data' => $lists,
184 - ], 200);
185 } 180 }
186 181
187 public function collect($id, Request $request) 182 public function collect($id, Request $request)
...@@ -202,9 +197,12 @@ class ImmerseController extends Controller ...@@ -202,9 +197,12 @@ class ImmerseController extends Controller
202 197
203 $user = $request->user(); 198 $user = $request->user();
204 199
205 - $collects = Collect::query()->where(['user_id' => $user->id, 'state' => 1]) 200 + $collects = Collect::query()
201 + ->where(['user_id' => $user->id, 'state' => 1])
206 ->orderByDesc('created_at') 202 ->orderByDesc('created_at')
207 - ->skip(($page - 1) * $page_size)->take($page_size + 1)->get(); 203 + ->offset(($page - 1) * $page_size)
204 + ->limit($page_size)
205 + ->get();
208 206
209 $lists = []; 207 $lists = [];
210 208
...@@ -225,14 +223,6 @@ class ImmerseController extends Controller ...@@ -225,14 +223,6 @@ class ImmerseController extends Controller
225 } 223 }
226 } 224 }
227 225
228 -// if ($lists == []) return Response::success(\response($lists, 'success')); 226 + return Response::success($lists);
229 -// return Response::success($lists);
230 -
231 - return \response([
232 - 'status' => 'success',
233 - 'code' => 200,
234 - 'message' => 'Http ok',
235 - 'data' => $lists,
236 - ], 200);
237 } 227 }
238 } 228 }
......