From 1bd21972d15ef02ee12229a2ef9482d67693e1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=84=E5=B0=98?= <122383162@qq.com>
Date: Fri, 19 Feb 2021 16:40:01 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=93=B6=E8=81=94=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/SkyxuController.php |  5 +++--
 composer.lock                            | 14 +++++++++-----
 config/unionpay.php                      | 12 +++++++-----
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/SkyxuController.php b/app/Http/Controllers/SkyxuController.php
index 66c339d..6d9e3b5 100644
--- a/app/Http/Controllers/SkyxuController.php
+++ b/app/Http/Controllers/SkyxuController.php
@@ -19,12 +19,13 @@ class SkyxuController extends Controller
      */
     public function sftp()
     {
-        $app       = app('xuanchen.unionpay.check');
-        $app->date = '20190722';
+        $app = app('xuanchen.unionpay.check');
+        //        $app->date = '20190722';
         $app->login();
         $app->hasFile();
         $app->start();
         dump($app->msg);
+        dump($app);
 
         die();
         $path    = '/home/wwwroot/pingan/upload/';
diff --git a/composer.lock b/composer.lock
index c480420..7f15cc3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1307,16 +1307,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v8.25.0",
+            "version": "v8.28.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "05da44d6823c2923597519ac10151f5827a24f80"
+                "reference": "73dd43d92fcde6c6abc00658ae33391397ca119d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/05da44d6823c2923597519ac10151f5827a24f80",
-                "reference": "05da44d6823c2923597519ac10151f5827a24f80",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/73dd43d92fcde6c6abc00658ae33391397ca119d",
+                "reference": "73dd43d92fcde6c6abc00658ae33391397ca119d",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1473,7 +1473,11 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2021-01-26T14:40:21+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2021-02-16T18:07:44+00:00"
         },
         {
             "name": "laravel/tinker",
diff --git a/config/unionpay.php b/config/unionpay.php
index 43faef1..0a68706 100644
--- a/config/unionpay.php
+++ b/config/unionpay.php
@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'user_model'   => \App\Models\User::class,
     //是否调试
     'debug'        => true,
     //环境变量
@@ -10,13 +11,13 @@ return [
     //对账单信息
     'check'        => [
         'sftpadapter' => [
-            'host'          => 'localhost',//地址
-            'port'          => 22,//端口
-            'username'      => 'root', //账号
-            'password'      => 'Anetadmin1',//密码
+            'host'          => env('UNION_HOST', ''),//地址
+            'port'          => env('UNION_PORT', 22),//端口
+            'username'      => env('UNION_USERNAME', 'root'), //账号
+            'password'      => env('UNION_PASSWORD', ''),//密码
             'privateKey'    => '',
             'passphrase'    => '',
-            'root'          => '/home/wwwroot/pingan/upload/',//路径
+            'root'          => env('UNION_ROOT', '/'),//路径
             'timeout'       => 10,//超时时间
             'directoryPerm' => 0755,
         ],
@@ -325,6 +326,7 @@ return [
             "req_serial_no",//自己添加的基础数据
             "orig_req_serial_no",//自己添加的基础数据
             "sett_date",//自己添加的基础数据
+            "mkt_code",//自己添加的基础数据
         ],
         '002101' => [
             "msg_type",