允许微信证书为空

Author: bigrocs

src/App/Http/Controllers/Api/ConfigController.php

@@ -107,7 +107,7 @@ public function publicGatewayForm($gateway,$configs)
                     ->item(['name' => 'app_id', 'type' => 'text',    'label' => 'appId',          'placeholder' => '开发者ID(AppID)'])
                     ->item(['name' => 'seller_id', 'type' => 'text',     'label' => 'mchId',     'placeholder' => '微信商户号'])
                     ->item(['name' => 'other',     'type' => 'text',     'label' => 'AppSecret',     'placeholder' => '开发者密码(AppSecret)'])
-                    ->item(array_merge(['name' => 'public_key','type' => 'file',     'label' => 'apiclientCert.',
+                    ->item(array_merge(['name' => 'public_key','type' => 'file',     'label' => 'apiclientCert',
                         'placeholder' => '微信公钥','fileName'=> $this->getFileName($configs->public_key)
                     ],$upload))
                     ->item(array_merge(['name' => 'private_key','type' => 'file',    'label' => 'apiclientKey',

src/App/Http/Controllers/OmnipayController.php

@@ -61,7 +61,7 @@ protected function wechat($gateway,$order)
           'body'              => $order['name'],
           'total_fee'         => $order['fee']*100, //=0.01
           'spbill_create_ip'  => '127.0.0.1',
-          'fee_type'          => 'CNY'
+          'fee_type'          => 'CNY',
         ];
         return $gateway->purchase($order)->send();
     }

src/App/Models/Config.php

@@ -35,8 +35,8 @@ public function gatewayRegister()
         $this->where('status', true)->get()->map(function ($item) {
           //获取证书密钥文件路径
           $upload = new Upload();
-          $private_key = storage_path('app/'.$upload->getUploadWhereFirst($item->private_key)->path);
-          $public_key = storage_path('app/'.$upload->getUploadWhereFirst($item->public_key)->path);
+          $private_key = $item->private_key? storage_path('app/'.$upload->getUploadWhereFirst($item->private_key)->path):null;
+          $public_key = $item->public_key? storage_path('app/'.$upload->getUploadWhereFirst($item->public_key)->path):null;
           switch ($item->gateway) {
             case 'alipay':
               config(['laravel-omnipay.gateways.'.$item->gateway.'.driver' => $item->driver]);
@@ -50,6 +50,19 @@ public function gatewayRegister()
                     'notifyUrl' => $item->notify_url
                 ]]);
             break;
+            case 'wechat':
+              config(['laravel-omnipay.gateways.'.$item->gateway.'.driver' => $item->driver]);
+                config(['laravel-omnipay.gateways.'.$item->gateway.'.options' => [
+                    'appId'    => $item->app_id,
+                    'mchId'    => $item->seller_id,
+                    'apiKey'   => $item->other,
+                    'keyPath'  => $private_key,
+                    'certPath' => $public_key,
+                    'returnUrl' => $item->return_url,
+                    'notifyUrl' => $item->notify_url,
+                    'tradeType' => 'JSAPI',
+                ]]);
+            break;
             case 'unionpay':
               config(['laravel-omnipay.gateways.'.$item->gateway.'.driver' => $item->driver]);
                 config(['laravel-omnipay.gateways.'.$item->gateway.'.options' => [