Merge branch 'develop' into 'master'

add: 增加解密工具，增加日志跟踪

See merge request bp/pay!39

application/library/Helpers/Sdk.php

@@ -22,9 +22,10 @@ class Sdk {
      */
     public static function call($url, $params, $headers = []) {
 
-        /**/
+        /**/ // X-TRACE-ID、X-REQUEST-ID
         $header = [
-            'X-REQUEST-ID'=>Tracer::getTraceId(),
+            //HTTP-X-TRACE-ID
+            'X-TRACE-ID'=>Tracer::getTraceId(),
         ];
 
         $headers = array_merge($headers, $header);
@@ -43,10 +44,7 @@ class Sdk {
         ]
         */
 
-        $isTrace = \Yaf\Application::app()->getConfig()->get('trace.open');
-        if($isTrace != false) {
-            FileLog::info('sdk api:', ['traceId'=>Tracer::getTraceId(), 'url'=>$url, 'req'=>$params, 'res'=>$data]);
-        }
+        FileLog::info('sdk api:', ['traceId'=>Tracer::getTraceId(), 'url'=>$url, 'req'=>$params, 'res'=>$data]);
 
         if(!empty($data['response']['code'])) {
             throw new BaseException(['msg'=>$data['response']['reason']??'', 'code'=>$data['response']['code']]);

application/modules/Pay/controllers/Callback.php

@@ -99,4 +99,17 @@ class CallbackController extends Base
         $this->success(['result'=>$list, 'step'=>$step]);
 
     }
+
+    public function decryptAction() {
+        $params = $this->params;
+        $key   = $params['key'] ?? '';
+        if(empty($key)) {
+            throw new \App\Exception\BaseException(['msg'=>'请传入解密数据', 'code'=>'2031']);
+        }
+
+        $decrypt = gzuncompress(base64_decode($key));
+
+        $this->success(['result'=>$decrypt]);
+
+    }
 }