diff --git a/.gitignore b/.gitignore index db1bb4b4..5e8d1478 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,4 @@ .DS_Store /vendor /config/.config.php -.idea/modules.xml -.idea/UIChanges.iml -.idea/vcs.xml -.idea/workspace.xml +/.idea \ No newline at end of file diff --git a/README.md b/README.md index 2c566fc6..f0d07768 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Image: ------------------- ![](https://github.com/galaxychuck/images/blob/master/5.jpg) -> f2f支付宝支付([需要代开当面付点我](https://t.me/shouyeren)) +> f2f支付宝支付([需要代开当面付点我](https://t.me/galaxyq)) ------------------- ![](https://github.com/galaxychuck/images/blob/master/6.jpg) diff --git a/app/Utils/TelegramProcess.php b/app/Utils/TelegramProcess.php index 2bf024b7..6d10d81b 100644 --- a/app/Utils/TelegramProcess.php +++ b/app/Utils/TelegramProcess.php @@ -21,20 +21,20 @@ class TelegramProcess break; case 'qd': if (!$user->isAbleToCheckin()) { - $bot->sendMessage($message->getChat()->getId(), "仟佰星云:您已经签到过了哦", $parseMode = null, $disablePreview = false, $replyToMessageId = $reply_to); + $bot->sendMessage($message->getChat()->getId(), " Config::get('appName') :您已经签到过了哦", $parseMode = null, $disablePreview = false, $replyToMessageId = $reply_to); break; } $traffic = rand(Config::get('checkinMin'), Config::get('checkinMax')); $user->transfer_enable = $user->transfer_enable + Tools::toMB($traffic); $user->last_check_in_time = time(); $user->save(); - $bot->sendMessage($message->getChat()->getId(), "走出屏障直达星云之上,只为了与你相遇!你获得了 ".$traffic." MB 流量!", $parseMode = null, $disablePreview = false, $replyToMessageId = $reply_to); + $bot->sendMessage($message->getChat()->getId(), "nico~nico~ni !你获得了 ".$traffic." MB 流量!", $parseMode = null, $disablePreview = false, $replyToMessageId = $reply_to); break; default: $bot->sendMessage($message->getChat()->getId(), "???", $parseMode = null, $disablePreview = false, $replyToMessageId = $reply_to); } } else { - $bot->sendMessage($message->getChat()->getId(), "您未绑定仟佰星云账号。请/help查看绑定步骤", $parseMode = null, $disablePreview = false, $replyToMessageId = $reply_to); + $bot->sendMessage($message->getChat()->getId(), "您未绑定 Config::get('appName') 账号。请/help查看绑定步骤", $parseMode = null, $disablePreview = false, $replyToMessageId = $reply_to); } } @@ -50,24 +50,23 @@ class TelegramProcess switch ($command) { case 'ping': - $bot->sendMessage($message->getChat()->getId(), 'Pong!仟佰星云的 群组ID 是 '.$message->getChat()->getId().',这个一般人没啥用!'); + $bot->sendMessage($message->getChat()->getId(), 'Pong! Config::get('appName') 的 群组ID 是 '.$message->getChat()->getId().',这个一般人没啥用!'); break; - case 'tb': - $bot->sendMessage($message->getChat()->getId(),"大爷,不支持淘宝了,请直接网站充值!"); - // $bot->sendMessage($message->getChat()->getId(), Tuling::chat($message->getFrom()->getId(), substr($message->getText(), 5))); + case 'chat': + $bot->sendMessage($message->getChat()->getId(), Tuling::chat($message->getFrom()->getId(), substr($message->getText(), 5))); break; - case 'cq': + case 'traffic': TelegramProcess::needbind_method($bot, $message, $command, $user); break; - case 'qd': + case 'checkin': TelegramProcess::needbind_method($bot, $message, $command, $user, $message->getMessageId()); break; case 'help': $help_list = "命令列表: /ping 获取群组ID - /tb 淘宝购买 - /cq 查询流量 - /qd 签到获取流量 + /chat 唠嗑 + /traffic 查询流量 + /checkin 签到获取流量 /help 获取帮助信息 绑定提示:您可以在网站里点击->资料编辑->滑到页面最下方->Telegram绑定->把二维码拍下来单独发送给TG机器人->绑定成功,机器人扫码登陆,数字登陆、签到等更多精彩功能等着您去发掘。 @@ -174,26 +173,25 @@ class TelegramProcess case 'ping': $bot->sendMessage($message->getChat()->getId(), 'Pong!这个群组的 ID 是 '.$message->getChat()->getId().'!', $parseMode = null, $disablePreview = false, $replyToMessageId = $message->getMessageId()); break; - case 'tb': - $bot->sendMessage($message->getChat()->getId(),"大爷,不支持淘宝了,请直接捐献!"); - // if ($message->getChat()->getId() == Config::get('telegram_chatid')) { - // $bot->sendMessage($message->getChat()->getId(), Tuling::chat($message->getFrom()->getId(), substr($message->getText(), 5)), $parseMode = null, $disablePreview = false, $replyToMessageId = $message->getMessageId()); - // } else { - // $bot->sendMessage($message->getChat()->getId(), '不约,叔叔我们不约。', $parseMode = null, $disablePreview = false, $replyToMessageId = $message->getMessageId()); - // } + case 'chat': + if ($message->getChat()->getId() == Config::get('telegram_chatid')) { + $bot->sendMessage($message->getChat()->getId(), Tuling::chat($message->getFrom()->getId(), substr($message->getText(), 5)), $parseMode = null, $disablePreview = false, $replyToMessageId = $message->getMessageId()); + } else { + $bot->sendMessage($message->getChat()->getId(), '不约,叔叔我们不约。', $parseMode = null, $disablePreview = false, $replyToMessageId = $message->getMessageId()); + } break; - case 'cq': + case 'traffic': TelegramProcess::needbind_method($bot, $message, $command, $user, $message->getMessageId()); break; - case 'qd': + case 'checkin': TelegramProcess::needbind_method($bot, $message, $command, $user, $message->getMessageId()); break; case 'help': $help_list_group = "命令列表: /ping 获取群组ID - /tb 淘宝购买 - /cq 查询流量 - /qd 签到获取流量 + /chat 唠嗑 + /traffic 查询流量 + /checkin 签到获取流量 /help 获取帮助信息 绑定提示:您可以在网站里点击->资料编辑->滑到页面最下方->Telegram绑定->把二维码拍下来单独发送给TG机器人->绑定成功,机器人扫码登陆,数字登陆、签到等更多精彩功能等着您去发掘。 diff --git a/public/favicon.ico b/public/favicon.ico index 8cca6d19..ba168abc 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/resources/views/material/user/announcement.tpl b/resources/views/material/user/announcement.tpl index 3b0541b7..60b21cf6 100644 --- a/resources/views/material/user/announcement.tpl +++ b/resources/views/material/user/announcement.tpl @@ -104,7 +104,7 @@

2:打开App Store 切换账号,并下载App

-

3:打开Safari,登录到仟佰星云的用户中心导入节点

+

3:打开Safari,登录到 {$config["appName"]} 的用户中心导入节点

附加:iOS快速连接

diff --git a/resources/views/material/user/edit.tpl b/resources/views/material/user/edit.tpl index 46e15906..8384f1ae 100644 --- a/resources/views/material/user/edit.tpl +++ b/resources/views/material/user/edit.tpl @@ -272,7 +272,7 @@ - +
@@ -334,7 +334,7 @@
- + {if $config['enable_telegram'] == 'true'}
diff --git a/resources/views/material/user/edit.tpl_back b/resources/views/material/user/edit.tpl_back deleted file mode 100644 index ba5358ae..00000000 --- a/resources/views/material/user/edit.tpl_back +++ /dev/null @@ -1,796 +0,0 @@ - - - -{include file='user/main.tpl'} - - - - - - - -
-
-
-

修改资料

-
-
-
-
- - - -
-
-
-
-
-

修改密码

-
- - -
- -
- - -
- -
- - -
-
-
-
- -
-
-
-
-
- -
-
-
-
-

连接密码修改

-

当前连接密码:{$user->passwd}

-
- - -
- -
-
-
- -
-
-
-
-
- -
-
-
-
-

加密方式修改

-

注意:SS 和 SSR 支持的加密方式有所不同,请根据实际情况来进行选择!

-

当前加密方式:{$user->method}

-
- - -
- -
-
-
- -
-
-
-
-
- -
-
-
-
-

联络方式修改

-

当前联络方式: - {if $user->im_type==1} - 微信 - {/if} - - {if $user->im_type==2} - QQ - {/if} - - {if $user->im_type==3} - Google+ - {/if} - - {if $user->im_type==4} - Telegram - {/if} - - {$user->im_value}

-
- - -
- -
- - -
- -
-
-
- -
-
-
-
-
- - - -
-
-
-
-

协议&混淆设置

-

当前协议:{$user->protocol}

-

注意1:如果需要兼容原版SS请选择带_compatible的兼容选项!

-

注意2:如果您使用原版 SS 客户端此处请直接设置为 origin!

-
- - -
- -
- -
-

当前混淆方式:{$user->obfs}

-

注意1:如果需要兼容原版SS请选择带_compatible的兼容选项!

-

注意2:SS 和 SSR 支持的混淆类型有所不同,simple_obfs_* 为原版 SS 的混淆方式,其他为 SSR 的混淆方式!

-
- - -
-
- -
-
- -
-
-
-
-
- - - - - - - -
-
-
-
-

主题修改

-

当前主题:{$user->theme}

-
- - -
- - -
-
- -
-
-
-
-
-
-
- - -
- -
-
-
-
-

IP解封

-

当前状态:{$Block}

- -
-
-
- -
-
-
-
-
- - - -
-
-
-
-

每日邮件接收设置

-

当前设置:{if $user->sendDailyMail==1} 发送 {else} 不发送 {/if}

-
- - -
- -
-
-
- -
-
-
-
-
- - - - - -
-
-
-
-

重置端口

-

当前端口:{$user->port}

- -
-
-
- -
-
-
-
-
- -
-
-
-
-

自定义ACL/PAC/Surge

-

您可以在此处追加 Gfwlist 规则。

-

格式参看https://adblockplus.org/zh_CN/filters

-

IP 段请使用 |127.0.0.0/8 类似格式表示

-
- - -
- -
-
-
- -
-
-
-
-
- - {if $config['enable_telegram'] == 'true'} -
-
-
-
-

Telegram 绑定

-

Telegram 添加机器人账号 @{$telegram_bot},拍下下面这张二维码发给它。

-
-
-
- {if $user->telegram_id != 0}当前绑定:@{$user->im_value}{/if} -
-
- -
- -
-
-
- {/if} -
- - - - - {include file='dialog.tpl'} - -
-
-
- - - - - - - -{include file='user/footer.tpl'} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/views/material/user/footer.tpl b/resources/views/material/user/footer.tpl index bd718a1b..234e4339 100644 --- a/resources/views/material/user/footer.tpl +++ b/resources/views/material/user/footer.tpl @@ -1,6 +1,6 @@