From 9fde31ba608b3e57759208eff3b2a6fb7f6b1d64 Mon Sep 17 00:00:00 2001
From: CGDF <17256673+CGDF-Github@users.noreply.github.com>
Date: Sun, 13 Jan 2019 01:43:45 +0800
Subject: [PATCH 01/17] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 91fe0474..2217ac83 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ Wiki已经启用,欢迎为此面板维护wiki
- [冲上云霄云主机](http://console.soar-clouds.com/aff.php?aff=94)
- [Vultr](https://www.vultr.com/?ref=7205737)
-[Nymph 的前端课程报名](t.me/kinokonominoco)
+[laurieryayoi 的前端课程报名](https://t.me/kinokonominoco)
From 2d87ccba41c7979bda3f4158c20b4a023a10c71b Mon Sep 17 00:00:00 2001
From: NimaQu
Date: Sun, 13 Jan 2019 01:47:54 +0800
Subject: [PATCH 02/17] test
---
README.md | 4 ----
1 file changed, 4 deletions(-)
diff --git a/README.md b/README.md
index 2217ac83..bb8f28b8 100644
--- a/README.md
+++ b/README.md
@@ -90,10 +90,6 @@ Wiki已经启用,欢迎为此面板维护wiki
您对我们的帮助将是支持我们做下去的动力,只需您在购买部分产品或向他人推荐产品时从我们的返利链接购买,这就是对我们很大的支持了。~~没有钱了,肯定要做啊,不做没有钱用啊,打工是不可能打工的,这辈子不可能打工的~~
-**NimaQu**
-
-- [TrimePay 签约](https://portal.trimepay.com/#/auth/register/134)
-- [Scorpioud - 圣何塞大带宽/波特兰高防 VPS](https://www.scorpioud.com)
##### dumplin
From e0587f99c3af2adcc75dfe1f6083793877d0e0fc Mon Sep 17 00:00:00 2001
From: CGDF <17256673+CGDF-Github@users.noreply.github.com>
Date: Sun, 13 Jan 2019 09:44:13 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=BE=AE=E6=95=99?=
=?UTF-8?q?=E7=A8=8B=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/views/material/user/index.tpl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/resources/views/material/user/index.tpl b/resources/views/material/user/index.tpl
index 67d12b56..1f2785e1 100644
--- a/resources/views/material/user/index.tpl
+++ b/resources/views/material/user/index.tpl
@@ -223,7 +223,7 @@
{$user = URL::getSSRConnectInfo($pre_user)}
{$ssr_url_all = URL::getAllUrl($pre_user, 0, 0)}
{$ssr_url_all_mu = URL::getAllUrl($pre_user, 1, 0)}
-
filter_1save_alt 点击下载客户端解压至任意磁盘并运行
+ filter_1save_alt 点击下载SSRR解压至任意磁盘并运行
filter_2 任务栏右下角右键纸飞机图标->服务器订阅->SSR服务器订阅设置,将订阅链接设置为下面的地址,确定之后再更新SSR服务器订阅(绕过代理)
filter_3 然后选择一个合适的服务器,代理规则选“绕过局域网和大陆”,然后即可上网
filter_4 备用导入节点方法:点击复制how_to_vote普通端口链接或者how_to_vote单端口多用户链接,然后右键小飞机->从剪贴板复制地址
@@ -238,7 +238,7 @@
点击这里查看Windows教程
-
filter_1save_alt 点击下载客户端,并安装
+
filter_1save_alt 点击下载SSTap,并安装
filter_2 期间会安装虚拟网卡,请点击允许或确认
filter_3 打开桌面程序SSTap
filter_4 齿轮图标-SSR订阅-SSR订阅管理添加以下订阅链接即可
@@ -452,7 +452,7 @@
filter_1save_alt 点击下载 SSD,save_alt 点击下载 SS 混淆插件
filter_2 安装后,在手机上点击复制下方的订阅链接
-
filter_3 打开 ShadowsocksD 客户端,点击右上角的“加号”,选择“添加订阅”,将剪贴板中的内容粘贴进去,点击“OK”,稍等片刻即可看见订阅的节点
+
filter_3 打开 ShadowsocksD ,点击右上角的“加号”,选择“添加订阅”,将剪贴板中的内容粘贴进去,点击“OK”,稍等片刻即可看见订阅的节点
flash_auto 节点订阅地址:
From 57aba1dbac46c564928339350a5d23efa77c888d Mon Sep 17 00:00:00 2001
From: laurieryayoi <14360417+laurieryayoi@users.noreply.github.com>
Date: Sun, 13 Jan 2019 21:39:14 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0TG=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Controllers/AuthController.php | 4 +-
app/Controllers/VueController.php | 3 +-
config/routes.php | 2 +-
public/theme/material/css/index.css | 12 +++
resources/views/material/auth/login.tpl | 2 +-
resources/views/material/index.tpl | 138 ++++++++++++++++++++----
6 files changed, 133 insertions(+), 28 deletions(-)
diff --git a/app/Controllers/AuthController.php b/app/Controllers/AuthController.php
index 79bbe755..34bc7d24 100644
--- a/app/Controllers/AuthController.php
+++ b/app/Controllers/AuthController.php
@@ -526,8 +526,8 @@ class AuthController extends BaseController
public function qrcode_check($request, $response, $args)
{
- $token = $request->getQueryParams()["token"];
- $number = $request->getQueryParams()["number"];
+ $token = $request->getParam('token');
+ $number = $request->getParam('number');
if (Config::get('enable_telegram') == 'true') {
$ret = TelegramSessionManager::check_login_session($token, $number);
diff --git a/app/Controllers/VueController.php b/app/Controllers/VueController.php
index 7b884b3f..2982d29f 100644
--- a/app/Controllers/VueController.php
+++ b/app/Controllers/VueController.php
@@ -64,7 +64,7 @@ class VueController extends BaseController {
"telegram_bot" => Config::get('telegram_bot'),
"enable_logincaptcha" => Config::get('enable_login_captcha'),
"enable_regcaptcha" => Config::get('enable_reg_captcha'),
- "base_url" => Config::get('enable_reg_captcha'),
+ "base_url" => Config::get('baseUrl'),
"recaptcha_sitekey" => $recaptcha_sitekey,
"captcha_provider" => Config::get('captcha_provider'),
"jump_delay" => Config::get('jump_delay'),
@@ -73,6 +73,7 @@ class VueController extends BaseController {
"appName" => Config::get('appName'),
"dateY" => date("Y"),
"isLogin" => $user->isLogin,
+ "enable_telegram" => Config::get('enable_telegram'),
);
$res['ret'] = 1;
diff --git a/config/routes.php b/config/routes.php
index 47abef72..6b59209b 100755
--- a/config/routes.php
+++ b/config/routes.php
@@ -178,7 +178,7 @@ $app->group('/payment', function () {
// Auth
$app->group('/auth', function () {
$this->get('/login', 'App\Controllers\AuthController:login');
- $this->get('/qrcode_check', 'App\Controllers\AuthController:qrcode_check');
+ $this->post('/qrcode_check', 'App\Controllers\AuthController:qrcode_check');
$this->post('/login', 'App\Controllers\AuthController:loginHandle');
$this->post('/qrcode_login', 'App\Controllers\AuthController:qrcode_loginHandle');
$this->get('/register', 'App\Controllers\AuthController:register');
diff --git a/public/theme/material/css/index.css b/public/theme/material/css/index.css
index ee8c5224..d4cb6529 100755
--- a/public/theme/material/css/index.css
+++ b/public/theme/material/css/index.css
@@ -210,6 +210,10 @@ input.checkbox {
.auth h1 {
font-size: 3.5rem;
+ margin-top: 0;
+}
+.auth h3 {
+ margin: 0;
}
.page-auth,
@@ -330,6 +334,14 @@ select {
font-weight: bolder;
}
+.basis-max .input-control {
+ width: 100%;
+}
+
+.basis-max .auth-submit {
+ width: 80%;
+}
+
@media screen and (min-width:35.5em) {
.auth-sm a {
min-width: 120px;
diff --git a/resources/views/material/auth/login.tpl b/resources/views/material/auth/login.tpl
index c2406c5b..057f5283 100755
--- a/resources/views/material/auth/login.tpl
+++ b/resources/views/material/auth/login.tpl
@@ -243,7 +243,7 @@
);
function f() {
$.ajax({
- type: "GET",
+ type: "POST",
url: "qrcode_check",
dataType: "json",
data: {
diff --git a/resources/views/material/index.tpl b/resources/views/material/index.tpl
index 74538e79..1a1b7ba6 100755
--- a/resources/views/material/index.tpl
+++ b/resources/views/material/index.tpl
@@ -108,7 +108,9 @@
{if isset($geetest_html)}
{/if}
-
+ {if $config['enable_telegram'] == 'true'}
+
+ {/if}