正在显示
1 个修改的文件
包含
2 行增加
和
5 行删除
| @@ -42,12 +42,9 @@ class Client | @@ -42,12 +42,9 @@ class Client | ||
| 42 | */ | 42 | */ |
| 43 | protected function signature(Request $request): ?string | 43 | protected function signature(Request $request): ?string |
| 44 | { | 44 | { |
| 45 | - $sig = new Signature(); | 45 | + $sig = new Signature($request->config); |
| 46 | $sig->setTimestamp($request->getTimestamp()); | 46 | $sig->setTimestamp($request->getTimestamp()); |
| 47 | $sig->setMethod($request->getService()); | 47 | $sig->setMethod($request->getService()); |
| 48 | - $sig->setAppKey($request->config->getAppKey()); | ||
| 49 | - $sig->setAppSecret($request->config->getAppSecret()); | ||
| 50 | - $sig->setVersion($request->config->getVersion()); | ||
| 51 | $params = $request->getParams(); | 48 | $params = $request->getParams(); |
| 52 | Sort::ksort($params); | 49 | Sort::ksort($params); |
| 53 | $sig->setParamJson(Json::marshal($params)); | 50 | $sig->setParamJson(Json::marshal($params)); |
| @@ -72,7 +69,7 @@ class Client | @@ -72,7 +69,7 @@ class Client | ||
| 72 | 'access_token' => $request->config->getAccessToken(), | 69 | 'access_token' => $request->config->getAccessToken(), |
| 73 | 'param_json' => Json::marshal($params), | 70 | 'param_json' => Json::marshal($params), |
| 74 | 'timestamp' => $request->getTimestamp(), | 71 | 'timestamp' => $request->getTimestamp(), |
| 75 | - 'v' => $request->getV(), | 72 | + 'v' => $request->config->getVersion(), |
| 76 | 'sign' => $this->signature($request), | 73 | 'sign' => $this->signature($request), |
| 77 | 'sign_method' => $request->config->getSignMethod(), | 74 | 'sign_method' => $request->config->getSignMethod(), |
| 78 | ]; | 75 | ]; |
-
请 注册 或 登录 后发表评论