From 6af2c3a78bcdda00e4ab2c8262237a161246e1b5 Mon Sep 17 00:00:00 2001 From: xuanchen <122383162@qq.com> Date: Tue, 20 Oct 2020 08:34:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/Log/IndexController.php | 17 ++++++++-- app/Admin/Renderable/Log/InData.php | 32 +++++++++++++++++++ app/Admin/Renderable/Log/OutData.php | 25 +++++++++++++++ app/Api/Controllers/UnionPayController.php | 4 +-- packages/unionpay/src/Action/Init.php | 8 +++-- 5 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 app/Admin/Renderable/Log/InData.php create mode 100644 app/Admin/Renderable/Log/OutData.php diff --git a/app/Admin/Controllers/Log/IndexController.php b/app/Admin/Controllers/Log/IndexController.php index 4e7f2d1..f02107e 100644 --- a/app/Admin/Controllers/Log/IndexController.php +++ b/app/Admin/Controllers/Log/IndexController.php @@ -2,6 +2,8 @@ namespace App\Admin\Controllers\Log; +use App\Admin\Renderable\Log\InData; +use App\Admin\Renderable\Log\OutData; use App\Models\Log; use Encore\Admin\Controllers\AdminController; use Encore\Admin\Grid; @@ -15,7 +17,7 @@ class IndexController extends AdminController /** * Notes: * @Author: - * @Date: 2019/9/18 14:50 + * @Date : 2019/9/18 14:50 * @return Grid */ protected function grid() @@ -57,7 +59,15 @@ class IndexController extends AdminController return new Table($header, $array); }); $grid->column('method', '模式'); - // $grid->column('in_source', '请求参数'); + // $grid->column('in_source', '请求参数') + // ->display(function ($title, $column) { + // return '点击展开'; + // })->modal(InData::class); + // + // $grid->column('out_source', '返回参数') + // ->display(function ($title, $column) { + // return '点击展开'; + // })->modal(OutData::class); $grid->column('请求参数')->display(function () { $in_source = $this->in_source; unset($in_source['merchantSign']); @@ -67,9 +77,9 @@ class IndexController extends AdminController unset($in_source['json']); unset($in_source['query']['merchantSign']); unset($in_source['query']['merchantCert']); + return $in_source; }); - // $grid->column('out_source', '返回信息'); $grid->column('返回信息')->display(function () { $out_source = $this->out_source; @@ -83,6 +93,7 @@ class IndexController extends AdminController if (isset($out_source['data']) && is_string($out_source['data'])) { unset($out_source['data']); } + return $out_source; }); $grid->column('created_at', '提交时间'); diff --git a/app/Admin/Renderable/Log/InData.php b/app/Admin/Renderable/Log/InData.php new file mode 100644 index 0000000..6e75f98 --- /dev/null +++ b/app/Admin/Renderable/Log/InData.php @@ -0,0 +1,32 @@ +in_source; + foreach ($in_source as $key => $item) { + if (!in_array($key, [])) { + + } + if (is_array($item)) { + $in_source[$key] = json_encode($item); + } + } + + if (is_array($in_source) && count($in_source) > 1) { + $table = new Table(['名称', '值'], $in_source, ['panel', ' panel-default']); + + return $table->render(); + } + } + +} \ No newline at end of file diff --git a/app/Admin/Renderable/Log/OutData.php b/app/Admin/Renderable/Log/OutData.php new file mode 100644 index 0000000..94179f4 --- /dev/null +++ b/app/Admin/Renderable/Log/OutData.php @@ -0,0 +1,25 @@ +out_source; + + if (is_array($out_source) && count($out_source) > 1) { + unset($out_source['sign']); + $table = new Table(['名称', '值'], $out_source, ['panel ', 'panel-success']); + + return $table->render(); + } + } + +} \ No newline at end of file diff --git a/app/Api/Controllers/UnionPayController.php b/app/Api/Controllers/UnionPayController.php index 7db9272..12dba70 100644 --- a/app/Api/Controllers/UnionPayController.php +++ b/app/Api/Controllers/UnionPayController.php @@ -40,10 +40,10 @@ class UnionPayController extends Controller unset($inputs['sign']); $action = new UnionPay($inputs, $sign); - // $action->addLog(); + $action->addLog(); $action->start(); - // $action->updateLog(); + $action->updateLog(); return $action->respond(); diff --git a/packages/unionpay/src/Action/Init.php b/packages/unionpay/src/Action/Init.php index 2394fc4..f56fe07 100644 --- a/packages/unionpay/src/Action/Init.php +++ b/packages/unionpay/src/Action/Init.php @@ -211,8 +211,10 @@ class Init public function str2utf8($str) { $encode = mb_detect_encoding($str, ['ASCII', 'UTF-8', 'GB2312', 'GBK', 'BIG5']); - $str = $str ? $str : mb_convert_encoding($str, 'UTF-8', $encode); - $str = is_string($str) ? $str : ''; + if ($encode != 'UTF-8') { + $str = $str ? $str : mb_convert_encoding($str, 'UTF-8', $encode); + } + $str = is_string($str) ? $str : ''; return $str; } @@ -222,7 +224,7 @@ class Init { $rt = microtime(true) - LARAVEL_START; - $header = ['rt' => round($rt * 1000, 2) . 'ms', 'qps' => round(1 / $rt, 1)]; + $header = ['rt' => round($rt * 1000, 2) . 'ms', 'qps' => round(1 / $rt, 1), 'company' => 'YSD']; return \Response::json($this->outdata, 200, $header); }