From deeb5ecdacf02cdebfe1d0a13573e08fa3fff73c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=94=E9=9B=80?=
<4700630-Gtary@users.noreply.gitlab.com>
Date: Sat, 16 May 2020 09:46:10 +0000
Subject: [PATCH] =?UTF-8?q?feat(js):=20=E6=9B=B4=E6=AD=A3=20JS=20=E8=BD=AE?=
=?UTF-8?q?=E8=AF=A2=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Controllers/Mod_Mu/UserController.php | 2 +-
app/Services/Gateway/TomatoPay.php | 1 -
app/Services/Gateway/flyfoxpay.php | 1 -
resources/views/material/auth/login.tpl | 9 ++-
resources/views/material/user/aopf2f.tpl | 70 ++++++++++++-----------
resources/views/material/user/bitpay.tpl | 38 ++++++------
resources/views/material/user/bitpayx.tpl | 49 ++++------------
resources/views/material/user/payjs.tpl | 61 ++++++++++----------
8 files changed, 108 insertions(+), 123 deletions(-)
diff --git a/app/Controllers/Mod_Mu/UserController.php b/app/Controllers/Mod_Mu/UserController.php
index 4bf3bfc7..9bd112a5 100644
--- a/app/Controllers/Mod_Mu/UserController.php
+++ b/app/Controllers/Mod_Mu/UserController.php
@@ -132,7 +132,7 @@ class UserController extends BaseController
$key_list = array('email', 'method', 'obfs', 'obfs_param', 'protocol', 'protocol_param',
'forbidden_ip', 'forbidden_port', 'node_speedlimit', 'disconnect_ip',
'is_multi_user', 'id', 'port', 'passwd', 'u', 'd', 'node_connector',
- 'sort', 'uuid');
+ 'sort', 'uuid', 'sha224uuid');
$users = array();
diff --git a/app/Services/Gateway/TomatoPay.php b/app/Services/Gateway/TomatoPay.php
index 2875ba22..220e6066 100644
--- a/app/Services/Gateway/TomatoPay.php
+++ b/app/Services/Gateway/TomatoPay.php
@@ -187,7 +187,6 @@ $sign = md5(substr($o,0,-1).$settings['token']);
}
}
});
- setTimeout(f, 1000);
});
';
diff --git a/app/Services/Gateway/flyfoxpay.php b/app/Services/Gateway/flyfoxpay.php
index d5c290d2..b55bfd06 100644
--- a/app/Services/Gateway/flyfoxpay.php
+++ b/app/Services/Gateway/flyfoxpay.php
@@ -224,7 +224,6 @@ if ($pay->verify($data)) {
}
}
});
- setTimeout(f, 1000);
});
';
diff --git a/resources/views/material/auth/login.tpl b/resources/views/material/auth/login.tpl
index 672d873c..e57c13b3 100755
--- a/resources/views/material/auth/login.tpl
+++ b/resources/views/material/auth/login.tpl
@@ -231,10 +231,17 @@
qrcode.makeCode(telegram_qrcode);
\ No newline at end of file
diff --git a/resources/views/material/user/payjs.tpl b/resources/views/material/user/payjs.tpl
index 54a2c1b9..8ade65b6 100644
--- a/resources/views/material/user/payjs.tpl
+++ b/resources/views/material/user/payjs.tpl
@@ -14,7 +14,7 @@