Skip to content

Commit ab2d910

Browse files
author
lea
committed
修改登录界面，升级laravel到5.7，升级layui到2.4.3。修复已知bug
1 parent cfdbac5 commit ab2d910

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1990
-6759
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
/.idea
77
/.vagrant
88
Homestead.json
9+
composer.lock
910
Homestead.yaml
1011
npm-debug.log
1112
yarn-error.log

‎app/Http/Controllers/Admin/PublicController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function login(Request $request)
3333
'captcha' => '验证码错误'
3434
]);
3535
if ($validator->fails()) {
36-
return Y::error($validator->errors());
36+
return Y::error($validator->errors()->first());
3737
}
3838
unset($post['captcha']);
3939
if (Auth::guard('admin')->attempt($post, boolval($request->post('remember', '')))) {

‎app/Http/Controllers/Api/V1/AuthController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ public function login()
2525
return Y::json($this->respondWithToken($token));
2626
}
2727

28-
public function signUp(Request $request)
28+
public function register(Request $request)
2929
{
3030
$post = $request->only(['mobile', 'code', 'password', 'nickname']);
3131
$validator = Validator::make($post, [
3232
'mobile' => 'required|unique:users|regex:/^1[34578][0-9]{9}$/',
3333
'code' => 'required|size:6',
3434
'password' => 'required|alpha_num|size:32',
35-
'nickname' => 'required|max:32'
35+
'nickname' => 'required|max:32',
3636
]);
3737
if ($validator->fails()) {
3838
return Y::json($validator->errors());
@@ -99,7 +99,7 @@ protected function respondWithToken($token)
9999
return [
100100
'access_token' => $token,
101101
'token_type' => 'Bearer',
102-
'expires_in' => auth()->factory()->getTTL() * 60
102+
'expires_in' => auth()->factory()->getTTL() * 60,
103103
];
104104
}
105105
}

‎app/Http/Controllers/Api/V1/PublicController.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
class PublicController extends Controller
1414
{
1515

16+
public function init()
17+
{
18+
echo '1';
19+
}
20+
1621
/**
1722
* 发送短信
1823
* @param Request $request
@@ -27,7 +32,7 @@ public function sendSms(Request $request)
2732
'mobile' => 'required|regex:/^1[34578][0-9]{9}$/',
2833
'mark' => 'required|in:login,signUp,editMobile,forgetPassword',
2934
'sign' => 'required|alpha_num|size:40',
30-
'rand_str' => 'required|alpha_num|size:32'
35+
'rand_str' => 'required|alpha_num|size:32',
3136
]);
3237

3338
//这儿写逻辑

‎app/Http/Middleware/ApiAuth.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ public function handle($request, Closure $next, $guard = 'api')
2121
if ($request->is(...$this->except) || (Auth::guard($guard)->check() && Auth::guard($guard)->user()->status == 1)) {
2222
return $next($request);
2323
}
24-
return Y::json(1001, '用户验证失败，请重新登录');
24+
return Y::json(401, '用户验证失败，请重新登录');
2525
}
2626

2727
protected $except = [
28+
'v1/init',
2829
'v1/auth/login',
29-
'v1/auth/signUp',
30-
'v1/sendSms'
30+
'v1/auth/register',
31+
'v1/sendSms',
3132
];
3233
}

‎app/Http/Middleware/TrustProxies.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,5 @@ class TrustProxies extends Middleware
1919
*
2020
* @var array
2121
*/
22-
protected $headers = [
23-
Request::HEADER_FORWARDED => 'FORWARDED',
24-
Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
25-
Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
26-
Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
27-
Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
28-
];
22+
protected $headers = Request::HEADER_X_FORWARDED_ALL;
2923
}

‎app/Http/Middleware/VerifyCsrfToken.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,20 @@
22

33
namespace App\Http\Middleware;
44

5-
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
5+
use Closure;
6+
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
67

7-
class VerifyCsrfToken extends Middleware
8+
9+
class VerifyCsrfToken extends BaseVerifier
810
{
11+
12+
13+
public function handle($request, Closure $next)
14+
{
15+
return parent::addCookieToResponse($request, $next($request));
16+
}
17+
18+
919
/**
1020
* The URIs that should be excluded from CSRF verification.
1121
*

0 commit comments

Comments
 (0)