From 1809ee9153eca023d211f11942fbd5811ab45c15 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 23 Nov 2020 14:42:46 +0800
Subject: [PATCH] Update WechatService.php

---
 app/wechat/service/WechatService.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/wechat/service/WechatService.php b/app/wechat/service/WechatService.php
index ebf962d8e..23696edaa 100644
--- a/app/wechat/service/WechatService.php
+++ b/app/wechat/service/WechatService.php
@@ -195,13 +195,14 @@ class WechatService extends Service
             'mch_key'        => sysconf('wechat.mch_key'),
             'cache_path'     => $this->app->getRuntimePath() . 'wechat',
         ];
+        $local = LocalStorage::instance();
         switch (strtolower(sysconf('wechat.mch_ssl_type'))) {
             case 'p12':
-                $options['ssl_p12'] = LocalStorage::instance()->path(sysconf('wechat.mch_ssl_p12'), true);
+                $options['ssl_p12'] = $local->path(sysconf('wechat.mch_ssl_p12'), true);
                 break;
             case 'pem':
-                $options['ssl_key'] = LocalStorage::instance()->path(sysconf('wechat.mch_ssl_key'), true);
-                $options['ssl_cer'] = LocalStorage::instance()->path(sysconf('wechat.mch_ssl_cer'), true);
+                $options['ssl_key'] = $local->path(sysconf('wechat.mch_ssl_key'), true);
+                $options['ssl_cer'] = $local->path(sysconf('wechat.mch_ssl_cer'), true);
                 break;
         }
         return $options;
@@ -276,7 +277,7 @@ class WechatService extends Service
      */
     public function getWebJssdkSign(?string $location = null)
     {
-        $location = is_null($location) ? $this->app->request->url(true) : $location;
+        $location = $location ?: $this->app->request->url(true);
         if ($this->getType() === 'api') {
             return self::WeChatScript()->getJsSign($location);
         } else {