Merge branch 'master' of ssh://118.31.104.155:4422/mnt/git/v2.tiantianxinye.365care

2 years ago · 86dc3bd5c7
parent b18b0be73f 664ce44d1b
commit 86dc3bd5c7
2 changed files with 1 additions and 41 deletions
--- a/app/Libs/AlipayF2F.class.php
+++ b/app/Libs/AlipayF2F.class.php
@ -107,7 +107,7 @@ class AlipayF2F
                ];
                $refund->update($update);
            } else {
-                Log::info("支付宝退款失败：" . $result->code . "；" . $result->msg . "；" . $result->subMsg);
+                Log::info("退款（refund）ID：".$refund->id."，参数1：".$refund->relatedRecharge->serial."，参数2：".$refund->money."。支付宝退款失败：" . $result->code . "；" . $result->msg . "；" . $result->subMsg);
                $refund->increment("try_times");
                return false;
            }
--- a/index.html
+++ b/index.html
@ -1,40 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>恭喜，站点创建成功！</title>
-    <style>
-        .container {
-            width: 60%;
-            margin: 10% auto 0;
-            background-color: #f0f0f0;
-            padding: 2% 5%;
-            border-radius: 10px
-        }
-
-        ul {
-            padding-left: 20px;
-        }
-
-            ul li {
-                line-height: 2.3
-            }
-
-        a {
-            color: #20a53a
-        }
-    </style>
-</head>
-<body>
-    <div class="container">
-        <h1>恭喜, 站点创建成功！</h1>
-        <h3>这是默认index.html，本页面由系统自动生成</h3>
-        <ul>
-            <li>本页面在FTP根目录下的index.html</li>
-            <li>您可以修改、删除或覆盖本页面</li>
-            <li>FTP相关信息，请到“面板系统后台 > FTP” 查看</li>
-            <li>更多功能了解，请查看<a href="https://www.bt.cn" target="_blank">宝塔官网(www.bt.cn)</a></li>
-        </ul>
-    </div>
-</body>
-</html>