fix: 同步更新代码

app/admin/controller/File.php

@@ -108,11 +108,9 @@ class File extends Controller
      */
     public function distinct()
     {
-        $map = ['uuid' => AdminService::getUserId()];
+        $map = ['issafe' => 0, 'uuid' => AdminService::getUserId()];
-        $db1 = SystemFile::mk()->fieldRaw('max(id) id')->where($map)->group('type,xkey');
+        $subQuery = SystemFile::mk()->fieldRaw('MAX(id) AS id')->where($map)->group('type, xkey')->buildSql();
-        $db2 = $this->app->db->table($db1->buildSql())->alias('dt')->field('id');
+        SystemFile::mk()->where($map)->whereRaw("id NOT IN ({$subQuery})")->delete();
-        SystemFile::mk()->whereRaw("id not in {$db2->buildSql()}")->delete();
-        SystemFile::mk()->where($map)->where(['status' => 1])->delete();
         $this->success('清理重复文件成功！');
     }
 }

app/admin/view/api/icon.html

@@ -5,7 +5,7 @@
     <title>{block name="title"}{$title|default=''}{if !empty($title)} · {/if}{:sysconf('site_name')}{/block}</title>
     <meta name="renderer" content="webkit">
     <meta name="format-detection" content="telephone=no">
-    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="mobile-web-app-capable" content="yes">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1">

app/admin/view/api/upload.js

@@ -24,7 +24,7 @@ define(['md5', 'notify'], function (SparkMD5, Notify, allowMime) {
                 this.option.input = $(this.option.elem.data('input'))
             } else if (this.option.elem.data('field')) {
                 this.option.input = $('input[name="' + this.option.elem.data('field') + '"]:not([type=file])');
-                this.option.elem.data('input', this.option.input.size() > 0 ? this.option.input.get(0) : null);
+                this.option.elem.data('input', this.option.input.length > 0 ? this.option.input.get(0) : null);
             }
 
             /*! 文件选择筛选，使用 MIME 规则过滤文件列表 */

app/admin/view/full.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="renderer" content="webkit">
     <meta name="format-detection" content="telephone=no">
-    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="mobile-web-app-capable" content="yes">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=0.4">

app/admin/view/index/index.html

@@ -6,7 +6,7 @@
     <meta charset="utf-8">
     <meta name="renderer" content="webkit">
     <meta name="format-detection" content="telephone=no">
-    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="mobile-web-app-capable" content="yes">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=0.4">

app/wechat/controller/Config.php

@@ -38,7 +38,6 @@ class Config extends Controller
      */
     public function options()
     {
-        $this->_applyFormToken();
         $this->thrNotify = sysuri('wechat/api.push/index', [], false, true);
         if ($this->request->isGet()) {
             try {
@@ -146,12 +145,15 @@ class Config extends Controller
         if ($this->request->isGet()) {
             $this->title = '微信支付配置';
             $local = LocalStorage::instance();
-            $this->mch_ssl_cer = sysconf('wechat.mch_ssl_cer');
+            $this->data = sysdata('plugin.wechat.payment');
-            $this->mch_ssl_key = sysconf('wechat.mch_ssl_key');
+            $this->mch_ssl_cer = $this->data['mch_ssl_cer'] ?? '';
-            $this->mch_ssl_p12 = sysconf('wechat.mch_ssl_p12');
+            $this->mch_ssl_key = $this->data['mch_ssl_key'] ?? '';
+            $this->mch_ssl_p12 = $this->data['mch_ssl_p12'] ?? '';
+            $this->mch_ssl_pay = $this->data['mch_ssl_pay'] ?? '';
             if (!$local->has($this->mch_ssl_cer, true)) $this->mch_ssl_cer = '';
             if (!$local->has($this->mch_ssl_key, true)) $this->mch_ssl_key = '';
             if (!$local->has($this->mch_ssl_p12, true)) $this->mch_ssl_p12 = '';
+            if (!$local->has($this->mch_ssl_pay, true)) $this->mch_ssl_pay = '';
             $this->fetch();
         } else {
             $this->error('抱歉，数据提交地址错误！');
@@ -168,14 +170,19 @@ class Config extends Controller
         if ($this->request->isPost()) {
             $local = LocalStorage::instance();
             $wechat = $this->request->post('wechat');
+            // if (empty($wechat['mch_pay_sid'])) {
+            //     $this->error('微信支付公钥序号为空！');
+            // }
+            // if (empty($wechat['mch_ssl_pay']) || !$local->has($wechat['mch_ssl_pay'], true)) {
+            //     $this->error('微信支付公钥不能为空！');
+            // }
             // PEM 证书模式处理
             if ($wechat['mch_ssl_type'] === 'pem') {
-                WechatService::withWxpayCert(['mch_id' => $wechat['mch_id']]);
                 if (empty($wechat['mch_ssl_key']) || !$local->has($wechat['mch_ssl_key'], true)) {
-                    $this->error('商户证书 KEY 不能为空！');
+                    $this->error('商户证书密钥不能为空！');
                 }
                 if (empty($wechat['mch_ssl_cer']) || !$local->has($wechat['mch_ssl_cer'], true)) {
-                    $this->error('商户证书 CERT 不能为空！');
+                    $this->error('商户证书公钥不能为空！');
                 }
             }
             // P12 证书模式转 PEM 模式
@@ -183,10 +190,9 @@ class Config extends Controller
                 if (empty($wechat['mch_ssl_p12']) || !$local->has($wechat['mch_ssl_p12'], true)) {
                     $this->error('商户证书 P12 不能为空！');
                 }
-                $content = $local->get($wechat['mch_ssl_p12'], true);
+                if (openssl_pkcs12_read($local->get($wechat['mch_ssl_p12'], true), $certs, $wechat['mch_id'])) {
-                if (openssl_pkcs12_read($content, $certs, $wechat['mch_id'])) {
+                    $name1 = sprintf("wxpay/%s_%s_cer.pem", $wechat['mch_id'], md5($certs['cert']));
-                    $name1 = "wxpay/{$wechat['mch_id']}_cer.pem";
+                    $name2 = sprintf("wxpay/%s_%s_key.pem", $wechat['mch_id'], md5($certs['pkey']));
-                    $name2 = "wxpay/{$wechat['mch_id']}_key.pem";
                     $wechat['mch_ssl_cer'] = $local->set($name1, $certs['cert'], true)['url'];
                     $wechat['mch_ssl_key'] = $local->set($name2, $certs['pkey'], true)['url'];
                     $wechat['mch_ssl_type'] = 'pem';
@@ -200,11 +206,16 @@ class Config extends Controller
                 'mch_id'       => $wechat['mch_id'],
                 'mch_key'      => $wechat['mch_key'],
                 'mch_v3_key'   => $wechat['mch_v3_key'],
-                'ssl_key_text' => $local->get($wechat['mch_ssl_key'], true),
+                'mch_ssl_cer'  => $wechat['mch_ssl_cer'],
+                'mch_ssl_key'  => $wechat['mch_ssl_key'],
+                'mch_ssl_pay'  => $wechat['mch_ssl_pay'],
+                'mch_pay_sid'  => $wechat['mch_pay_sid'] ?? '',
+                'ssl_pay_text' => $local->get($wechat['mch_ssl_pay'], true),
                 'ssl_cer_text' => $local->get($wechat['mch_ssl_cer'], true),
+                'ssl_key_text' => $local->get($wechat['mch_ssl_key'], true),
             ]);
-            // 记录证书路径参数，兼容历史参数
+            // 同步更新证书内容
-            foreach ($wechat as $k => $v) sysconf("wechat.{$k}", $v);
+            WechatService::withWxpayCert(['mch_id' => $wechat['mch_id']]);
             // 记录操作历史并返回保存结果
             sysoplog('微信支付配置', '修改微信支付配置成功');
             $this->success('微信支付配置成功！');

app/wechat/model/WechatAuto.php

@@ -49,10 +49,10 @@ class WechatAuto extends Model
 {
     /**
      * 格式化创建时间
-     * @param string $value
+     * @param mixed $value
      * @return string
      */
-    public function getCreateAtAttr(string $value): string
+    public function getCreateAtAttr($value): string
     {
         return format_datetime($value);
     }

app/wechat/model/WechatKeys.php

@@ -49,10 +49,10 @@ class WechatKeys extends Model
 {
     /**
      * 格式化创建时间
-     * @param string $value
+     * @param mixed $value
      * @return string
      */
-    public function getCreateAtAttr(string $value): string
+    public function getCreateAtAttr($value): string
     {
         return format_datetime($value);
     }

app/wechat/service/PaymentService.php

@@ -82,7 +82,7 @@ class PaymentService
             if ($oPayed + $pAmount > floatval($oAmount)) {
                 return ['code' => 0, 'info' => '支付总额超出！', 'data' => [], 'params' => []];
             }
-            $config = WechatService::getConfig();
+            $config = WechatService::getConfig(true);
             do $pCode = CodeExtend::uniqidNumber(16, 'P');
             while (WechatPaymentRecord::mk()->master()->where(['code' => $pCode])->findOrEmpty()->isExists());
             $data = [
@@ -148,9 +148,15 @@ class PaymentService
     public static function notify(?array $data = null): Response
     {
         try {
-            $notify = static::withPayment()->notify();
+            p(Library::$sapp->request->post(), false, 'wechat_pay_notify');
+            $notify = static::withPayment()->notify(Library::$sapp->request->post());
             $result = empty($notify['result']) ? [] : json_decode($notify['result'], true);
-            if (empty($result) || !is_array($result)) return response('error', 500);
+            p($result, false, 'wechat_pay_notify');
+            p('------------------', false, 'wechat_pay_notify');
+            if (empty($result) || !is_array($result)) {
+                empty($data['order']) || self::query($data['order']);
+                return response('error', 500);
+            }
             //订单支付通知处理
             if ($data['scen'] === 'order' && isset($result['trade_state']) && $result['trade_state'] == 'SUCCESS') {
                 if ($data['order'] !== $result['out_trade_no']) return response('error', 500);
@@ -181,6 +187,7 @@ class PaymentService
             }
             return response('success');
         } catch (\Exception $exception) {
+            empty($data['order']) || self::query($data['order']);
             return json(['code' => 'FAIL', 'message' => $exception->getMessage()])->code(500);
         }
     }
@@ -321,7 +328,7 @@ class PaymentService
      */
     protected static function withPayment(?array $config = null): Order
     {
-        return Order::instance($config ?: WechatService::getConfig());
+        return Order::instance($config ?: WechatService::getConfig(true));
     }
 
     /**

app/wechat/service/WechatService.php

@@ -178,27 +178,25 @@ class WechatService extends Service
 
     /**
      * 获取公众号配置参数
-     * @param string $appid
+     * @param boolean $ispay 获取支付参数
      * @return array
      * @throws \think\admin\Exception
      */
-    public static function getConfig(string $appid = ''): array
+    public static function getConfig(bool $ispay = false): array
     {
-        return static::withWxpayCert([
+        $config = [
-            'appid'          => $appid ?: static::getAppid(),
+            'appid'          => static::getAppid(),
             'token'          => sysconf('wechat.token'),
             'appsecret'      => sysconf('wechat.appsecret'),
             'encodingaeskey' => sysconf('wechat.encodingaeskey'),
-            'mch_id'         => sysconf('wechat.mch_id'),
-            'mch_key'        => sysconf('wechat.mch_key'),
-            'mch_v3_key'     => sysconf('wechat.mch_v3_key'),
             'cache_path'     => syspath('runtime/wechat'),
-        ]);
+        ];
+        return $ispay ? static::withWxpayCert($config) : $config;
     }
 
     /**
      * 获取小程序配置参数
-     * @param boolean $ispay 支付参数
+     * @param boolean $ispay 获取支付参数
      * @return array
      * @throws \think\admin\Exception
      */
@@ -210,11 +208,7 @@ class WechatService extends Service
             'appsecret'  => $wxapp['appkey'] ?? '',
             'cache_path' => syspath('runtime/wechat'),
         ];
-        return $ispay ? static::withWxpayCert(array_merge([
+        return $ispay ? static::withWxpayCert($config) : $config;
-            'mch_id'     => sysconf('wechat.mch_id'),
-            'mch_key'    => sysconf('wechat.mch_key'),
-            'mch_v3_key' => sysconf('wechat.mch_v3_key'),
-        ], $config)) : $config;
     }
 
     /**
@@ -226,32 +220,29 @@ class WechatService extends Service
     public static function withWxpayCert(array $options): array
     {
         // 文本模式主要是为了解决分布式部署
+        $data = sysdata('plugin.wechat.payment');
+        if (empty($data['mch_id'])) {
+            throw new Exception('无效的支付配置！');
+        }
+        $name1 = sprintf("wxpay/%s_%s_cer.pem", $data['mch_id'], md5($data['ssl_cer_text']));
+        $name2 = sprintf("wxpay/%s_%s_key.pem", $data['mch_id'], md5($data['ssl_key_text']));
         $local = LocalStorage::instance();
-        $name1 = "wxpay/{$options['mch_id']}_cer.pem";
-        $name2 = "wxpay/{$options['mch_id']}_key.pem";
         if ($local->has($name1, true) && $local->has($name2, true)) {
             $sslCer = $local->path($name1, true);
             $sslKey = $local->path($name2, true);
+        } else {
+            $sslCer = $local->set($name1, $data['ssl_cer_text'], true)['file'];
+            $sslKey = $local->set($name2, $data['ssl_key_text'], true)['file'];
         }
-        if (empty($sslCer) || empty($sslKey)) {
+        $options['mch_id'] = $data['mch_id'];
-            if (!empty($data = sysdata('plugin.wechat.payment'))) {
+        $options['mch_key'] = $data['mch_key'];
-                if (!empty($data['ssl_key_text']) && !empty($data['ssl_cer_text'])) {
+        $options['mch_v3_key'] = $data['mch_v3_key'];
-                    $sslCer = $local->set($name1, $data['ssl_cer_text'], true)['file'];
+        $options['ssl_cer'] = $sslCer;
-                    $sslKey = $local->set($name2, $data['ssl_key_text'], true)['file'];
+        $options['ssl_key'] = $sslKey;
-                }
+        $options['cert_public'] = $sslCer;
-            } else {
+        $options['cert_private'] = $sslKey;
-                $sslCer = $local->path(sysconf('wechat.mch_ssl_cer'), true);
+        $options['mp_cert_serial'] = $data['mch_pay_sid'] ?? '';
-                $sslKey = $local->path(sysconf('wechat.mch_ssl_key'), true);
+        $options['mp_cert_content'] = $data['ssl_pay_text'] ?? '';
-                if (!$local->has($sslCer, true)) unset($sslCer);
-                if (!$local->has($sslKey, true)) unset($sslKey);
-            }
-        }
-        if (isset($sslCer) && isset($sslKey)) {
-            $options['ssl_cer'] = $sslCer;
-            $options['ssl_key'] = $sslKey;
-            $options['cert_public'] = $sslCer;
-            $options['cert_private'] = $sslKey;
-        }
         return $options;
     }
 

app/wechat/view/api/view/main.html

@@ -6,7 +6,7 @@
     {block name='title'}{/block}
     <meta name="renderer" content="webkit">
     <meta name="format-detection" content="telephone=no">
-    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="mobile-web-app-capable" content="yes">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no">

app/wechat/view/config/options.html

@@ -37,7 +37,7 @@
 
         function apply(data) {
             this.$active = $("[data-wechat-type='" + data.value + "']").trigger('click');
-            if (this.$active.size() < 1) $("[data-wechat-type]:first").trigger('click');
+            if (this.$active.length < 1) $("[data-wechat-type]:first").trigger('click');
             $('[data-type="' + data.value + '"]').show().siblings('[data-type]').hide();
         }
     });

app/wechat/view/config/payment.html

@@ -17,22 +17,43 @@
 
         <label class="layui-form-item relative block">
             <span class="help-label"><b>微信商户账号</b>MCH_ID</span>
-            <input name="wechat.mch_id" required vali-name="微信商户号" placeholder="请输入微信商户账号（必填）" value="{:sysconf('wechat.mch_id')}" class="layui-input">
+            <input name="wechat.mch_id" required vali-name="微信商户号" placeholder="请输入微信商户账号（必填）" value="{$data.mch_id|default=''}" class="layui-input">
-            <span class="help-block">微信商户账号，需要在微信商户平台获取，MCH_ID 与 APPID 匹配</span>
+            <span class="help-block">微信商户账号，需要在微信商户平台获取</span>
+        </label>
+
+        <label class="layui-form-item relative layui-hide">
+            <span class="help-label"><b>微信 V2 接口密钥</b>MCH_KEY</span>
+            <input name="wechat.mch_key" vali-name="微信商户V2密钥" type="password" lay-affix="eye" placeholder="请输入微信商户V2密钥（必填）" maxlength="32" pattern=".{32}" required value="{$data.mch_key|default=''}" class="layui-input">
+            <span class="help-block">微信商户 V2 密钥，需要在微信商户平台获取商户接口密钥</span>
         </label>
 
         <label class="layui-form-item relative block">
-            <span class="help-label"><b>微信商户 V2 密钥</b>MCH_KEY</span>
+            <span class="help-label"><b>微信 V3 接口密钥</b>MCH_V3_KEY</span>
-            <input name="wechat.mch_key" vali-name="微信商户V2密钥" placeholder="请输入微信商户V2密钥（必填）" maxlength="32" pattern=".{32}" required value="{:sysconf('wechat.mch_key')}" class="layui-input">
+            <input name="wechat.mch_v3_key" vali-name="微信商户V3密钥" type="password" lay-affix="eye" placeholder="请输入微信商户V3密钥（必填）" maxlength="32" pattern=".{32}" required value="{$data.mch_v3_key|default=''}" class="layui-input">
-            <span class="help-block">微信商户 V2 密钥，需要在微信商户平台操作设置操作密码并获取商户接口密钥</span>
+            <span class="help-block">微信商户 V3 密钥，需要在微信商户平台获取商户接口密钥</span>
         </label>
 
+        <div class="hr-line-dashed"></div>
+
         <label class="layui-form-item relative block">
-            <span class="help-label"><b>微信商户 V3 密钥</b>MCH_V3_KEY</span>
+            <span class="help-label"><b>微信 V3 支付公钥ID</b>MCH_V3_PAYID</span>
-            <input name="wechat.mch_v3_key" vali-name="微信商户V3密钥" placeholder="请输入微信商户V3密钥（必填）" maxlength="32" pattern=".{32}" required value="{:sysconf('wechat.mch_v3_key')}" class="layui-input">
+            <input name="wechat.mch_pay_sid" vali-name="微信商户V3支付公钥ID" placeholder="请输入微信商户V3支付公钥ID（必填）" maxlength="45" pattern="PUB_KEY_ID_.{34}" value="{$data.mch_pay_sid|default=''}" class="layui-input">
-            <span class="help-block">微信商户 V3 密钥，需要在微信商户平台操作设置操作密码并获取商户接口密钥</span>
+            <span class="help-block">微信商户 V3 支付证书ID，需要在微信商户平台操作设置操作密码并获取商户接口密钥</span>
         </label>
 
+        <div class="layui-form-item">
+            <span class="help-label label-required-prev"><b>微信 V3 支付公钥文件</b>MCH_V3_PAYCERT</span>
+            <div class="margin-top-10">
+                <div data-mch-type="pem" class="layui-tab-item">
+                    <input type="hidden" name="wechat.mch_ssl_pay" value="{$mch_ssl_pay|default=''}">
+                    <button data-file="btn" data-uptype="local" data-safe="true" data-type="pem" data-field="wechat.mch_ssl_pay" type="button" class="layui-btn font-code layui-btn-primary">
+                        <i class="layui-icon layui-icon-vercode"></i> 上传微信支付公钥
+                    </button>
+                    <a class="layui-btn layui-btn-danger layui-btn-primary ta-ml-5" onclick="$(this).prevAll('input').val('').trigger('change')"><i class="layui-icon layui-icon-close"></i></a>
+                </div>
+            </div>
+        </div>
+
         <div class="hr-line-dashed"></div>
 
         <div class="layui-form-item">
@@ -49,23 +70,30 @@
                     <div data-mch-type="p12" class="layui-tab-item">
                         <input name="wechat.mch_ssl_p12" value="{$mch_ssl_p12|default=''}" type="hidden">
                         <button data-file="btn" data-uptype="local" data-safe="true" data-type="p12" data-field="wechat.mch_ssl_p12" type="button" class="layui-btn font-code layui-btn-primary">
-                            <i class="layui-icon layui-icon-vercode"></i> 上传 P12 证书
+                            <i class="layui-icon layui-icon-vercode"></i> 上传商户P12证书
                         </button>
+                        <a class="layui-btn layui-btn-danger layui-btn-primary ta-ml-5" onclick="$(this).prevAll('input').val('').trigger('change')"><i class="layui-icon layui-icon-close"></i></a>
                     </div>
-
+                    <div data-mch-type="pem" class="layui-tab-item flex">
-                    <div data-mch-type="pem" class="layui-tab-item">
+                        <div>
-                        <input type="hidden" name="wechat.mch_ssl_key" value="{$mch_ssl_key|default=''}">
+                            <input type="hidden" name="wechat.mch_ssl_key" value="{$mch_ssl_key|default=''}">
-                        <button data-file="btn" data-uptype="local" data-safe="true" data-type="pem" data-field="wechat.mch_ssl_key" type="button" class="layui-btn font-code layui-btn-primary margin-right-10">
+                            <button data-file="btn" data-uptype="local" data-safe="true" data-type="pem" data-field="wechat.mch_ssl_key" type="button" class="layui-btn font-code layui-btn-primary">
-                            <i class="layui-icon layui-icon-vercode"></i> 上传 KEY 证书
+                                <i class="layui-icon layui-icon-vercode"></i> 上传商户证书密钥
-                        </button>
+                            </button>
-                        <input type="hidden" name="wechat.mch_ssl_cer" value="{$mch_ssl_cer|default=''}">
+                            <a class="layui-btn layui-btn-danger layui-btn-primary ta-ml-5" onclick="$(this).prevAll('input').val('').trigger('change')"><i class="layui-icon layui-icon-close"></i></a>
-                        <button data-file="btn" data-uptype="local" data-safe="true" data-type="pem" data-field="wechat.mch_ssl_cer" type="button" class="layui-btn font-code layui-btn-primary">
+                        </div>
-                            <i class="layui-icon layui-icon-vercode"></i> 上传 CERT 证书
+                        <div class="ta-ml-20">
-                        </button>
+                            <input type="hidden" name="wechat.mch_ssl_cer" value="{$mch_ssl_cer|default=''}">
+                            <button data-file="btn" data-uptype="local" data-safe="true" data-type="pem" data-field="wechat.mch_ssl_cer" type="button" class="layui-btn font-code layui-btn-primary">
+                                <i class="layui-icon layui-icon-vercode"></i> 上传商户证书公钥
+                            </button>
+                            <a class="layui-btn layui-btn-danger layui-btn-primary ta-ml-5" onclick="$(this).prevAll('input').val('').trigger('change')"><i class="layui-icon layui-icon-close"></i></a>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
+
         <!--{if auth('payment_save')}-->
         <div class="hr-line-dashed margin-top-30"></div>
         <div class="layui-form-item text-center">
@@ -81,7 +109,7 @@
     (function (type) {
         layui.form.val('payment', {'wechat.mch_ssl_type': type});
         layui.form.on('radio(data-mch-type)', apply) && apply({value: type});
-        ['wechat.mch_ssl_p12', 'wechat.mch_ssl_key', 'wechat.mch_ssl_cer'].forEach(function (type) {
+        ['wechat.mch_ssl_p12', 'wechat.mch_ssl_key', 'wechat.mch_ssl_cer', 'wechat.mch_ssl_pay'].forEach(function (type) {
             $('input[name="' + type + '"]').on('change', function () {
                 let that = this, $button = $(this).next('button');
                 if (typeof that.value === 'string' && that.value.length > 5) {
@@ -95,6 +123,6 @@
         function apply(data) {
             return $('[data-mch-type="' + data.value + '"]').show().siblings('[data-mch-type]').hide();
         }
-    })("{:sysconf('wechat.mch_ssl_type')}" || 'pem');
+    })("{$data.mch_ssl_type|default='pem'}");
 </script>
 {/block}

app/wechat/view/full.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="renderer" content="webkit">
     <meta name="format-detection" content="telephone=no">
-    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="mobile-web-app-capable" content="yes">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=0.4">

public/static/admin.js

@@ -24,6 +24,7 @@ window.form = layui.form, window.layer = layui.layer;
 window.laytpl = layui.laytpl, window.laydate = layui.laydate;
 window.jQuery = window.$ = window.jQuery || window.$ || layui.$;
 window.jQuery.ajaxSetup({xhrFields: {withCredentials: true}});
+window.jQuery.fn.size || (window.jQuery.fn.size = () => this.length);
 
 /*! 配置 require 参数  */
 require.config({
@@ -182,7 +183,7 @@ $(function () {
         /*! 关闭顶层最新窗口 */
         this.closeLastModal = function () {
             while ($.msg.mdx.length > 0 && (this.tdx = $.msg.mdx.pop()) > 0) {
-                if ($('#layui-layer' + this.tdx).size()) return layer.close(this.tdx);
+                if ($('#layui-layer' + this.tdx).length) return layer.close(this.tdx);
             }
         };
         /*! 关闭消息框 */
@@ -404,15 +405,15 @@ $(function () {
         this.queryNode = function (uri, node) {
             // 如果该节点存在直接返回 Node 值
             if (/^m-/.test(node = node || location.href.replace(/.*spm=([\d\-m]+).*/ig, '$1'))) {
-                if ($('[data-menu-node="' + node + '"]').size()) return node;
+                if ($('[data-menu-node="' + node + '"]').length) return node;
             }
             let path = uri.replace(/\.html$/ig, '');
             // 尝试通过 URI 查询节点值
             let $menu = $('[data-menu-node][data-open*="' + path + '"]');
-            if ($menu.size()) return $menu.get(0).dataset.menuNode;
+            if ($menu.length) return $menu.get(0).dataset.menuNode;
             // 尝试通过 URL 查询节点值
             $menu = $('[data-menu-node][data-open~="#' + path + '"]');
-            return $menu.size() ? $menu.get(0).dataset.menuNode : (/^m-/.test(node || '') ? node : '');
+            return $menu.length ? $menu.get(0).dataset.menuNode : (/^m-/.test(node || '') ? node : '');
         };
         /*! 完整 URL 转 URI 地址 */
         this.parseUri = function (uri, elem, vars, temp, attrs) {
@@ -665,10 +666,10 @@ $(function () {
             // 默认动态设置页数, 动态设置最大高度
             if (option.page === true) option.page = {curr: layui.sessionData('pages')[option.id] || 1};
             if (option.width === 'full') option.width = $table.parent().width();
-            if (option.height === 'full') if ($table.parents('.iframe-pagination').size()) {
+            if (option.height === 'full') if ($table.parents('.iframe-pagination').length) {
                 $table.parents('.iframe-pagination').addClass('not-footer');
                 option.height = $(window).height() - $table.removeClass('layui-hide').offset().top - 20;
-            } else if ($table.parents('.laytable-pagination').size()) {
+            } else if ($table.parents('.laytable-pagination').length) {
                 option.height = $table.parents('.laytable-pagination').height() - $table.removeClass('layui-hide').position().top - 20;
             } else {
                 option.height = $(window).height() - $table.removeClass('layui-hide').offset().top - 35;
@@ -814,7 +815,7 @@ $(function () {
                 let type = form.getAttribute('method') || 'POST', href = form.getAttribute('action') || location.href;
                 let dset = form.dataset, tips = dset.tips || undefined, time = dset.time || undefined, taid = dset.tableId || false;
                 let call = window[dset.callable || '_default_callable'] || (taid ? function (ret) {
-                    if (typeof ret === 'object' && ret.code > 0 && $('#' + taid).size() > 0) {
+                    if (typeof ret === 'object' && ret.code > 0 && $('#' + taid).length > 0) {
                         return $.msg.success(ret.info, 3, function () {
                             $.msg.closeLastModal();
                             (typeof ret.data === 'string' && ret.data) ? $.form.goto(ret.data) : $.layTable.reload(taid);
@@ -853,7 +854,7 @@ $(function () {
         /*! 查找表单元素, 如果没有找到将不会自动写值 */
         if (!(this.$elem = $(this)).data('input') && this.$elem.data('field')) {
             let $input = $('input[name="' + this.$elem.data('field') + '"]:not([type=file])');
-            this.$elem.data('input', $input.size() > 0 ? $input.get(0) : null);
+            this.$elem.data('input', $input.length > 0 ? $input.get(0) : null);
         }
         // 单图或多图选择器 ( image|images )
         if (typeof this.dataset.file === 'string' && /^images?$/.test(this.dataset.file)) {

public/static/plugs/admin/excel.js

@@ -20,12 +20,13 @@ define(function () {
     }
 
     /*! 默认导出配置 */
-    Excel.prototype.options = {writeOpt: {bookSST: true}};
+    Excel.prototype.options = {writeOpt: {bookSST: false}};
 
     /*! 导出 Excel 文件 */
     Excel.prototype.export = function (data, name, options) {
+        name = name || '数据导出_' + layui.util.toDateString(Date.now(), '_yyyyMMdd_HHmmss');
         if (name.substring(0, -5).toLowerCase() !== '.xlsx') name += '.xlsx';
-        layui.excel.exportExcel(data, name, 'xlsx', options || this.options || {writeOpt: {bookSST: true}});
+        layui.excel.exportExcel(data, name, 'xlsx', $.extend(options || {}, this.options));
     };
 
     /*! 绑定导出的事件 */
@@ -40,23 +41,28 @@ define(function () {
     // </script>
     Excel.prototype.bind = function (done, filename, selector, options) {
         let that = this;
-        this.options = options || {}
+        this.options = $.extend(this.options, options || {});
+        this.bindLoadDone(function (data, button) {
+            that.export(done.call(that, data, []), button.dataset.filename || filename);
+        }, selector);
+    };
+
+    /*! 加载所有数据 */
+    Excel.prototype.bindLoadDone = function (done, selector) {
+        let that = this;
         $('body').off('click', selector || '[data-form-export]').on('click', selector || '[data-form-export]', function () {
-            let form = $(this).parents('form');
+            let button = this, form = $(this).parents('form');
-            let name = this.dataset.filename || filename;
             let method = this.dataset.method || form.attr('method') || 'get';
             let location = this.dataset.excel || this.dataset.formExport || form.attr('action') || '';
             let sortType = $(this).attr('data-sort-type') || '', sortField = $(this).attr('data-sort-field') || '';
             if (sortField.length > 0 && sortType.length > 0) {
                 location += (location.indexOf('?') > -1 ? '&' : '?') + '_order_=' + sortType + '&_field_=' + sortField;
             }
-            that.load(location, form.serialize(), method).then(function (data) {
+            that.load(location, form.serialize(), method).then((data) => done.call(that, data, button)).fail(function (ret) {
-                that.export(done.call(that, data, []), name);
+                $.msg.tips(ret || '数据加载失败');
-            }).fail(function (ret) {
-                $.msg.tips(ret || '文件导出失败');
             });
         });
-    };
+    }
 
     /*! 加载导出的文档 */
     Excel.prototype.load = function (url, data, method) {

public/static/plugs/admin/validate.js

@@ -81,12 +81,13 @@ define(function () {
         };
         this.insertError = function ($el) {
             return (function ($icon) {
+                console.log($icon)
                 return $el.data('vali-tags').css({
                     top: $el.position().top + 'px', right: (($icon ? $icon.width() + parseFloat($icon.css('right') || 0) : 0) + 10) + 'px',
                     paddingTop: $el.css('marginTop'), lineHeight: ($el.get(0).nodeName || '') === 'TEXTAREA' ? '32px' : $el.css('height'),
                 });
             })($el.nextAll('.input-right-icon'), $el.data('vali-tags') || function () {
-                let css = 'display:block;position:absolute;text-align:center;color:#c44;font-size:12px;z-index:2';
+                let css = 'display:block;position:absolute;text-align:center;color:#c44;font-size:12px;z-index:2;right:8px';
                 $el.data('vali-tags', $('<span class="layui-anim notselect" style="' + css + '"></span>').insertAfter($el));
             }());
         };