同步更新插件代码

app/wechat/Service.php

@@ -14,9 +14,12 @@
 // | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
 // +----------------------------------------------------------------------
 
+declare (strict_types=1);
+
 namespace app\wechat;
 
 use app\wechat\command\Auto;
+use app\wechat\command\Clear;
 use app\wechat\command\Fans;
 use app\wechat\service\AutoService;
 use app\wechat\service\PaymentService;
@@ -50,7 +53,7 @@ class Service extends Plugin
     public function register(): void
     {
         // 注册模块指令
-        $this->commands([Fans::class, Auto::class]);
+        $this->commands([Fans::class, Auto::class, Clear::class]);
 
         // 注册粉丝关注事件
         $this->app->event->listen('WechatFansSubscribe', function ($openid) {
@@ -74,30 +77,31 @@ class Service extends Plugin
      */
     public static function menu(): array
     {
+        $code = app(static::class)->appCode;
         // 设置插件菜单
         return [
             [
                 'name' => '微信管理',
                 'subs' => [
-                    ['name' => '微信接口配置', 'icon' => 'layui-icon layui-icon-set', 'node' => "wechat/config/options"],
+                    ['name' => '微信接口配置', 'icon' => 'layui-icon layui-icon-set', 'node' => "{$code}/config/options"],
-                    ['name' => '微信支付配置', 'icon' => 'layui-icon layui-icon-rmb', 'node' => "wechat/config/payment"],
+                    ['name' => '微信支付配置', 'icon' => 'layui-icon layui-icon-rmb', 'node' => "{$code}/config/payment"],
                 ],
             ],
             [
                 'name' => '微信定制',
                 'subs' => [
-                    ['name' => '微信粉丝管理', 'icon' => 'layui-icon layui-icon-username', 'node' => "wechat/fans/index"],
+                    ['name' => '微信粉丝管理', 'icon' => 'layui-icon layui-icon-username', 'node' => "{$code}/fans/index"],
-                    ['name' => '微信图文管理', 'icon' => 'layui-icon layui-icon-template-1', 'node' => "wechat/news/index"],
+                    ['name' => '微信图文管理', 'icon' => 'layui-icon layui-icon-template-1', 'node' => "{$code}/news/index"],
-                    ['name' => '微信菜单配置', 'icon' => 'layui-icon layui-icon-cellphone', 'node' => "wechat/menu/index"],
+                    ['name' => '微信菜单配置', 'icon' => 'layui-icon layui-icon-cellphone', 'node' => "{$code}/menu/index"],
-                    ['name' => '回复规则管理', 'icon' => 'layui-icon layui-icon-engine', 'node' => "wechat/keys/index"],
+                    ['name' => '回复规则管理', 'icon' => 'layui-icon layui-icon-engine', 'node' => "{$code}/keys/index"],
-                    ['name' => '关注自动回复', 'icon' => 'layui-icon layui-icon-release', 'node' => "wechat/auto/index"],
+                    ['name' => '关注自动回复', 'icon' => 'layui-icon layui-icon-release', 'node' => "{$code}/auto/index"],
                 ],
             ],
             [
                 'name' => '微信支付',
                 'subs' => [
-                    ['name' => '微信支付行为', 'icon' => 'layui-icon layui-icon-rmb', 'node' => "wechat/payment.record/index"],
+                    ['name' => '微信支付行为', 'icon' => 'layui-icon layui-icon-rmb', 'node' => "{$code}/payment.record/index"],
-                    ['name' => '微信退款管理', 'icon' => 'layui-icon layui-icon-engine', 'node' => "wechat/payment.refund/index"],
+                    ['name' => '微信退款管理', 'icon' => 'layui-icon layui-icon-engine', 'node' => "{$code}/payment.refund/index"],
                 ]
             ]
         ];

app/wechat/command/Auto.php

@@ -14,6 +14,8 @@
 // | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
 // +----------------------------------------------------------------------
 
+declare (strict_types=1);
+
 namespace app\wechat\command;
 
 use app\wechat\model\WechatAuto;

app/wechat/command/Clear.php

@@ -0,0 +1,60 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | Wechat Plugin for ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// +----------------------------------------------------------------------
+// | 官方网站: https://thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// | 免责声明 ( https://thinkadmin.top/disclaimer )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat
+// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
+// +----------------------------------------------------------------------
+
+declare (strict_types=1);
+
+namespace app\wechat\command;
+
+use app\wechat\model\WechatPaymentRecord;
+use think\admin\Command;
+use think\console\Input;
+use think\console\Output;
+
+/**
+ * 微信支付单清理任务
+ * @class Clear
+ * @package app\wechat\command
+ */
+class Clear extends Command
+{
+    protected function configure()
+    {
+        $this->setName('xadmin:fanspay');
+        $this->setDescription('Wechat Users Payment auto clear for ThinkAdmin');
+    }
+
+    /**
+     * 执行支付单清理任务
+     * @param \think\console\Input $input
+     * @param \think\console\Output $output
+     * @throws \think\admin\Exception
+     * @throws \think\db\exception\DbException
+     */
+    protected function execute(Input $input, Output $output)
+    {
+        $query = WechatPaymentRecord::mq();
+        $query->where(['payment_status' => 0]);
+        $query->whereTime('create_time', '<', strtotime('-24 hours'));
+        [$total, $count] = [(clone $query)->count(), 0];
+        if (empty($total)) $this->setQueueSuccess("没有需要清理的24小时未支付数据！");
+        /** @var \think\Model $item */
+        foreach ($query->cursor() as $item) {
+            $this->setQueueMessage($total, ++$count, "开始清理 {$item->getAttr('code')} 支付单...");
+            $item->delete();
+            $this->setQueueMessage($total, $count, "完成清理 {$item->getAttr('code')} 支付单!!!", 1);
+        }
+    }
+}

app/wechat/command/Fans.php

@@ -14,6 +14,8 @@
 // | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
 // +----------------------------------------------------------------------
 
+declare (strict_types=1);
+
 namespace app\wechat\command;
 
 use app\wechat\model\WechatFans;
@@ -43,9 +45,6 @@ class Fans extends Command
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      * @throws \think\admin\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function handle()
     {

app/wechat/controller/Auto.php

@@ -14,6 +14,8 @@
 // | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
 // +----------------------------------------------------------------------
 
+declare (strict_types=1);
+
 namespace app\wechat\controller;
 
 use app\wechat\model\WechatAuto;

app/wechat/controller/Config.php

@@ -19,7 +19,6 @@ namespace app\wechat\controller;
 use app\wechat\service\WechatService;
 use think\admin\Builder;
 use think\admin\Controller;
-use think\admin\Storage;
 use think\admin\storage\LocalStorage;
 
 /**
@@ -145,7 +144,9 @@ class Config extends Controller
         if ($this->request->isPost()) {
             $local = LocalStorage::instance();
             $wechat = $this->request->post('wechat');
+            // 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 不能为空！');
                 }
@@ -153,20 +154,24 @@ class Config extends Controller
                     $this->error('商户证书 CERT 不能为空！');
                 }
             }
+            // P12 证书模式转 PEM 模式
             if ($wechat['mch_ssl_type'] === 'p12') {
                 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($content, $certs, $wechat['mch_id'])) {
-                    $wechat['mch_ssl_key'] = $local->set(Storage::name($certs['pkey'], 'pem'), $certs['pkey'], true)['url'];
+                    $name1 = "wxpay/{$wechat['mch_id']}_cer.pem";
-                    $wechat['mch_ssl_cer'] = $local->set(Storage::name($certs['cert'], 'pem'), $certs['cert'], true)['url'];
+                    $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';
                 } else {
                     $this->error('商户账号与 P12 证书不匹配！');
                 }
             }
             // 记录文本格式参数，兼容分布式部署
-            sysdata('plugin.wechat.payment.config', [
+            sysdata('plugin.wechat.payment', [
                 'appid'        => WechatService::getAppid(),
                 'mch_id'       => $wechat['mch_id'],
                 'mch_key'      => $wechat['mch_key'],
@@ -177,7 +182,7 @@ class Config extends Controller
             // 记录证书路径参数，兼容历史参数
             foreach ($wechat as $k => $v) sysconf("wechat.{$k}", $v);
             // 记录操作历史并返回保存结果
-            sysoplog('微信授权配置', '修改微信支付配置成功');
+            sysoplog('微信支付配置', '修改微信支付配置成功');
             $this->success('微信支付配置成功！');
         } else {
             $this->error('抱歉，访问方式错误！');

app/wechat/controller/payment/Record.php

@@ -14,6 +14,8 @@
 // | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
 // +----------------------------------------------------------------------
 
+declare (strict_types=1);
+
 namespace app\wechat\controller\payment;
 
 use app\wechat\model\WechatFans;
@@ -73,4 +75,15 @@ class Record extends Controller
             $this->error($exception->getMessage());
         }
     }
+
+    /**
+     * 清理未支付数据
+     * @auth true
+     * @return void
+     */
+    public function clear()
+    {
+        sysoplog('微信支付清理', '创建粉丝未支付数据清理任务');
+        $this->_queue('清理微信未支付数据', "xadmin:fanspay", 0, [], 0, 600);
+    }
 }

app/wechat/controller/payment/Refund.php

@@ -14,6 +14,8 @@
 // | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
 // +----------------------------------------------------------------------
 
+declare (strict_types=1);
+
 namespace app\wechat\controller\payment;
 
 use app\wechat\model\WechatFans;

app/wechat/service/FansService.php

@@ -40,7 +40,7 @@ class FansService extends Service
             $user['subscribe_at'] = date('Y-m-d H:i:s', $user['subscribe_time']);
         }
         if (isset($user['tagid_list']) && is_array($user['tagid_list'])) {
-            $user['tagid_list'] = arr2str($user['tagid_list'] ?? []);
+            $user['tagid_list'] = arr2str($user['tagid_list']);
         }
         if ($appid !== '') $user['appid'] = $appid;
         unset($user['privilege'], $user['groupid']);

app/wechat/service/PaymentService.php

@@ -74,17 +74,17 @@ class PaymentService
     {
         try {
             // 检查订单是否完成
-            if (self::isPayed($oCode, $oAmount)) {
+            if (self::isPayed($oCode, $oAmount, $oPayed)) {
                 return ['code' => 1, 'info' => '已完成支付！', 'data' => [], 'params' => []];
             }
             // 检查剩余支付金额
-            $leave = self::leave($oCode);
+            $pAmount = floatval(is_null($pAmount) ? (floatval($oAmount) - $oPayed) : $pAmount);
-            $pAmount = floatval(is_null($pAmount) ? (floatval($oAmount) - $leave) : $pAmount);
+            if ($oPayed + $pAmount > floatval($oAmount)) {
-            if ($leave + $pAmount > floatval($oAmount)) {
                 return ['code' => 0, 'info' => '支付总额超出！', 'data' => [], 'params' => []];
             }
             $config = WechatService::getConfig();
-            $pCode = CodeExtend::uniqidNumber(16, 'P');
+            do $pCode = CodeExtend::uniqidNumber(16, 'P');
+            while (WechatPaymentRecord::mk()->where(['code' => $pCode])->findOrEmpty()->isExists());
             $data = [
                 'appid'        => $config['appid'],
                 'mchid'        => $config['mch_id'],
@@ -291,22 +291,24 @@ class PaymentService
      * 判断是否完成支付
      * @param string $oCode 原订单单号
      * @param string $oAmount 需支付金额
+     * @param ?float $oPayed 已支付金额[赋值]
      * @return boolean
      */
-    public static function isPayed(string $oCode, string $oAmount): bool
+    public static function isPayed(string $oCode, string $oAmount, ?float &$oPayed = null): bool
     {
-        return self::leave($oCode) >= $oAmount;
+        return self::withPayed($oCode, $oPayed) >= $oAmount;
     }
 
     /**
      * 获取已支付金额
-     * @param string $oCode
+     * @param string $oCode 原订单单号
+     * @param ?float $oPayed 已支付金额[赋值]
      * @return float
      */
-    public static function leave(string $oCode): float
+    public static function withPayed(string $oCode, ?float &$oPayed = null): float
     {
         $where = ['order_code' => $oCode, 'payment_status' => 1];
-        return WechatPaymentRecord::mk()->where($where)->sum('payment_amount');
+        return $oPayed = WechatPaymentRecord::mk()->where($where)->sum('payment_amount');
     }
 
     /**
@@ -351,12 +353,11 @@ class PaymentService
     protected static function createPaymentAction(string $openid, string $oCode, string $oName, string $oAmount, string $pType, string $pCode, string $pAmount): array
     {
         // 检查是否已经支付
-        $leave = static::leave($oCode);
+        if (static::withPayed($oCode, $oPayed) >= floatval($oAmount)) {
-        if ($leave >= floatval($oAmount)) {
             throw new Exception("订单 {$oCode} 已经完成支付！", 1);
         }
-        if ($leave + floatval($pAmount) > floatval($oAmount)) {
+        if ($oPayed + floatval($pAmount) > floatval($oAmount)) {
-            throw new Exception('总支付金额大于订单金额！', 0);
+            throw new Exception('总支付大于订单金额！', 0);
         }
         $map = ['order_code' => $oCode, 'payment_status' => 1];
         $model = WechatPaymentRecord::mk()->where($map)->findOrEmpty();

app/wechat/service/WechatService.php

@@ -20,7 +20,6 @@ use think\admin\Exception;
 use think\admin\extend\JsonRpcClient;
 use think\admin\Library;
 use think\admin\Service;
-use think\admin\Storage;
 use think\admin\storage\LocalStorage;
 use think\exception\HttpResponseException;
 
@@ -172,7 +171,7 @@ class WechatService extends Service
      */
     public static function getConfig(): array
     {
-        $options = [
+        $config = [
             'appid'          => static::getAppid(),
             'token'          => sysconf('wechat.token'),
             'appsecret'      => sysconf('wechat.appsecret'),
@@ -182,19 +181,11 @@ class WechatService extends Service
             'mch_v3_key'     => sysconf('wechat.mch_v3_key'),
             'cache_path'     => syspath('runtime/wechat'),
         ];
-        if (in_array($sslType = strtolower(sysconf('wechat.mch_ssl_type')), ['p12', 'pem'])) {
+
-            [$local = LocalStorage::instance(), $options = static::withWxpayCert($options)];
+
-            if ((empty($options['ssl_cer']) || empty($options['ssl_key'])) && $sslType === 'p12') {
+        return static::withWxpayCert($config);
-                if (openssl_pkcs12_read($local->get(sysconf('wechat.mch_ssl_p12'), true), $certs, $options['mch_id'])) {
+
-                    sysconf('wechat.mch_ssl_cer', $local->set(Storage::name($certs['pkey'], 'pem'), $certs['pkey'], true)['url']);
+
-                    sysconf('wechat.mch_ssl_key', $local->set(Storage::name($certs['cert'], 'pem'), $certs['cert'], true)['url']);
-                    static::withWxpayCert($options);
-                } else {
-                    throw new Exception('商户账号与 P12 证书不匹配！');
-                }
-            }
-        }
-        return $options;
     }
 
     /**
@@ -203,32 +194,34 @@ class WechatService extends Service
      * @return array
      * @throws \think\admin\Exception
      */
-    private static function withWxpayCert(array &$options): array
+    public static function withWxpayCert(array $options): array
     {
         // 文本模式主要是为了解决分布式部署
         $local = LocalStorage::instance();
-        if (!empty($data = sysdata('plugin.wechat.payment.config'))) {
+        $name1 = "wxpay/{$options['mch_id']}_cer.pem";
-            if (empty($data['ssl_key_text']) || empty($data['ssl_cer_text'])) {
+        $name2 = "wxpay/{$options['mch_id']}_key.pem";
-                throw new Exception('商户证书不能为空！');
+        if ($local->has($name1, true) && $local->has($name2, true)) {
-            }
+            $sslCer = $local->path($name1, true);
-            $name1 = Storage::name($data['ssl_cer_text'], 'pem');
+            $sslKey = $local->path($name2, true);
-            $name2 = Storage::name($data['ssl_key_text'], 'pem');
+        }
-            if ($local->has($name1, true) && $local->has($name2, true)) {
+        if (empty($sslCer) || empty($sslKey)) {
-                $sslCer = $local->set($name1, $data['ssl_cer_text'], true)['file'];
+            if (!empty($data = sysdata('plugin.wechat.payment'))) {
-                $sslKey = $local->set($name2, $data['ssl_key_text'], true)['file'];
+                if (!empty($data['ssl_key_text']) && !empty($data['ssl_cer_text'])) {
+                    $sslCer = $local->set($name1, $data['ssl_cer_text'], true)['file'];
+                    $sslKey = $local->set($name2, $data['ssl_key_text'], true)['file'];
+                }
             } else {
-                $sslCer = $local->path($name1, true);
+                $sslCer = $local->path(sysconf('wechat.mch_ssl_cer'), true);
-                $sslKey = $local->path($name2, true);
+                $sslKey = $local->path(sysconf('wechat.mch_ssl_key'), true);
+                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;
-        } else {
-            $sslCer = $local->path(sysconf('wechat.mch_ssl_cer'), true);
-            $sslKey = $local->path(sysconf('wechat.mch_ssl_key'), true);
-            if (is_file($sslCer)) $options['cert_public'] = $options['ssl_cer'] = $sslCer;
-            if (is_file($sslKey)) $options['cert_private'] = $options['ssl_key'] = $sslKey;
         }
         return $options;
     }

app/wechat/view/config/payment.html

@@ -42,7 +42,7 @@
                 {foreach ['pem'=>'上传 PEM 证书', 'p12'=>'上传 P12 证书'] as $k=>$v}
                 <input type="radio" data-pem-type="{$k}" name="wechat.mch_ssl_type" value="{$k}" title="{$v}" lay-filter="data-mch-type">
                 {/foreach}
-                <p class="help-block font-code">请选择需要上传证书类型，P12 或 PEM 二选一，证书需要从微信商户平台获取</p>
+                <p class="help-block font-code">请选择需要上传证书类型，上传 P12 证书会自动转换为 PEM 证书。</p>
 
                 <div class="padding-top-10">
                     <div data-mch-type="none"></div>

app/wechat/view/payment/record/index.html

@@ -1,8 +1,8 @@
 {extend name="table"}
 
 {block name="button"}
-<!--{if auth("queue")}-->
+<!--{if auth("clear")}-->
-<!--<button class='layui-btn layui-btn-sm layui-btn-primary' data-queue='{:url("queue")}'>刷新领取次数</button>-->
+<button data-queue='{:url("clear")}' data-table-id="PaymentRecord" class='layui-btn layui-btn-sm layui-btn-primary'>清理24小时未支付数据</button>
 <!--{/if}-->
 {/block}
 
@@ -26,7 +26,7 @@
                     field: 'id', title: '用户信息', minWidth: 170, templet: function (d) {
                         let tpls = [];
                         tpls.push('用户昵称：{{d.fans_nickname||"-"}}');
-                        tpls.push('用户标识：{{d.openid||"-"}}');
+                        tpls.push('用户标识：<span class="font-code">{{d.openid||"-"}}</span>');
                         return laytpl(tpls.join('<br>')).render(d);
                     }
                 },

app/wechat/view/payment/refund/index.html

@@ -20,7 +20,7 @@
                     field: '', title: '用户账号', minWidth: 170, templet: function (d) {
                         let tpls = [];
                         tpls.push('<div class="padding-top-10"></div>用户昵称：{{d.record.fans_nickname||"-"}}');
-                        tpls.push('用户标识：{{d.record.openid||"-"}}');
+                        tpls.push('用户标识：<span class="font-code">{{d.record.openid||"-"}}</span>');
                         return laytpl(tpls.join('<br>')).render(d);
                     }
                 },

public/static/admin.js

@@ -367,7 +367,7 @@ $(function () {
             this.load(url, data, 'GET', function (res) {
                 if (typeof res === 'object') return $.msg.auto(res), false;
                 return $.msg.mdx.push(this.idx = layer.open({
-                    type: 1, btn: false, area: area || "800px", resize: false, content: res, title: name || '', offset: offset || 'auto', success: function ($dom, idx) {
+                    type: 1, btn: false, area: area || "800px", resize: false, content: res, title: name === 'false' ? '' : name, offset: offset || 'auto', success: function ($dom, idx) {
                         typeof call === 'function' && call.call($.form, $dom);
                         $.form.reInit($dom.off('click', '[data-close]').on('click', '[data-close]', function () {
                             $.base.onConfirm(this.dataset.confirm, function () {

public/static/theme/css/login.css

@@ -1 +1 @@
-@charset "UTF-8";body,html{height:100%;display:block}.login-container,body{vertical-align:middle;background-size:cover;background-repeat:no-repeat;background-position:center center;transition:background-image 1s linear;-o-transition:background-image 1s linear;-moz-transition:background-image 1s linear;-webkit-transition:background-image 1s linear}.login-container{height:100%}.login-container .header{top:0;left:0;width:100%;height:48px;position:absolute;text-shadow:#000 .1em .1em .1em}.login-container .header .title{color:#fff;float:left;font-size:18px;line-height:48px;text-indent:40px;letter-spacing:1px}.login-container .header .title span{font-size:10px;padding-left:5px}.login-container .header a,.login-container .header a:focus,.login-container .header a:hover{color:#fff;letter-spacing:1px;text-decoration:none}.login-container .header ul{float:right}.login-container .header ul li{float:left;line-height:47px;margin-left:10px}.login-container form{top:50%;left:50%;width:300px;position:absolute;margin-top:-250px;margin-left:-150px}.login-container form h2{color:#fff;padding:20px 0;font-size:25px;text-align:center;font-weight:700;letter-spacing:3px;text-shadow:#000 .05em .05em .05em}.login-container form ul li{margin-top:20px;text-shadow:#000 .1em .1em .1em}.login-container form ul li.verify label{width:200px}.login-container form ul li.verify input.layui-input{text-transform:uppercase}.login-container form ul li.verify img{width:95px;height:44px;cursor:pointer;position:absolute;margin-left:5px;border-radius:3px;box-shadow:0 2px 5px 0 rgba(0,0,0,.1)}.login-container form ul li i.layui-icon{color:#fff;font-size:18px;position:absolute;padding:14px 15px 13px 20px}.login-container form ul li input{color:#fff;height:45px;padding:0 15px;font-size:14px;line-height:1em;text-indent:35px;border-radius:3px;letter-spacing:1px;background:rgba(0,0,0,.12);text-shadow:#000 .1em .1em .1em;-webkit-text-fill-color:#fff!important;box-shadow:0 2px 3px 0 rgba(0,0,0,.3) inset!important}.login-container form ul li input:-webkit-autofill,.login-container form ul li input:-webkit-autofill:active,.login-container form ul li input:-webkit-autofill:focus,.login-container form ul li input:-webkit-autofill:hover,.login-container form ul li input:active,.login-container form ul li input:focus,.login-container form ul li input:hover{text-shadow:#000 .1em .1em .1em;box-shadow:0 2px 3px 0 rgba(0,0,0,.3) inset!important;-webkit-text-fill-color:#fff!important;-webkit-transition-delay:9999s!important;-webkit-transition:color 9999s ease-out,background-color 9999s ease-out!important}.login-container form ul li span{letter-spacing:1px;color:#ff0!important}.login-container form ul li button{color:#333!important;height:45px!important;border:none!important;background:#fff!important;border-radius:3px!important;letter-spacing:1px!important;box-shadow:0 15px 30px 0 hsla(0,0%,100%,.25) inset,0 2px 7px 0 rgba(0,0,0,.2)}.login-container form ul li button:hover{opacity:1}.login-container .footer{left:0;bottom:0;color:#fff;width:100%;position:absolute;text-align:center;line-height:30px;padding-bottom:10px;text-shadow:#000 .1em .1em .1em}.login-container .footer a,.login-container .footer span{color:#fff}.login-container .footer a:hover{color:#ccc}/*# sourceMappingURL=login.css.map */
+@charset "UTF-8";body,html{height:100%;display:block}.login-container,body{vertical-align:middle;background-size:cover;background-repeat:no-repeat;background-position:center center;transition:background-image 1s linear;-o-transition:background-image 1s linear;-moz-transition:background-image 1s linear;-webkit-transition:background-image 1s linear}.login-container{height:100%}.login-container .header{top:0;left:0;width:100%;height:48px;position:absolute;text-shadow:#000 .1em .1em .1em}.login-container .header .title{color:#fff;float:left;font-size:18px;line-height:48px;text-indent:40px;letter-spacing:1px}.login-container .header .title span{font-size:10px;padding-left:5px}.login-container .header a,.login-container .header a:focus,.login-container .header a:hover{color:#fff;letter-spacing:1px;text-decoration:none}.login-container .header ul{float:right}.login-container .header ul li{float:left;line-height:47px;margin-left:10px}.login-container form{top:50%;left:50%;width:300px;position:absolute;margin-top:-250px;margin-left:-150px}.login-container form h2{color:#fff;padding:20px 0;font-size:25px;text-align:center;font-weight:700;letter-spacing:3px;text-shadow:#000 .05em .05em .05em}.login-container form ul li{margin-top:20px;text-shadow:#000 .1em .1em .1em}.login-container form ul li.verify label{width:200px}.login-container form ul li.verify input.layui-input{text-transform:uppercase}.login-container form ul li.verify img{width:95px;height:44px;cursor:pointer;position:absolute;margin-left:5px;border-radius:3px;box-shadow:0 2px 5px 0 rgba(0,0,0,.1)}.login-container form ul li i.layui-icon{color:#fff;font-size:18px;position:absolute;padding:14px 15px 13px 20px}.login-container form ul li input{color:#fff;height:45px;padding:0 15px;font-size:14px;line-height:1em;text-indent:35px;border:#DDD!important;border-radius:3px;letter-spacing:2px;background:rgba(0,0,0,.12);text-shadow:#000 .1em .1em .1em;-webkit-text-fill-color:#fff!important;box-shadow:0 2px 3px 0 rgba(0,0,0,.3) inset!important}.login-container form ul li input:-webkit-autofill,.login-container form ul li input:-webkit-autofill:active,.login-container form ul li input:-webkit-autofill:focus,.login-container form ul li input:-webkit-autofill:hover,.login-container form ul li input:active,.login-container form ul li input:focus,.login-container form ul li input:hover{border:#DDD!important;text-shadow:#000 .1em .1em .1em;box-shadow:0 2px 4px 0 rgba(0,0,0,.4) inset!important;-webkit-text-fill-color:#fff!important;-webkit-transition-delay:9999s!important;-webkit-transition:color 9999s ease-out,background-color 9999s ease-out!important}.login-container form ul li span{letter-spacing:1px;color:#ff0!important}.login-container form ul li button{color:#333!important;height:45px!important;border:none!important;background:#fff!important;border-radius:3px!important;letter-spacing:1px!important;box-shadow:0 15px 30px 0 hsla(0,0%,100%,.25) inset,0 2px 7px 0 rgba(0,0,0,.2)}.login-container form ul li button:hover{opacity:1}.login-container .footer{left:0;bottom:0;color:#fff;width:100%;position:absolute;text-align:center;line-height:30px;padding-bottom:10px;text-shadow:#000 .1em .1em .1em}.login-container .footer a,.login-container .footer span{color:#fff}.login-container .footer a:hover{color:#ccc}/*# sourceMappingURL=login.css.map */

public/static/theme/css/login.css.map

@@ -1 +1 @@
-{"version":3,"sources":["login.less","_config.less"],"names":[],"mappings":"iBAiBA,KAAM,KACJ,OAAA,KACA,QAAA,MAGI,iBAAN,KACE,eAAA,OACA,gBAAA,MACA,kBAAA,UACA,oBAAA,OAAA,OCkEA,WAAA,iBAAA,GAAA,OACA,cAAA,iBAAA,GAAA,OACA,gBAAA,iBAAA,GAAA,OACA,mBAAA,iBAAA,GAAA,ODjEF,iBACE,OAAA,KAEA,yBACE,IAAA,EACA,KAAA,EACA,MAAA,KACA,OAAA,KACA,SAAA,SACA,YAAA,KAAA,KAAA,KAAA,KAEA,gCACE,MAAA,KACA,MAAA,KACA,UAAA,KACA,YAAA,KACA,YAAA,KACA,eAAA,IAEA,qCACE,UAAA,KACA,aAAA,IAIJ,2BACM,iCAAS,iCACX,MAAA,KACA,eAAA,IACA,gBAAA,KAIJ,4BACE,MAAA,MAEA,+BACE,MAAA,KACA,YAAA,KACA,YAAA,KAKN,sBACE,IAAA,IACA,KAAA,IACA,MAAA,MACA,SAAA,SACA,WAAA,OACA,YAAA,OAEA,yBACE,MAAA,KACA,QAAA,KAAA,EACA,UAAA,KACA,WAAA,OACA,YAAA,IACA,eAAA,IACA,YAAA,KAAA,MAAA,MAAA,MAGC,4BACD,WAAA,KACA,YAAA,KAAA,KAAA,KAAA,KAGE,yCACE,MAAA,MAGG,qDACH,eAAA,UAGF,uCACE,MAAA,KACA,OAAA,KACA,OAAA,QACA,SAAA,SACA,YAAA,IACA,cAAA,IACA,WAAA,EAAA,IAAA,IAAA,EAAA,eAIH,yCACC,MAAA,KACA,UAAA,KACA,SAAA,SACA,QAAA,KAAA,KAAA,KAAA,KAGF,kCACE,MAAA,KACA,OAAA,KACA,QAAA,EAAA,KACA,UAAA,KACA,YAAA,IACA,YAAA,KACA,cAAA,IACA,eAAA,IACA,WAAA,gBACA,YAAA,KAAA,KAAA,KAAA,KACA,wBAAA,eACA,WAAA,EAAA,IAAA,IAAA,EAAA,eAAA,gBAGC,mDAC2C,0DAA1B,yDADoB,yDADnB,yCAAT,wCAAT,wCAGC,YAAA,KAAA,KAAA,KAAA,KACA,WAAA,EAAA,IAAA,IAAA,EAAA,eAAA,gBACA,wBAAA,eACA,yBAAA,gBACA,mBAAA,MAAA,MAAA,SAAA,iBAAA,MAAA,mBAIJ,iCACE,eAAA,IACA,MAAA,eAGF,mCACE,MAAA,eACA,OAAA,eACA,OAAA,eACA,WAAA,eACA,cAAA,cACA,eAAA,cACA,WAAA,EAAA,KAAA,KAAA,EAAA,oBAAA,MAAA,EAAA,IAAA,IAAA,EAAA,eAEC,yCACC,QAAA,EAMR,yBACE,KAAA,EACA,OAAA,EACA,MAAA,KACA,MAAA,KACA,SAAA,SACA,WAAA,OACA,YAAA,KACA,eAAA,KACA,YAAA,KAAA,KAAA,KAAA,KAEA,2BAAG,8BACD,MAAA,KAGD,iCACC,MAAA"}
+{"version":3,"sources":["login.less","_config.less"],"names":[],"mappings":"iBAiBA,KAAM,KACJ,OAAA,KACA,QAAA,MAGI,iBAAN,KACE,eAAA,OACA,gBAAA,MACA,kBAAA,UACA,oBAAA,OAAA,OCkEA,WAAA,iBAAA,GAAA,OACA,cAAA,iBAAA,GAAA,OACA,gBAAA,iBAAA,GAAA,OACA,mBAAA,iBAAA,GAAA,ODjEF,iBACE,OAAA,KAEA,yBACE,IAAA,EACA,KAAA,EACA,MAAA,KACA,OAAA,KACA,SAAA,SACA,YAAA,KAAA,KAAA,KAAA,KAEA,gCACE,MAAA,KACA,MAAA,KACA,UAAA,KACA,YAAA,KACA,YAAA,KACA,eAAA,IAEA,qCACE,UAAA,KACA,aAAA,IAIJ,2BACM,iCAAS,iCACX,MAAA,KACA,eAAA,IACA,gBAAA,KAIJ,4BACE,MAAA,MAEA,+BACE,MAAA,KACA,YAAA,KACA,YAAA,KAKN,sBACE,IAAA,IACA,KAAA,IACA,MAAA,MACA,SAAA,SACA,WAAA,OACA,YAAA,OAEA,yBACE,MAAA,KACA,QAAA,KAAA,EACA,UAAA,KACA,WAAA,OACA,YAAA,IACA,eAAA,IACA,YAAA,KAAA,MAAA,MAAA,MAGC,4BACD,WAAA,KACA,YAAA,KAAA,KAAA,KAAA,KAGE,yCACE,MAAA,MAGG,qDACH,eAAA,UAGF,uCACE,MAAA,KACA,OAAA,KACA,OAAA,QACA,SAAA,SACA,YAAA,IACA,cAAA,IACA,WAAA,EAAA,IAAA,IAAA,EAAA,eAIH,yCACC,MAAA,KACA,UAAA,KACA,SAAA,SACA,QAAA,KAAA,KAAA,KAAA,KAGF,kCACE,MAAA,KACA,OAAA,KACA,QAAA,EAAA,KACA,UAAA,KACA,YAAA,IACA,YAAA,KACA,OAAA,eACA,cAAA,IACA,eAAA,IACA,WAAA,gBACA,YAAA,KAAA,KAAA,KAAA,KACA,wBAAA,eACA,WAAA,EAAA,IAAA,IAAA,EAAA,eAAA,gBAGC,mDAC2C,0DAA1B,yDADoB,yDADnB,yCAAT,wCAAT,wCAGC,OAAA,eACA,YAAA,KAAA,KAAA,KAAA,KACA,WAAA,EAAA,IAAA,IAAA,EAAA,eAAA,gBACA,wBAAA,eACA,yBAAA,gBACA,mBAAA,MAAA,MAAA,SAAA,iBAAA,MAAA,mBAIJ,iCACE,eAAA,IACA,MAAA,eAGF,mCACE,MAAA,eACA,OAAA,eACA,OAAA,eACA,WAAA,eACA,cAAA,cACA,eAAA,cACA,WAAA,EAAA,KAAA,KAAA,EAAA,oBAAA,MAAA,EAAA,IAAA,IAAA,EAAA,eAEC,yCACC,QAAA,EAMR,yBACE,KAAA,EACA,OAAA,EACA,MAAA,KACA,MAAA,KACA,SAAA,SACA,WAAA,OACA,YAAA,KACA,eAAA,KACA,YAAA,KAAA,KAAA,KAAA,KAEA,2BAAG,8BACD,MAAA,KAGD,iCACC,MAAA"}

public/static/theme/css/login.less

@@ -128,8 +128,9 @@ body, .login-container {
         font-size: 14px;
         line-height: 1em;
         text-indent: 35px;
+        border: #DDD !important;
         border-radius: @BoxBorderRadius;
-        letter-spacing: 1px;
+        letter-spacing: 2px;
         background: rgba(0, 0, 0, .12);
         text-shadow: #000 .1em .1em .1em;
         -webkit-text-fill-color: #fff !important;
@@ -138,8 +139,9 @@ body, .login-container {
         &:hover, &:focus, &:active,
         &:-webkit-autofill, &:-webkit-autofill:hover,
         &:-webkit-autofill:focus, &:-webkit-autofill:active {
+          border: #DDD !important;
           text-shadow: #000 .1em .1em .1em;
-          box-shadow: 0 2px 3px 0 rgba(0, 0, 0, .3) inset !important;
+          box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .4) inset !important;
           -webkit-text-fill-color: #fff !important;
           -webkit-transition-delay: 9999s !important;
           -webkit-transition: color 9999s ease-out, background-color 9999s ease-out !important;