diff --git a/app/Api/Controllers/ApiResponse.php b/app/Api/Controllers/ApiResponse.php index 3b4cb6e..437dc02 100644 --- a/app/Api/Controllers/ApiResponse.php +++ b/app/Api/Controllers/ApiResponse.php @@ -117,11 +117,11 @@ trait ApiResponse /** * 成功的返回 - * @Author : - * @Date :2018-05-22 - * @param [type] $data [description] - * @param string $status [description] - * @return [type] [description] + * @Author : + * @Date :2018-05-22 + * @param [type] $data [description] + * @param string $log + * @return [type] [description] */ public function success($data, $log = '') { diff --git a/app/Http/Controllers/TestController.php b/app/Http/Controllers/TestController.php index b33b172..5f0d25a 100644 --- a/app/Http/Controllers/TestController.php +++ b/app/Http/Controllers/TestController.php @@ -258,4 +258,48 @@ class TestController return number_format(microtime(true) - request()->server('REQUEST_TIME_FLOAT'), $decimals) . ' s'; } + /** + * Notes: 测试签名 + * @Author: 玄尘 + * @Date : 2020/12/30 11:47 + * @param \Illuminate\Http\Request $request + */ + public function getSign(Request $request) + { + + // $data = 'SMyBpCxqBnxAGr/Fk9LOB851Glkgc3ruZnu1Y0ft/R+Ng26ooLXok1Oi1SrwhSJaQ9U75zy3tI7fq3YfTLQxITwUmt4jBiShpeK1whMaYrI='; + // $addcode = '1234567812345678'; + // + // return [ + // 'sign' => $this->keysign($data, $addcode), + // 'server_id' => $this->user->server_id, + // 'server_key' => $this->user->server_key, + // 'data' => $data, + // 'addcode' => $addcode, + // ]; + + $server_id = $request->server_id; + $redemptionCode = $request->redemptionCode; + $total = $request->total; + $outletId = $request->outletId; + + $this->user = User::whereNull('parent_id') + ->where('server_id', $server_id) + ->first(); + if (!$this->user) { + return $this->error('未查到到渠道'); + } + $ret = [ + 'redemptionCode' => $redemptionCode, + 'total' => $total, + 'outletId' => $outletId, + ]; + + return json_encode($ret); + info(json_encode($ret)); + + return $this->success($ret); + + } + } diff --git a/composer.lock b/composer.lock index 57d6b74..ad2e901 100644 --- a/composer.lock +++ b/composer.lock @@ -6005,10 +6005,6 @@ } ], "description": "第三方银联对接", - "support": { - "issues": "https://github.com/xuanchen120/unionpay/issues", - "source": "https://github.com/xuanchen120/unionpay/tree/2.2" - }, "time": "2020-12-21T07:04:17+00:00" } ], @@ -8353,5 +8349,5 @@ "php": "^7.2" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "1.1.0" } diff --git a/config/unionpay.php b/config/unionpay.php index 4c1f63a..1860d7f 100644 --- a/config/unionpay.php +++ b/config/unionpay.php @@ -58,7 +58,7 @@ return [ ], // 签名检查数据 没有为全数据 'checksign' => [ - '106040' => [ + 'default' => [ 'in' => [ 'msg_type', 'msg_txn_code', @@ -83,7 +83,32 @@ return [ 'msg_rsp_desc', ], ], - '012100' => [ + '106040' => [ + 'in' => [ + 'msg_type', + 'msg_txn_code', + 'msg_crrltn_id', + 'msg_flg', + 'msg_sender', + 'msg_time', + 'msg_sys_sn', + 'msg_ver', + 'sign_type', + ], + 'out' => [ + 'msg_type', + 'msg_txn_code', + 'msg_crrltn_id', + 'msg_flg', + 'msg_sender', + 'msg_sys_sn', + 'msg_time', + 'msg_ver', + 'msg_rsp_code', + 'msg_rsp_desc', + ], + ], + '012100' => [ 'in' => [ 'msg_type', 'msg_txn_code', diff --git a/routes/web.php b/routes/web.php index 90f31a2..64291ae 100644 --- a/routes/web.php +++ b/routes/web.php @@ -6,6 +6,7 @@ Route::get('/test/grant', 'TestController@grant')->name('test.grant'); Route::get('/test/checkcoupon', 'TestController@checkcoupon')->name('test.checkcoupon'); Route::get('/test/query', 'TestController@query')->name('test.query'); Route::get('/test/destroy', 'TestController@destroy')->name('test.destroy'); +Route::get('/test/getsign', 'TestController@getSign')->name('test.getsign'); Route::get('/skyxu', 'SkyxuController@index')->name('skyxu'); Route::get('/coupon', 'CouponController@index')->name('coupon');