Compare commits

...

172 Commits

Author SHA1 Message Date
Max 9a3312c431 Revert "Merge branch 'dev' into 'malio'"
This reverts merge request !21
7 years ago
maxitio b82784d6b2 fix 7 years ago
Max 735ad282c9 Merge branch 'dev' into 'malio'
PR 2019-11-30

See merge request maxitio/malio-theme-for-sspanel!21
7 years ago
Max 581585cdb6 Merge branch 'malio' into 'dev'
# Conflicts:
#   README.md
#   app/Command/Update.php
#   app/Controllers/AuthController.php
#   app/Controllers/UserController.php
#   app/Middleware/Mod_Mu.php
#   app/Models/User.php
#   app/Services/Gateway/TomatoPay.php
#   app/Services/Gateway/YftPayUtil.php
#   app/Services/Payment.php
#   app/Utils/TelegramProcess.php
#   app/Utils/URL.php
#   config/.config.example.php
#   config/routes.php
7 years ago
GeekQu 2911b9e7a7
Merge branch 'pr/60' into dev 7 years ago
GeekQu 8b004688c9
修复端口偏移 7 years ago
GeekQu 457e4277ca
用户修改连接密码、重置端口、更改加密协议混淆、重置订阅链接、以及删除账户时自动清理订阅缓存 7 years ago
GeekQu 96db900a6b
增强判断 7 years ago
GeekQu b57f817475
Merge pull request #44 from Anankke/dev
merge 20191128
7 years ago
Rico 659bc38af8 逗比了,正常的 7 years ago
Rico c210019290 添加小火箭h2订阅,暂时不允许 跳过证书验证,应为测试连不上 7 years ago
Rico 894cec5373 修复 节点显示问题 7 years ago
Rico aa1fe9be44 1.删除用户页面v2ray中转设置
2.管理员中转配置,Port是指本地监听,只能中转V2ray相关节点配置
7 years ago
Rico c2a09434b9 增加kit对tls的支持,增加kit对h2的订阅支持,clash过滤h2协议,shadowrocket过滤h2,quan 过滤h2 7 years ago
Rico 95e96d2c99 测试增加小火箭 mkcp订阅支持 7 years ago
Rico e5e244d0b4 修复 V2rayNG 教程链接 7 years ago
Rico 4cabe238f9 修复 quan的完整订阅 tgbot 7 years ago
Rico 16f003a1bb 修复 clash tag的问题 傻逼bug 7 years ago
Rico ee6f8b86db Merge branch 'no_ymq_dev' into dev 7 years ago
Rico c9b3d22040 修复 流水统计的报错 7 years ago
SakuraSa233 57de09ea4a
fix(vue-controller): default return 7 years ago
SakuraSa233 ab60f5c7c8
fix(vue): return type, logic, bad code style(incompletely) 7 years ago
laurieryayoi d68337872e fix console.log warning 7 years ago
Sukka b6135efc88
github(issue_template): add zh-CN version 7 years ago
laurieryayoi e7ac0b9562 布尔值判断去引号 & 添加nodeinfo相关代码 7 years ago
laurieryayoi d809788106 Merge branch 'dev' of https://github.com/Anankke/SSPanel-Uim into dev 7 years ago
laurieryayoi c2bf1dc952 添加nodeinfo api 7 years ago
SakuraSa233 be32a13c9b
feat(github): multi issue template 7 years ago
GeekQu 777c409031
修改 ss-v2ray-plugin 节点默认 host 为 microsoft.com 7 years ago
GeekQu e7700ee755
修复漏写 getUri()... 7 years ago
GeekQu c7d2b5f614
订阅信息缓存 7 years ago
SakuraSa233 30654b7cd2
clean(trimepay): clean template file 7 years ago
SakuraSa233 a647590326
Revert "clean(payment): remove unused paymentwall"
This reverts commit 67af63b052.
7 years ago
SakuraSa233 931eb9d1d2
refactor(controller): base slim-http native json output 7 years ago
Rico d3c1ae3f20 改成布朗 7 years ago
Rico 3c84838193 明确问题 7 years ago
Rico aded91b730 增加开关是否验证node ip 7 years ago
SakuraSa233 e1127e863a
refactor(qrcode): local decode with better perf 7 years ago
SakuraSa233 9b0cd43a2e
clean(services): remove empty cache class 7 years ago
SakuraSa233 e9e59e4dcb
clean(service): remove unused "token" 7 years ago
SakuraSa233 6996425e9b
clean(auth): remove empty class 7 years ago
SakuraSa233 67af63b052
clean(payment): remove unused paymentwall 7 years ago
SakuraSa233 0449eed1fe
fix(ci): boolean config variable 7 years ago
GeekQu b8d383f8f3
可用 Xcat 执行配置新增检测 7 years ago
GeekQu f0cb4b710a
修复 7 years ago
GeekQu 4f312527ae
网站配置 7 years ago
Anankke d69fb6b1b8
Merge pull request #870 from regendsoh/patch-1
Fix: Remove preset value of $_ENV['reg_obfs_param']
7 years ago
Anankke 000abaa4d7
Merge pull request #872 from xcxnig/dev
clean(discord): remove invalid discord config
7 years ago
Miku 9dfd9e992a
Update UserController.php 7 years ago
Miku 90f11f9e50
Update config.php 7 years ago
Miku 8bfa574c7f
Update Config.php 7 years ago
Regend Soh ad160e46f7
Fix: Remove preset value of $_ENV['reg_obfs_param']
To avoid problem when setting up SSPanel for idiotic user.
防止傻逼不会弄单端口
7 years ago
TheCGDF 38283cf96d 调整:当余额高于auto_clean_min_money时,即使账户到期后也不会被删除。避免歧义 7 years ago
錢爸爸 67334f8abf
Change style 7 years ago
錢爸爸 56ebebf928
Change style 7 years ago
GeekQu 8546a43f9e
修复 7 years ago
GeekQu 895410e80f
术后修复 7 years ago
GeekQu 3c063f5b4b
Merge branch 'pr/43' into dev 7 years ago
Anankke ccac5960ff
Merge pull request #867 from xcxnig/dev
Optimize link alignment
7 years ago
Miku 9c905ff215
Optimize link alignment 7 years ago
SakuraSa233 051ffc57f9
clean(cloudxns): remove mostly unused cloudxns 7 years ago
SakuraSa233 74e5f87b84
feat(conf): un-string variable type 7 years ago
SakuraSa233 d01adce482
clean(discord): remove invalid discord bot 7 years ago
SakuraSa233 8d7e1f9293
refactor(middleware): refactor ModMu for better perf(?) 7 years ago
SakuraSa233 0fecd8600b
perf(auth): user identification cache 7 years ago
SakuraSa233 082f7c5a00
fix(middleware): correct comment 7 years ago
SakuraSa233 e40e820135
clean(utils): remove unused Helper class 7 years ago
SakuraSa233 d06ebb83c4
refactor(middleware): style refactor and optimize 7 years ago
SakuraSa233 2dbdf2a25c
clean(controller): remove prorietary ApiController 7 years ago
SakuraSa233 a98ff85079
clean(utils): remove unused utils classes 7 years ago
SakuraSa233 6be1abfaf1
fix(tmt-pay): response return 7 years ago
SakuraSa233 83db32626f
clean(services): remove unused Slim class 7 years ago
SakuraSa233 b56272fe07
clean(controller): remove prorietary client api controller 7 years ago
GeekQu 588696234e
更新说明 7 years ago
Rico cf12b34262 修改flag,看着不是很丑了 7 years ago
Rico dfa3e01157 中转tls,clash 增加skip-cert-verify=true 7 years ago
Anankke be379f66a9
Merge pull request #860 from zeva20/bugfix
fix(user) Fix missing obfs_param data
7 years ago
zeva20 accd82e754 fix(user) Fix missing obfs_param data 7 years ago
Rico ff2d944dbe 出去多余的一栏bitpay 7 years ago
錢爸爸 0a4f629226
random gravatar avatar 7 years ago
GeekQu eed442a52b
Update PortAutoChange.php 7 years ago
GeekQu 3aabb5c58a PortAutoChange 7 years ago
Rico 52b1e8ca1d 修改quan,在有relayserver和tls的前提下,允许非安全 7 years ago
GeekQu 245f584a9e 修复 IPv6 访问订阅出现的问题 7 years ago
Rico 273e6c39c2 修改小火箭,在有relayserver和tls的前提下,允许非安全 7 years ago
錢爸爸 da7ca38780
admin/user add obfs_param
就是喜歡在web直接水Commit
7 years ago
錢爸爸 30e24b24c3
admin/user add obfs_param 7 years ago
SakuraSa233 c0eee00f74
refactor(tmtpay): style refactor and code optimize 7 years ago
SakuraSa233 6d918b8c11
feat(payment): add comments for AbstractPayment function 7 years ago
SakuraSa233 1c6b49555d
fix(routes): remove Mu middleware and controller 7 years ago
SakuraSa233 04899474d3
fix(tree): remove unused files 7 years ago
SakuraSa233 c358c7ae45
fix(payment): remove invalid DoiAmPay 7 years ago
SakuraSa233 fd4aa61bb9
fix(payment): remove invalid TrimePay 7 years ago
Regend Soh 1279aea9cf Fix: MySQL 8.0 support for income calculation (#856)
* Fix: MySQL 8.0 support for income calculation

* Fix: MySQL 8.0 support for income calculation
7 years ago
Regend Soh 110229fe5a feat: 接入番茄支付平台 (#855)
这是好的
7 years ago
錢爸爸 6c2830c0db
Update README.md 7 years ago
GeekQu 30e7577b86 Create PortAutoChange.php 7 years ago
Anankke 9b0005b013
Merge pull request #850 from regendsoh/patch-3
Fix bug: display last month Income
7 years ago
Regend Soh e4329a7661
Fix bug: display last month Income
Ref: https://stackoverflow.com/questions/19727274/strtotime-bug-when-using-1-month-from-january
7 years ago
Anankke 9f24cffb73
Merge pull request #849 from GeekQu/Anankke_dev
包含订阅信息的客户端下载方式
7 years ago
GeekQu 2db61fb807 包含订阅信息的客户端下载方式 7 years ago
GeekQu cf4b62966c
Merge pull request #42 from Anankke/dev
merge 20191027
7 years ago
Anankke 1a8dd4d873
Merge pull request #846 from regendsoh/patch-2
Simplify if...else statement from previous commit
7 years ago
Regend Soh d217000ca2
Simplify if...else statement from previous commit
as mentioned.
7 years ago
SakuraSa233 a2e471d9f9
fix(composer): lost pagination
fix #844
7 years ago
Anankke 2782c532cc
Merge pull request #845 from regendsoh/patch-1
Fix bug for income calculation
7 years ago
Regend Soh 532f2f457f
Fix bug for income calculation
Fix bug as mentioned by @topjohncian
7 years ago
Anankke 9601dd3aa6
Merge pull request #835 from lifespy/dev
新增易付支付
7 years ago
GeekQu 7911c76057
Merge pull request #59 from GeekQu/dev
修复 Shadowrocket ss-v2ray-plugin 节点的编码错误
7 years ago
GeekQu 12ccc306d8 +1 7 years ago
GeekQu 60e82fc07f 修改客户端下载链接 7 years ago
GeekQu e9fa797b25 修复 Shadowrocket ss-v2ray-plugin 节点的编码错误 7 years ago
GeekQu b24f68098e ss && ssd 7 years ago
GeekQu 77c7f2e8c9 fix 7 years ago
TheCGDF c7140d35ad 修复签到后流量显示异常 7 years ago
GeekQu 42cf1b8749 Create README.md 7 years ago
GeekQu 31b53a0052 getPcClient 7 years ago
laurieryayoi 0e3e64b952 fix no-empty bug 7 years ago
laurieryayoi 2806ea97fa 节点列表v1 7 years ago
GeekQu f955323d3c getPcClient 7 years ago
GeekQu 0a4cda9047
Merge pull request #58 from GeekQu/dev
20191015
7 years ago
GeekQu 764b300582 修复 Surge 4 使用 Surge 2 规则的问题 7 years ago
GeekQu a8470bb0a3 修复缺失的判断 7 years ago
GeekQu 7a7ec8a192 分离 YAML2Array 7 years ago
GeekQu fea0fc9580 telegram 推送自定义设置 2 7 years ago
GeekQu 5bc4a557b7 修改 sendDiary_Msg 7 years ago
SakuraSa233 972bd1ede8
feat(git): update contribute guide 7 years ago
SakuraSa233 8082ea7bb2
feat(controller): refactor HomeController as standard 7 years ago
SakuraSa233 093dbc3d48
fix(composer): clean php dependencies 7 years ago
GeekQu 805e602d5a telegram 推送自定义设置 7 years ago
GeekQu a835ba415b Update ConfController.php 7 years ago
GeekQu ae58db22ee 术后修复 7 years ago
GeekQu 647efbecc7 Merge branch 'pr/41' into dev 7 years ago
Anankke 51a10a31b6
Merge pull request #838 from NS-Sp4ce/dev
修复安卓V2RayNG链接错误
7 years ago
Sp4ce 7fc7046290
修复安卓V2RayNG链接错误
修复安卓V2RayNG链接错误
7 years ago
GeekQu 44bcbbcb6f 修复 Base64_url_encode 带来的兼容问题 7 years ago
GeekQu 7a7a7d8044 2333 7 years ago
GeekQu 7516dfcf83 修复 Quantumult SS 订阅的兼容问题 7 years ago
GeekQu 87d178fd29 Update index.tpl 7 years ago
GeekQu 36799fc57b 为 Clash VMess 加入 udp 字段 7 years ago
GeekQu 9beb73c5a0 重写订阅中的用户账户到期及流量展示,现在可以在 Config 配置为订阅添加一些简短的公告了 7 years ago
GeekQu f4c1688f84 可移除 SS 节点名称中的站点名 7 years ago
lifespy c4e38e84d3 yft 7 years ago
GeekQu 53c9578796 解决 Quantumult SS 订阅提示无 group 的问题 7 years ago
GeekQu 6dab034a26 emoji 7 years ago
TheCGDF 275941191f V2rayU -> ssr-download 7 years ago
laurieryayoi ed70ab3ed8 替换update中的System_config为_ENV 7 years ago
Regend Soh d747eedadd config: update default params(#829)
避免小白继续祸害各大运营商IP
7 years ago
錢爸爸 576e9e5b98
Update README.md 7 years ago
錢爸爸 8d5b103234
fix:Gravatar url 7 years ago
Anankke e42e5ee3e0 refactor: 129137b773 (r35233741) 7 years ago
SukkaW e1907e3b7b refactor(gravatar): minor updates 7 years ago
Regend Soh 8916041998 feat: add copy button for node SSR and SS link (#816)
* Add copy button for node SSR and SS link

* Remove unnecessary script
7 years ago
Regend Soh c92a52df64 feat: add function to display disable reason for disabled accounts (#815)
* Add disableReason Function

* Added disable reason based on 审计规则
7 years ago
錢爸爸 a7503a8207
Restore Gravatar function & Add set Avatar 7 years ago
錢爸爸 129137b773
Restore Gravatar function 7 years ago
Regend Soh 84ad7f2bf3 feat: add paid user count feature (#814)
* Add paidUserCount function

* Add display of paidUserCount
7 years ago
Regend Soh 89ea1b75d8 feat: add display income feature (#813)
* Adding income calculation function

Below functions are added:
- yesterday_income()
- today_income()
- this_month_income()
- last_month_income()
- total_income()

* Add income display on /admin/code page

Display the following information at /admin/code
- Today's income
- Yesterday's income
- This month's income
- Last month's income
- Total income

* Reformatting code style

Reformat the code, attempting to follow the standard required.

* Refactor to camel case naming

* Refactor to camel case naming

* Reformat due to spacing and tabbing issue
7 years ago
Anankke 797bd35f1b revert: "fix(init): remove default http forward header handle"
This reverts commit 040e987a
7 years ago
SakuraSa233 189bbf9026
fix(ci): sync test config file 7 years ago
SakuraSa233 91b2bf2016
feat(config): store config to $_ENV 7 years ago
SakuraSa233 fb8bd622fb
clean(services\config): unused env set function 7 years ago
SakuraSa233 040e987aa6
fix(init): remove default http forward header handle 7 years ago
Regend Soh badc98f29e feat(admin): add aff id change function
* 添加修改用户邀请者

* 添加 chginvite 路由

* 添加chgInvite function
7 years ago
Anankke 76d7d586d9
Merge pull request #807 from wewall/patch-2
fix error(user/index): rm obsolete code
7 years ago
围墙 bc05bb18ff
fix error(user/index): rm obsolete code 7 years ago
NimaQu 66f8d8bc8f
Update README.md 7 years ago
Anankke 85306ae54d
Merge pull request #803 from pang-w/dev
#801 修复暴力获取mu参数引发的错误。
7 years ago
Pw 8d5122c7b4 * 修复暴力获取mu参数引发的错误。
* 简单优化没有mu参数的逻辑。
7 years ago
GeekQu bb805d65a4 Merge branch 'pr/40' into Anankke_dev 7 years ago
GeekQu 0a94ae0778 +1 8 years ago
GeekQu c9b0573f43 修正 Clash ss 节点异常输出 obfs-host 8 years ago

@ -2031,6 +2031,55 @@ class UserController extends BaseController
return $this->view()->assign('logs', $logs)->assign('iplocation', $iplocation)->display('user/subscribe_log.tpl');
}
public function getPcClient($request, $response, $args)
{
$zipArc = new \ZipArchive();
$user_token = LinkController::GenerateSSRSubCode($this->user->id, 0);
$type = trim($request->getQueryParams()['type']);
// 临时文件存放路径
$temp_file_path = '../storage/';
// 客户端文件存放路径
$client_path = '../resources/clients/';
switch ($type) {
case 'ss-win':
$temp_file_path .= $type . '_' . $user_token . '.zip';
$user_config_file_name = 'gui-config.json';
$content = LinkController::getSSPcConf($this->user);
$client_path .= $type . '/';
break;
case 'ssd-win':
$temp_file_path .= $type . '_' . $user_token . '.zip';
$user_config_file_name = 'gui-config.json';
$content = LinkController::getSSDPcConf($this->user);
$client_path .= $type . '/';
break;
case 'ssr-win':
$temp_file_path .= $type . '_' . $user_token . '.zip';
$user_config_file_name = 'gui-config.json';
$content = LinkController::getSSRPcConf($this->user);
$client_path .= $type . '/';
break;
default:
return 'gg';
}
// 文件存在则先删除
if (is_file($temp_file_path)) {
unlink($temp_file_path);
}
// 超链接文件内容
$site_url_content = '[InternetShortcut]' . PHP_EOL . 'URL=' . Config::get('baseUrl');
// 创建 zip 并添加内容
$zipArc->open($temp_file_path, \ZipArchive::CREATE);
$zipArc->addFromString($user_config_file_name, $content);
$zipArc->addFromString('点击访问_' . Config::get('appName') . '.url', $site_url_content);
Tools::folderToZip($client_path, $zipArc, strlen($client_path));
$zipArc->close();
$newResponse = $response->withHeader('Content-type', ' application/octet-stream')->withHeader('Content-Disposition', ' attachment; filename=' . $type . '.zip');
$newResponse->getBody()->write(file_get_contents($temp_file_path));
unlink($temp_file_path);
return $newResponse;
}
public function getmoney($request, $response, $args)
{
$user = $this->user;
@ -2102,5 +2151,6 @@ class UserController extends BaseController
public function share_account($request, $response, $args)
{
return $this->view()->display('user/share_account.tpl');
}
}
}

Loading…
Cancel
Save