Merge pull request #8 from Anankke/dev

merge upstream
no_ymq_dev
Rico 8 years ago committed by GitHub
commit bab87fd422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -90,10 +90,6 @@ Wiki已经启用,欢迎为此面板维护wiki
您对我们的帮助将是支持我们做下去的动力,只需您在购买部分产品或向他人推荐产品时从我们的返利链接购买,这就是对我们很大的支持了。~~没有钱了,肯定要做啊,不做没有钱用啊,打工是不可能打工的,这辈子不可能打工的~~
**NimaQu**
- [TrimePay 签约](https://portal.trimepay.com/#/auth/register/134)
- [Scorpioud - 圣何塞大带宽/波特兰高防 VPS](https://www.scorpioud.com)
##### dumplin
@ -105,7 +101,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)

@ -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);

@ -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;

@ -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');

@ -210,6 +210,10 @@ input.checkbox {
.auth h1 {
font-size: 3.5rem;
margin-top: 0;
}
.auth h3 {
margin: 0;
}
.page-auth,
@ -330,6 +334,31 @@ select {
font-weight: bolder;
}
.basis-max .input-control {
width: 100%;
}
.basis-max .auth-submit {
width: 80%;
}
#code_number,
.tg-timeout {
padding: .6rem 1rem;
width: 100%;
font-size: 1.3em;
}
.tg-timeout {
width: 80%;
}
.qr-center img {
width: 70%;
height: 70%;
text-align: center;
}
@media screen and (min-width:35.5em) {
.auth-sm a {
min-width: 120px;

@ -243,7 +243,7 @@
);
function f() {
$.ajax({
type: "GET",
type: "POST",
url: "qrcode_check",
dataType: "json",
data: {

@ -108,7 +108,9 @@
{if isset($geetest_html)}
<script src="//static.geetest.com/static/tools/gt.js"></script>
{/if}
{if $config['enable_telegram'] == 'true'}
<script src="https://cdn.jsdelivr.net/gh/davidshimjs/qrcodejs@gh-pages/qrcode.min.js"></script>
{/if}
</body>
</html>
@ -135,7 +137,12 @@ const tmp = new Vuex.Store({
jumpDelay: '',
isGetestSuccess: '',
registMode: '',
base_url: '',
isEmailVeryify: '',
login_token: '',
login_number: '',
telegram_bot: '',
enable_telegram: '',
enableLoginCaptcha: '',
enableRegCaptcha: '',
indexMsg: {
@ -162,6 +169,7 @@ const tmp = new Vuex.Store({
},
SET_GLOBALCONFIG (state,config) {
state.logintoken = config.isLogin
state.globalConfig.base_url = config.base_url;
state.globalConfig.captchaProvider = config.captcha_provider;
state.globalConfig.recaptchaSiteKey = config.recaptcha_sitekey;
state.globalConfig.jumpDelay = config.jump_delay;
@ -173,6 +181,7 @@ const tmp = new Vuex.Store({
state.globalConfig.login_token = config.login_token;
state.globalConfig.login_number = config.login_number;
state.globalConfig.telegram_bot = config.telegram_bot;
state.globalConfig.enable_telegram = config.enable_telegram;
state.globalConfig.indexMsg.appname = config.appName;
state.globalConfig.indexMsg.date = config.dateY;
},
@ -181,7 +190,7 @@ const tmp = new Vuex.Store({
},
SET_JINRISHICI (state,content) {
state.globalConfig.indexMsg.jinrishici = content;
}
},
},
actions: {
CALL_MSGR ({ commit,state },config) {
@ -342,32 +351,69 @@ const Auth = {
const Login = {
delimiters: ['$[',']$'],
mixins: [storeAuth],
computed: Vuex.mapState({
msgrCon: 'msgrCon',
globalConfig: 'globalConfig',
logintoken: 'logintoken',
isLoading: 'isLoading',
telegramHref: function() {
return 'https://t.me/' + this.globalConfig.telegram_bot;
},
isTgEnabled: function() {
return this.globalConfig.enable_telegram === 'true';
}
}),
template: /*html*/ `
<div class="page-auth pure-g pure-u-1 pure-u-sm-20-24">
<div class="page-auth pure-g pure-u-1 pure-u-sm-20-24 wrap">
<div class="title-back flex align-center">LOGIN</div>
<h1>登录</h1>
<div class="input-control flex wrap">
<label for="Email">邮箱</label>
<input v-model="email" type="text" name="Email">
</div>
<div class="input-control flex wrap">
<label for="Password">密码</label>
<input v-model="passwd" type="password" name="Password">
</div>
<div class="input-control flex wrap">
<uim-checkbox v-model="remember_me">
<span slot="content">记住我</span>
</uim-checkbox>
</div>
<div class="input-control flex wrap">
<div v-if="globalConfig.captchaProvider === 'geetest'" id="embed-captcha-login"></div>
<form action="?" method="POST">
<div v-if="globalConfig.recaptchaSiteKey" id="g-recaptcha-login" class="g-recaptcha" :data-sitekey="globalConfig.recaptchaSiteKey"></div>
</form>
<div class="pure-u-1 basis-max" :class="[ isTgEnabled ? 'pure-u-sm-11-24' : 'pure-u-sm-1-2' ]">
<div class="input-control flex wrap">
<label for="Email">邮箱</label>
<input v-model="email" type="text" name="Email">
</div>
<div class="input-control flex wrap">
<label for="Password">密码</label>
<input v-model="passwd" type="password" name="Password">
</div>
<div class="input-control flex wrap">
<uim-checkbox v-model="remember_me">
<span slot="content">记住我</span>
</uim-checkbox>
</div>
<div class="input-control flex wrap">
<div v-if="globalConfig.captchaProvider === 'geetest'" id="embed-captcha-login"></div>
<form action="?" method="POST">
<div v-if="globalConfig.recaptchaSiteKey" id="g-recaptcha-login" class="g-recaptcha" :data-sitekey="globalConfig.recaptchaSiteKey"></div>
</form>
</div>
<button @click.prevent="login" @keyup.13.native="login" class="auth-submit" id="login" type="submit" :disabled="isDisabled">
确认登录
</button>
</div>
<button @click.prevent="login" @keyup.13.native="login" class="auth-submit" id="login" type="submit" :disabled="isDisabled">
确认登录
</button>
<div v-if="globalConfig.enable_telegram === 'true'" class="pure-u-1 pure-u-sm-11-24 pure-g">
<h3>Telegram登录</h3>
<div>
<p>Telegram OAuth一键登陆</p>
</div>
<p id="telegram-alert">正在载入 Telegram,如果长时间未显示请刷新页面或检查代理</p>
<div class="text-center" id="telegram-login-box"></div>
<p>或者添加机器人账号 <a :href="telegramHref">@$[globalConfig.telegram_bot]$</a>,发送下面的数字/二维码验证码给它
</p>
<transition name="fade" mode="out-in">
<div v-if="!isTgtimeout" class="pure-g pure-u-20-24" key="notTimeout">
<div class="text-center qr-center pure-u-11-24">
<div id="telegram-qr" class="flex space-around"></div>
</div>
<div class="pure-u-11-24">
<div class="auth-submit" id="code_number">$[globalConfig.login_number]$</div>
</div>
</div>
<div v-else class="pure-g space-around" key="timeout">
<div class="auth-submit pure-u-18-24 tg-timeout">验证方式已过期,请刷新页面后重试</div>
</div>
</transition>
</div>
</div>
`,
data: function () {
@ -376,6 +422,7 @@ const Login = {
passwd: '',
remember_me: false,
isDisabled: false,
isTgtimeout: false,
}
},
methods: {
@ -435,6 +482,57 @@ const Login = {
});
},
telegramRender() {
let el = document.createElement('script');
document.getElementById('telegram-login-box').append(el);
el.onload = function () {
document.getElementById('telegram-alert').outerHTML = '';
}
el.src = 'https://telegram.org/js/telegram-widget.js?4';
el.setAttribute('data-size', 'large');
el.setAttribute('data-telegram-login', this.globalConfig.telegram_bot);
el.setAttribute('data-auth-url', this.globalConfig.base_url + '/auth/telegram_oauth');
el.setAttribute('data-request-access', 'write');
let telegram_qrcode = 'mod://login/' + this.globalConfig.login_token;
let qrcode = new QRCode(document.getElementById("telegram-qr"));
qrcode.clear();
qrcode.makeCode(telegram_qrcode);
},
tgAuthTrigger(tid) {
let callConfig = {
msg: '',
icon: '',
};
axios.post('/auth/qrcode_check',{
token: this.globalConfig.login_token,
number: this.globalConfig.login_number,
}).then(r=>{
if(r.data.ret > 0) {
clearTimeout(tid);
axios.post('/auth/qrcode_login',{
token: this.globalConfig.login_token,
number: this.globalConfig.login_number,
}).then(r=>{
if (r.data.ret) {
callConfig.msg += '登录成功Kira~';
callConfig.icon += 'fa-check-square-o';
tmp.dispatch('CALL_MSGR',callConfig);
window.setTimeout(()=>{
tmp.commit('SET_LOGINTOKEN',1);
this.$router.replace('/user/panel');
}, this.globalConfig.jumpDelay);
}
})
} else if (r.data.ret == -1) {
this.isTgtimeout = true;
}
})
tid = setTimeout(()=>{
this.tgAuthTrigger(tid);
}, 2500);
}
},
mounted() {
document.addEventListener('keyup',(e)=>{
@ -443,6 +541,13 @@ const Login = {
}
});
if (this.globalConfig.enable_telegram === 'true') {
this.telegramRender();
let tid = setTimeout(()=>{
this.tgAuthTrigger(tid);
}, 2500);
}
if (this.globalConfig.enableLoginCaptcha === 'false') {
return;
}

@ -226,7 +226,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)}
<p><span class="icon icon-lg text-white">filter_1</span><a class="btn-dl" href="/ssr-download/ssr-win.7z"><i class="material-icons">save_alt</i> 点击下载客户端</a>解压至任意磁盘并运行</p>
<p><span class="icon icon-lg text-white">filter_1</span><a class="btn-dl" href="/ssr-download/ssr-win.7z"><i class="material-icons">save_alt</i> 点击下载SSRR</a>解压至任意磁盘并运行</p>
<p><span class="icon icon-lg text-white">filter_2</span> 任务栏右下角右键纸飞机图标->服务器订阅->SSR服务器订阅设置,将订阅链接设置为下面的地址,确定之后再更新SSR服务器订阅(绕过代理)</p>
<p> <span class="icon icon-lg text-white">filter_3</span> 然后选择一个合适的服务器,代理规则选“绕过局域网和大陆”,然后即可上网</p>
<p><span class="icon icon-lg text-white">filter_4</span> 备用导入节点方法:点击复制<a class="copy-text btn-dl" data-clipboard-text="{$ssr_url_all}"><i class="material-icons icon-sm">how_to_vote</i>普通端口链接</a>或者<a class="copy-text btn-dl" data-clipboard-text="{$ssr_url_all_mu}"><i class="material-icons icon-sm">how_to_vote</i>单端口多用户链接</a>,然后右键小飞机->从剪贴板复制地址</p>
@ -241,7 +241,7 @@
<p><a href="/user/tutorial">点击这里查看Windows教程</a></p>
</div>
<div class="tab-pane fade" id="all_ssr_mac">
<p><span class="icon icon-lg text-white">filter_1</span><a href="/ssr-download/ssr-mac.dmg" class="btn-dl"><i class="material-icons">save_alt</i> 点击下载ShadowsocksX</a>,安装并启动</p>
<p><span class="icon icon-lg text-white">filter_1</span><a href="/ssr-download/ssr-mac.dmg" class="btn-dl"><i class="material-icons">save_alt</i> 点击下载ShadowsocksX-NG-R8</a>,安装并启动</p>
<p><span class="icon icon-lg text-white">filter_2</span> 右击托盘纸飞机图标->服务器->服务器订阅,填入以下订阅地址</p>
<p><span class="icon icon-lg text-white">filter_3</span >更新订阅成功后服务器列表即可出现节点,选择一个节点</p>
<p><span class="icon icon-lg text-white">filter_4</span> 再次右击托盘纸飞机图标,如果shadowsocks还未打开,则需要点击打开</p>
@ -326,7 +326,7 @@
{/if}
</div>
<div class="tab-pane fade" id="all_ssr_game">
<p><span class="icon icon-lg text-white">filter_1</span><a href="/ssr-download/SSTap.7z" class="btn-dl"><i class="material-icons">save_alt</i> 点击下载客户端</a>,并安装</p>
<p><span class="icon icon-lg text-white">filter_1</span><a href="/ssr-download/SSTap.7z" class="btn-dl"><i class="material-icons">save_alt</i> 点击下载SSTap</a>,并安装</p>
<p><span class="icon icon-lg text-white">filter_2</span> 期间会安装虚拟网卡,请点击允许或确认</p>
<p><span class="icon icon-lg text-white">filter_3</span> 打开桌面程序SSTap</p>
<p><span class="icon icon-lg text-white">filter_4</span> 齿轮图标-SSR订阅-SSR订阅管理添加以下订阅链接即可</p>
@ -455,7 +455,7 @@
<div class="tab-pane fade" id="all_ss_android">
<p><span class="icon icon-lg text-white">filter_1</span><a href="/ssr-download/ssd-android.apk" class="btn-dl"><i class="material-icons">save_alt</i> 点击下载 SSD</a>,<a href="/ssr-download/ss-android-obfs.apk" class="btn-dl"><i class="material-icons">save_alt</i> 点击下载 SS 混淆插件</a></p>
<p><span class="icon icon-lg text-white">filter_2</span> 安装后,在手机上点击复制下方的订阅链接</a></p>
<p><span class="icon icon-lg text-white">filter_3</span> 打开 ShadowsocksD 客户端,点击右上角的“加号”,选择“添加订阅”,将剪贴板中的内容粘贴进去,点击“OK”,稍等片刻即可看见订阅的节点</p>
<p><span class="icon icon-lg text-white">filter_3</span> 打开 ShadowsocksD ,点击右上角的“加号”,选择“添加订阅”,将剪贴板中的内容粘贴进去,点击“OK”,稍等片刻即可看见订阅的节点</p>
<div><span class="icon icon-lg text-white">flash_auto</span> 节点订阅地址:</div>
<div class="float-clear"><input type="text" class="input form-control form-control-monospace cust-link col-xx-12 col-sm-8 col-lg-7" name="input1" readonly value="{$subUrl}{$ssr_sub_token}?mu=3" readonly="true"><button class="copy-text btn btn-subscription col-xx-12 col-sm-3 col-lg-2" type="button" data-clipboard-text="{$subUrl}{$ssr_sub_token}?mu=3">点击复制</button><br></div>
</div>

Loading…
Cancel
Save