From 6bef644f6d94125bc688f733597e41972ffc4120 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 18 Jul 2019 16:31:03 +0800
Subject: [PATCH 1/5] Update index-store-message2.html

---
 application/store/view/config/index-store-message2.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/store/view/config/index-store-message2.html b/application/store/view/config/index-store-message2.html
index 0d689c04c..7f90093de 100644
--- a/application/store/view/config/index-store-message2.html
+++ b/application/store/view/config/index-store-message2.html
@@ -22,7 +22,7 @@
         <label class="layui-form-item margin-top-20 block relative">
             <span class="color-green margin-right-10">短信平台密码</span><span class="nowrap color-desc">Password</span>
             <input name="sms_zt_password2" required placeholder="请输入短信平台密码" value="{:sysconf('sms_zt_password2')}" class="layui-input">
-            <p class="help-block">短信平台账号，可以联系18122377655获取账号与密码</p>
+            <p class="help-block">短信平台密码，可以联系18122377655获取账号与密码</p>
         </label>
 
         <label class="layui-form-item margin-top-20 block relative">

From c33ed2bd79242e16d7767bf9e9f7ff577c403ed2 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 18 Jul 2019 16:31:55 +0800
Subject: [PATCH 2/5] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/store/view/config/index-store-message1.html | 1 -
 application/store/view/config/index-store-message2.html | 1 -
 2 files changed, 2 deletions(-)

diff --git a/application/store/view/config/index-store-message1.html b/application/store/view/config/index-store-message1.html
index fac167d3c..d00eba8e2 100644
--- a/application/store/view/config/index-store-message1.html
+++ b/application/store/view/config/index-store-message1.html
@@ -41,6 +41,5 @@
             <button class="layui-btn" type="submit">保存配置</button>
         </div>
 
-
     </div>
 </form>
diff --git a/application/store/view/config/index-store-message2.html b/application/store/view/config/index-store-message2.html
index 7f90093de..6c05a427b 100644
--- a/application/store/view/config/index-store-message2.html
+++ b/application/store/view/config/index-store-message2.html
@@ -41,6 +41,5 @@
             <button class="layui-btn" type="submit">保存配置</button>
         </div>
 
-
     </div>
 </form>

From 844dc91f3d3d4c43533820575b7c1bdfa27aae42 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 18 Jul 2019 16:33:30 +0800
Subject: [PATCH 3/5] Update app.php

---
 config/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/app.php b/config/app.php
index ad6afc1d0..2295707ab 100644
--- a/config/app.php
+++ b/config/app.php
@@ -18,7 +18,7 @@ return [
     'app_debug'      => true,
     // 应用Trace调试
     'app_trace'      => false,
-    // URL参数方式 0 按名称成对解析 1 按顺序解析
+    // 0按名称成对解析 1按顺序解析
     'url_param_type' => 1,
     // 当前 ThinkAdmin 版本号
     'thinkadmin_ver' => 'v5',

From a6df40e320fad4895c9025c5e5ac370f36f57751 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 18 Jul 2019 16:40:18 +0800
Subject: [PATCH 4/5] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/store/controller/Message.php | 2 ++
 application/store/controller/Order.php   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/application/store/controller/Message.php b/application/store/controller/Message.php
index 3fdc57018..edc4ee0a7 100644
--- a/application/store/controller/Message.php
+++ b/application/store/controller/Message.php
@@ -50,6 +50,8 @@ class Message extends Controller
     /**
      * 删除短信记录
      * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
      */
     public function remove()
     {
diff --git a/application/store/controller/Order.php b/application/store/controller/Order.php
index c3c919f14..0296b669f 100644
--- a/application/store/controller/Order.php
+++ b/application/store/controller/Order.php
@@ -74,9 +74,11 @@ class Order extends Controller
     /**
      * 修改快递管理
      * @auth true
+     * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
      */
     public function express()
     {

From c7a981a352346845235203a420c8d41bc4325b83 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 18 Jul 2019 16:43:06 +0800
Subject: [PATCH 5/5] Update MediaService.php

---
 application/wechat/service/MediaService.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/wechat/service/MediaService.php b/application/wechat/service/MediaService.php
index 82a99396e..67b4cf034 100644
--- a/application/wechat/service/MediaService.php
+++ b/application/wechat/service/MediaService.php
@@ -78,7 +78,10 @@ class MediaService
      */
     private static function getServerPath($local)
     {
-        if (file_exists($local)) return new MyCurlFile($local);
-        return new MyCurlFile(File::down($local)['file']);
+        if (file_exists($local)) {
+            return new MyCurlFile($local);
+        } else {
+            return new MyCurlFile(File::down($local)['file']);
+        }
     }
 }