Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new #1

Merged
merged 98 commits into from
Apr 16, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
67e3193
new branch
lordlezehaf Jan 9, 2019
256a623
忽略install/composer锁
Jan 30, 2019
1705504
Revert "忽略install/composer锁"
Jan 30, 2019
8a975d0
添加ssrpanel自动安装并修复sql错误
Jan 30, 2019
be59753
添加当面付接口/公私钥输入时自动去除空格和换行
Jan 30, 2019
e8cec07
添加升级sql
Jan 30, 2019
a2c30f4
回调测试
Jan 30, 2019
047402f
回调测试
Jan 30, 2019
dbfbb1a
回调测试
Jan 30, 2019
f776a52
完成当面付接口
Jan 30, 2019
0b3e1a9
go
Jan 30, 2019
741b4b8
适配vnet,限速字段调整
lordlezehaf Feb 13, 2019
1788f82
1.修正数据库高负载BUG(杜若)
lordlezehaf Feb 14, 2019
25a55d3
重置所有用户的限速字段
lordlezehaf Feb 14, 2019
a784af9
fix scripts
lordlezehaf Feb 14, 2019
5096f10
优化
lordlezehaf Feb 15, 2019
f4718f7
Merge branch 'master' into master
Scyllaly Feb 15, 2019
7750a43
Update install.php
Scyllaly Feb 15, 2019
b535a25
Merge pull request #1305 from yiheyang/master
Scyllaly Feb 15, 2019
721b03d
merge f2fpay
lordlezehaf Feb 16, 2019
3d21039
merge f2fpay
lordlezehaf Feb 16, 2019
4641cb0
merge f2fpay
lordlezehaf Feb 16, 2019
a2545c1
merge f2fpay
lordlezehaf Feb 16, 2019
2fdf824
增加mailgun默认配置项
Scyllaly Feb 17, 2019
6146677
更新CA证书、在线IP表增适配vnet单端口、v2ray上报IP、v2ray单端口
lordlezehaf Feb 18, 2019
bbdf36c
注册页优化
lordlezehaf Feb 18, 2019
80329be
修正因使用队列而导致发件失败无法正确捕获异常(感谢@HeroYi的帮助)
lordlezehaf Feb 18, 2019
59c3943
修正因使用队列而导致发件失败无法正确捕获异常(感谢@HeroYi的帮助)
lordlezehaf Feb 18, 2019
cfa79cf
vnstat一键安装脚本
lordlezehaf Feb 19, 2019
19c8c14
安全入口
lordlezehaf Feb 20, 2019
55c072c
安全入口
lordlezehaf Feb 22, 2019
1a97463
初始化用户默认标签
lordlezehaf Feb 22, 2019
4133432
修正唯一入口
lordlezehaf Feb 22, 2019
6f65ba7
1.移除push_bear
lordlezehaf Feb 28, 2019
f1056d0
1.移除push_bear
lordlezehaf Feb 28, 2019
1d85845
分来开节点离线提醒和TCP阻断检测
lordlezehaf Mar 1, 2019
eeceec5
改进购买商品页
lordlezehaf Mar 4, 2019
91e384d
改进购买商品页
lordlezehaf Mar 4, 2019
5c59266
解决支付宝当面付二维码不生成问题
lordlezehaf Mar 4, 2019
ab8c945
解决支付宝当面付二维码不生成问题
lordlezehaf Mar 4, 2019
e992c3d
优化节点列表
lordlezehaf Mar 4, 2019
c0929fd
修复高级订阅BUG
lordlezehaf Mar 4, 2019
287fe6b
修复节点离线提醒
lordlezehaf Mar 4, 2019
139afcd
修复支付宝当面付创建账单失败问题、限制未购买任何服务的账号:不展示订阅信息
lordlezehaf Mar 4, 2019
8e5b59d
适配Quantumult的自定义订阅头
lordlezehaf Mar 5, 2019
fd5db0f
美化个人中心界面
lordlezehaf Mar 6, 2019
d4564ae
演示环境禁止修改安全码
lordlezehaf Mar 6, 2019
5a2f9be
日常开发
Scyllaly Mar 9, 2019
fcacb67
日常开发
lordlezehaf Mar 11, 2019
c274904
日常开发
lordlezehaf Mar 11, 2019
1c6ed05
适配rico93的v2ray插件
lordlezehaf Mar 13, 2019
a3f2d54
1.彻底移除pushbear
lordlezehaf Mar 14, 2019
251d637
完成了Geetest极验验证 & 优化了系统设置切换栏的CSS样式
Mar 15, 2019
a8b289e
完成了Geetest极验验证 & 优化了系统设置切换栏的CSS样式
Mar 15, 2019
6ed63e3
增加F2FPay自定义商品名选项,完善F2FPay设置注释
Mar 17, 2019
e59cc3e
修复Kitsunebi不可用的问题
Mar 17, 2019
6847cbe
Update 20190317.sql
Mar 17, 2019
da38cd7
极验验证码逻辑优化
Mar 18, 2019
2b69d37
Merge pull request #1481 from mlgexyz/master
Scyllaly Mar 18, 2019
fdb95f6
优化Geetest验证并新增Google reCAPTCHA
Mar 20, 2019
6dbdf7f
优化Geetest验证并新增Goole reCAPTCHA验证
Mar 20, 2019
d8181b9
整理数据库
Mar 20, 2019
9dddfb4
添加注册界面验证码和sql语句文件
Mar 21, 2019
b1760fb
更新 03.17 和 03.21 的 sql语句 到 db.sql
Mar 21, 2019
d33bd9e
更新env配置
Mar 21, 2019
2597834
restore readme.md
Mar 21, 2019
7ee1d06
暂时解决 多人提到的 Class translator does not exist 错误
Mar 21, 2019
f51b437
更新GoogleNoCAPTCHA移动端适配
Mar 21, 2019
8223b9c
Merge pull request #1495 from mlgexyz/branch1
Scyllaly Mar 22, 2019
be6347e
解决 Class translator does not exist 错误
Mar 22, 2019
4082ec7
Merge branch 'master' into master
Mar 22, 2019
fe8ad50
Merge pull request #1498 from MIseChow/master
Scyllaly Mar 25, 2019
16a8987
merge geetest & recaptcha
lordlezehaf Mar 25, 2019
e2257b6
merge geetest & recaptcha
lordlezehaf Mar 25, 2019
ab56fa5
Update Article
Mar 25, 2019
f1e5af8
Add Default Article
Mar 28, 2019
8580c2d
Merge pull request #1506 from mlgexyz/branch1
Scyllaly Mar 29, 2019
e1a4ab6
1.MERGED
lordlezehaf Mar 29, 2019
693b671
“修复验证码无法隐藏的问题”
Mar 31, 2019
bc04303
“修复使用教程缩进问题”
Mar 31, 2019
ada7a34
Merge pull request #1514 from mlgexyz/branch2
Scyllaly Apr 1, 2019
5eda890
Merge pull request #1513 from mlgexyz/branch1
Scyllaly Apr 1, 2019
51dca54
日常开发
lordlezehaf Apr 3, 2019
1ad5979
可以自定义生成的邀请码的有效期
lordlezehaf Apr 4, 2019
ecf868e
代码优化,引入软删除
Scyllaly Apr 7, 2019
638a271
适配Quantumult订阅 #1538
lordlezehaf Apr 8, 2019
dbde0a2
加入中转节点
Scyllaly Apr 8, 2019
d8ace0b
加入shadowrocket订阅扫码 #1448
Scyllaly Apr 8, 2019
713da09
Update 20190408.sql
Scyllaly Apr 8, 2019
fc70e0d
中转节点屏蔽离线提醒
lordlezehaf Apr 9, 2019
69f755b
修正基佬提得BUG
lordlezehaf Apr 10, 2019
608e265
日常开发
lordlezehaf Apr 10, 2019
2b7d17d
使用验证器,精简代码
lordlezehaf Apr 15, 2019
0030677
使用验证器,精简代码
lordlezehaf Apr 15, 2019
5a80ca0
使用验证器,移除用户积分日志
lordlezehaf Apr 16, 2019
d7a5700
使用验证器,移除用户积分日志
lordlezehaf Apr 16, 2019
ba7d9a2
使用验证器,移除用户积分日志
lordlezehaf Apr 16, 2019
a941f0d
使用验证器,移除用户积分日志
lordlezehaf Apr 16, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix scripts
  • Loading branch information
lordlezehaf committed Feb 14, 2019
commit a784af9a988f6bfc079a8813fd2ebf4810e99d68
2 changes: 1 addition & 1 deletion queue.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ps -ef | grep queue:work | grep -v grep
if [ $? -ne 0 ]
then
echo "start queue process successfully....."
nohup php artisan queue:work database --queue=default --timeout=60 --sleep=5 --tries=3 >> ./storage/logs/queue.log 2>&1 &
nohup php artisan queue:work database --queue=default --timeout=60 --sleep=5 --tries=3 >> ./queue.log 2>&1 &
else
echo "queue is running....."
fi
3 changes: 2 additions & 1 deletion update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ php composer.phar update
php composer.phar dumpautoload
php artisan key:generate
php artisan view:clear
php artisan cache:clear
php artisan cache:clear
chown -R www:www storage