Merge branch 'master' into v5

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()
     {

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()
     {

application/store/view/config/index-store-message1.html

@@ -41,6 +41,5 @@
             <button class="layui-btn" type="submit">保存配置</button>
         </div>
 
-
     </div>
 </form>

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">
@@ -41,6 +41,5 @@
             <button class="layui-btn" type="submit">保存配置</button>
         </div>
 
-
     </div>
 </form>

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']);
+        }
     }
 }

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',