Skip to content

Commit db8a75d

Browse files
linyiyuanlinyiyuan
committed
'提交'
1 parent f2b2329 commit db8a75d

File tree

13 files changed

+642
-41
lines changed

13 files changed

+642
-41
lines changed

‎app/Constants/StatusCode.php

+11-10
Original file line numberDiff line numberDiff line change
@@ -76,23 +76,24 @@ class StatusCode extends AbstractConstants
7676
*/
7777
const ERR_USER_ABSENT = 2003;
7878

79-
8079
/**
81-
* @Message("业务逻辑异常！")
80+
* @Message("用户不存在！")
8281
*/
83-
const ERR_EXCEPTION = 3001;
82+
const ERR_USER_PASSWORD= 2004;
8483

8584
/**
86-
* 用户相关逻辑异常
87-
* @Message("用户密码不正确！")
85+
* @Message("用户被禁用！")
8886
*/
89-
const ERR_EXCEPTION_USER = 3002;
87+
const ERR_USER_DISABLE= 2005;
88+
9089

9190
/**
92-
* 文件上传
93-
* @Message("文件上传异常！")
91+
* @Message("业务逻辑异常！")
9492
*/
95-
const ERR_EXCEPTION_UPLOAD = 3003;
96-
93+
const ERR_EXCEPTION = 3001;
9794

95+
/**
96+
* @Message("验证异常！")
97+
*/
98+
const ERR_VALIDATION = 3002;
9899
}

‎app/Controller/AbstractController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
namespace App\Controller;
1313

1414
use App\Foundation\Traits\ApiTrait;
15+
use App\Foundation\Traits\ValidationTrait;
1516
use Hyperf\Di\Annotation\Inject;
1617
use Hyperf\HttpServer\Contract\RequestInterface;
1718
use Hyperf\HttpServer\Contract\ResponseInterface;
1819
use Psr\Container\ContainerInterface;
1920

2021
abstract class AbstractController
2122
{
22-
use ApiTrait;
23+
use ApiTrait, ValidationTrait;
2324

2425
/**
2526
* @Inject

‎app/Controller/Auth/LoginController.php

+3-23
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66

77
use App\Constants\StatusCode;
88
use App\Controller\AbstractController;
9-
use App\Middleware\CheckTokenMiddleware;
109
use App\Model\Auth\User;
1110
use Hyperf\Di\Annotation\Inject;
1211
use Hyperf\HttpServer\Annotation\Controller;
13-
use Hyperf\HttpServer\Annotation\Middleware;
1412
use Hyperf\HttpServer\Annotation\RequestMapping;
1513
use Phper666\JWTAuth\JWT;
1614

@@ -26,9 +24,10 @@ class LoginController extends AbstractController
2624
*/
2725
private $jwt;
2826

29-
3027
/**
31-
* @RequestMapping(path="/login", methods="post")
28+
* 登陆操作
29+
* @return \Psr\Http\Message\ResponseInterface
30+
* @throws \Psr\SimpleCache\InvalidArgumentException
3231
*/
3332
public function login()
3433
{
@@ -97,23 +96,4 @@ public function logOut()
9796
$this->jwt->logout();
9897
return $this->success();
9998
}
100-
101-
/**
102-
* @RequestMapping(path="/index", methods="get")
103-
* @Middleware(CheckTokenMiddleware::class)
104-
* @return \Psr\Http\Message\ResponseInterface
105-
*/
106-
public function getData()
107-
{
108-
$data = [
109-
'code' => 0,
110-
'msg' => 'success',
111-
'data' => [
112-
'cache_time' => $this->jwt->getTokenDynamicCacheTime() // 获取token的有效时间，动态的
113-
]
114-
115-
];
116-
return $this->response->json($data);
117-
}
118-
11999
}

‎app/Controller/IndexController.php

+1-6
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,10 @@ class IndexController extends AbstractController
2222
*/
2323
public $userService = '';
2424

25-
/**
26-
* @RequestMapping(path="/", methods="get")
27-
*/
2825
public function index()
2926
{
30-
$role = Role::create(['name' => '管理员', 'description' => '']);
31-
3227
return $this->success([
33-
$role
28+
1
3429
]);
3530
}
3631

‎app/Exception/Handler/AppExceptionHandler.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function handle(Throwable $throwable, ResponseInterface $response)
5252
if ($throwable instanceof BusinessException) {
5353
// 阻止异常冒泡
5454
$this->stopPropagation();
55-
return $this->error($throwable->getCode(), $message);
55+
return $this->error($throwable->getCode(), $throwable->getMessage());
5656
}
5757
return $this->error(500, $message);
5858

‎app/Foundation/Traits/ApiTrait.php

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use App\Foundation\Facades\Log;
77
use Hyperf\HttpServer\Contract\RequestInterface;
88
use Hyperf\HttpServer\Contract\ResponseInterface;
9+
use Illuminate\Support\Facades\Validator;
910
use Psr\Container\ContainerInterface;
1011
use Hyperf\Di\Annotation\Inject;
1112
use Throwable;

‎app/Foundation/Traits/ValidationTrait.php

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?php
2+
namespace App\Foundation\Traits;
3+
4+
use App\Constants\StatusCode;
5+
use App\Exception\Handler\BusinessException;
6+
use Hyperf\HttpServer\Contract\RequestInterface;
7+
use Hyperf\HttpServer\Contract\ResponseInterface;
8+
use Psr\Container\ContainerInterface;
9+
use Hyperf\Di\Annotation\Inject;
10+
use Hyperf\Validation\Contract\ValidatorFactoryInterface;
11+
12+
/**
13+
* 验证器基类
14+
* Trait ValidationTrait
15+
* @package App\Foundation\Traits
16+
*/
17+
trait ValidationTrait
18+
{
19+
/**
20+
* @Inject
21+
* @var ContainerInterface
22+
*/
23+
protected $container;
24+
25+
/**
26+
* @Inject
27+
* @var RequestInterface
28+
*/
29+
protected $request;
30+
31+
/**
32+
* @Inject
33+
* @var ResponseInterface
34+
*/
35+
protected $response;
36+
37+
/**
38+
* @Inject()
39+
* @var ValidatorFactoryInterface
40+
*/
41+
protected $validationFactory;
42+
43+
/**
44+
* 验证异常
45+
* @param $data
46+
* @param $rules
47+
* @param $message
48+
*/
49+
public function verifyParams($data, $rules, $message)
50+
{
51+
$validator = $this->validationFactory->make($data, $rules, $message);
52+
if ($validator->fails()) {
53+
Throw new BusinessException(StatusCode::ERR_VALIDATION, $validator->errors()->first());
54+
}
55+
}
56+
}

‎app/Middleware/CheckTokenMiddleware.php

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\Middleware;
6+
7+
use App\Constants\StatusCode;
8+
use App\Exception\Handler\BusinessException;
9+
use Hyperf\HttpServer\Contract\ResponseInterface as HttpResponse;
10+
use Phper666\JWTAuth\Exception\TokenValidException;
11+
use Phper666\JWTAuth\JWT;
12+
use Phper666\JWTAuth\Util\JWTUtil;
13+
use Psr\Http\Message\ResponseInterface;
14+
use Psr\Http\Message\ServerRequestInterface;
15+
use Psr\Http\Server\MiddlewareInterface;
16+
use Psr\Http\Server\RequestHandlerInterface;
17+
18+
/**
19+
* 校验TOKEN是否合法
20+
* Class CheckTokenMiddleware
21+
* @package App\Middleware
22+
* @Author YiYuan-Lin
23+
* @Date: 2020/9/22
24+
*/
25+
class CheckTokenMiddleware implements MiddlewareInterface
26+
{
27+
/**
28+
* @var HttpResponse
29+
*/
30+
protected $response;
31+
32+
protected $jwt;
33+
34+
/**
35+
* CheckTokenMiddleware constructor.
36+
* @param HttpResponse $response
37+
* @param JWT $jwt
38+
*/
39+
public function __construct(HttpResponse $response, JWT $jwt)
40+
{
41+
$this->response = $response;
42+
$this->jwt = $jwt;
43+
}
44+
45+
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
46+
{
47+
var_dump(1);
48+
$isValidToken = false;
49+
// 根据具体业务判断逻辑走向，这里假设用户携带的token有效
50+
$token = $request->getHeaderLine('Authorization') ?? '';
51+
if (strlen($token) > 0) {
52+
$token = JWTUtil::handleToken($token);
53+
if ($token !== false && $this->jwt->checkToken($token)) {
54+
$isValidToken = true;
55+
}
56+
}
57+
if ($isValidToken) {
58+
return $handler->handle($request);
59+
}
60+
61+
Throw new BusinessException(StatusCode::ERR_INVALID_TOKEN, 'Token无效或者过期');
62+
}
63+
}

‎config/autoload/jwt.php

+115
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
<?php
2+
declare(strict_types=1);
3+
4+
return [
5+
'login_type' => env('JWT_LOGIN_TYPE', 'mpop'), // 登录方式，sso为单点登录，mpop为多点登录
6+
7+
/**
8+
* 单点登录自定义数据中必须存在uid的键值，这个key你可以自行定义，只要自定义数据中存在该键即可
9+
*/
10+
'sso_key' => 'uid',
11+
12+
'secret' => env('JWT_SECRET', 'phper666'), // 非对称加密使用字符串,请使用自己加密的字符串
13+
14+
/**
15+
* JWT 权限keys
16+
* 对称算法: HS256, HS384 & HS512 使用 `JWT_SECRET`.
17+
* 非对称算法: RS256, RS384 & RS512 / ES256, ES384 & ES512 使用下面的公钥私钥.
18+
*/
19+
'keys' => [
20+
'public' => env('JWT_PUBLIC_KEY'), // 公钥，例如：'file:///path/to/public/key'
21+
'private' => env('JWT_PRIVATE_KEY'), // 私钥，例如：'file:///path/to/private/key'
22+
],
23+
24+
'ttl' => env('JWT_TTL', 7200), // token过期时间，单位为秒
25+
26+
'alg' => env('JWT_ALG', 'HS256'), // jwt的hearder加密算法
27+
28+
/**
29+
* 支持的算法
30+
*/
31+
'supported_algs' => [
32+
'HS256' => 'Lcobucci\JWT\Signer\Hmac\Sha256',
33+
'HS384' => 'Lcobucci\JWT\Signer\Hmac\Sha384',
34+
'HS512' => 'Lcobucci\JWT\Signer\Hmac\Sha512',
35+
'ES256' => 'Lcobucci\JWT\Signer\Ecdsa\Sha256',
36+
'ES384' => 'Lcobucci\JWT\Signer\Ecdsa\Sha384',
37+
'ES512' => 'Lcobucci\JWT\Signer\Ecdsa\Sha512',
38+
'RS256' => 'Lcobucci\JWT\Signer\Rsa\Sha256',
39+
'RS384' => 'Lcobucci\JWT\Signer\Rsa\Sha384',
40+
'RS512' => 'Lcobucci\JWT\Signer\Rsa\Sha512',
41+
],
42+
43+
/**
44+
* 对称算法名称
45+
*/
46+
'symmetry_algs' => [
47+
'HS256',
48+
'HS384',
49+
'HS512'
50+
],
51+
52+
/**
53+
* 非对称算法名称
54+
*/
55+
'asymmetric_algs' => [
56+
'RS256',
57+
'RS384',
58+
'RS512',
59+
'ES256',
60+
'ES384',
61+
'ES512',
62+
],
63+
64+
/**
65+
* 是否开启黑名单，单点登录和多点登录的注销、刷新使原token失效，必须要开启黑名单，目前黑名单缓存只支持hyperf缓存驱动
66+
*/
67+
'blacklist_enabled' => env('JWT_BLACKLIST_ENABLED', true),
68+
69+
/**
70+
* 黑名单的宽限时间 单位为：秒，注意：如果使用单点登录，该宽限时间无效
71+
*/
72+
'blacklist_grace_period' => env('JWT_BLACKLIST_GRACE_PERIOD', 0),
73+
74+
/**
75+
* 黑名单缓存token时间，注意：该时间一定要设置比token过期时间要大一点，默认为1天,最好设置跟过期时间一样
76+
*/
77+
'blacklist_cache_ttl' => env('JWT_TTL', 86400),
78+
79+
'blacklist_prefix' => 'hyperf-api', // 黑名单缓存的前缀
80+
81+
/**
82+
* 区分不同场景的token，比如你一个项目可能会有多种类型的应用接口鉴权,下面自行定义，我只是举例子
83+
* 下面的配置会自动覆盖根配置，比如application1会里面的数据会覆盖掉根数据
84+
* 下面的scene会和根数据合并
85+
* scene必须存在一个default
86+
* 什么叫根数据，这个配置的一维数组，除了scene都叫根配置
87+
*/
88+
'scene' => [
89+
'default' => [],
90+
'application1' => [
91+
'secret' => 'application1', // 非对称加密使用字符串,请使用自己加密的字符串
92+
'login_type' => 'sso', // 登录方式，sso为单点登录，mpop为多点登录
93+
'sso_key' => 'uid',
94+
'ttl' => 7200, // token过期时间，单位为秒
95+
'blacklist_cache_ttl' => env('JWT_TTL', 7200), // 黑名单缓存token时间，注意：该时间一定要设置比token过期时间要大一点，默认为100秒,最好设置跟过期时间一样
96+
],
97+
'application2' => [
98+
'secret' => 'application2', // 非对称加密使用字符串,请使用自己加密的字符串
99+
'login_type' => 'sso', // 登录方式，sso为单点登录，mpop为多点登录
100+
'sso_key' => 'uid',
101+
'ttl' => 7200, // token过期时间，单位为秒
102+
'blacklist_cache_ttl' => env('JWT_TTL', 7200), // 黑名单缓存token时间，注意：该时间一定要设置比token过期时间要大一点，默认为100秒,最好设置跟过期时间一样
103+
],
104+
'application3' => [
105+
'secret' => 'application3', // 非对称加密使用字符串,请使用自己加密的字符串
106+
'login_type' => 'mppo', // 登录方式，sso为单点登录，mpop为多点登录
107+
'ttl' => 7200, // token过期时间，单位为秒
108+
'blacklist_cache_ttl' => env('JWT_TTL', 7200), // 黑名单缓存token时间，注意：该时间一定要设置比token过期时间要大一点，默认为100秒,最好设置跟过期时间一样
109+
]
110+
],
111+
'model' => [ // TODO 支持直接获取某模型的数据
112+
'class' => '',
113+
'pk' => 'uid'
114+
]
115+
];

‎config/autoload/translation.php

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
/**
5+
* This file is part of Hyperf.
6+
*
7+
* @link https://www.hyperf.io
8+
* @document https://hyperf.wiki
9+
* @contact [email protected]
10+
* @license https://github.com/hyperf/hyperf/blob/master/LICENSE
11+
*/
12+
return [
13+
'locale' => 'zh_CN',
14+
'fallback_locale' => 'en',
15+
'path' => BASE_PATH . '/storage/languages',
16+
];

0 commit comments

Comments
 (0)