From db6e416bae47bca75e57e5ad090f68fcee601781 Mon Sep 17 00:00:00 2001 From: Rico Date: Wed, 27 Mar 2019 04:18:46 +1100 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20if=20tag=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=85=B3=E9=97=AD=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/material/user/edit.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/material/user/edit.tpl b/resources/views/material/user/edit.tpl index fd580c9d..eb064b6a 100755 --- a/resources/views/material/user/edit.tpl +++ b/resources/views/material/user/edit.tpl @@ -391,7 +391,7 @@ {if $user->discord == 0}

私聊发给 Discord 机器人 以绑定 Discord

{/if} - + {/if}
From a090b9ce6b8c8cc479c0147f08f59a26ea170e94 Mon Sep 17 00:00:00 2001 From: CGDF <17256673+CGDF-Github@users.noreply.github.com> Date: Thu, 28 Mar 2019 07:33:59 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmailgun=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Command/Job.php | 2 +- app/Services/Mail.php | 6 +++--- app/Services/Mail/Mailgun.php | 11 +++++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/Command/Job.php b/app/Command/Job.php index f7abe00d..cbe66dd5 100644 --- a/app/Command/Job.php +++ b/app/Command/Job.php @@ -62,7 +62,7 @@ class Job } else{ system('mysqldump --user='.Config::get('db_username').' --password='.Config::get('db_password').' --host='.$db_address_array[0].' '.(isset($db_address_array[1])?'-P '.$db_address_array[1]:'').' '.Config::get('db_database').' announcement auto blockip bought code coupon disconnect_ip link login_ip payback radius_ban shop speedtest ss_invite_code ss_node ss_password_reset ticket unblockip user user_token email_verify detect_list relay paylist> /tmp/ssmodbackup/mod.sql', $ret); - system('mysqldump --opt --user='.Config::get('db_username').' --password='.Config::get('db_password').' --host='.$db_address_array[0].' '.(isset($db_address_array[1])?'-P '.$db_address_array[1]:'').' -d '.Config::get('db_database').' alive_ip ss_node_info ss_node_online_log user_traffic_log detect_log telegram_session yft_order_info >> /tmp/ssmodbackup/mod.sql', $ret); + system('mysqldump --opt --user='.Config::get('db_username').' --password='.Config::get('db_password').' --host='.$db_address_array[0].' '.(isset($db_address_array[1])?'-P '.$db_address_array[1]:'').' -d '.Config::get('db_database').' alive_ip ss_node_info ss_node_online_log user_traffic_log detect_log telegram_session >> /tmp/ssmodbackup/mod.sql', $ret); if (Config::get('enable_radius')=='true') { $db_address_array = explode(':', Config::get('radius_db_host')); system('mysqldump --user='.Config::get('radius_db_user').' --password='.Config::get('radius_db_password').' --host='.$db_address_array[0].' '.(isset($db_address_array[1])?'-P '.$db_address_array[1]:'').''.Config::get('radius_db_database').'> /tmp/ssmodbackup/radius.sql', $ret); diff --git a/app/Services/Mail.php b/app/Services/Mail.php index 1b9c424a..851ac4a3 100644 --- a/app/Services/Mail.php +++ b/app/Services/Mail.php @@ -60,12 +60,12 @@ class Mail * @param $subject * @param $template * @param $ary - * @param $file + * @param $files * @return bool|void */ - public static function send($to, $subject, $template, $ary = [], $file = []) + public static function send($to, $subject, $template, $ary = [], $files = []) { $text = self::genHtml($template, $ary); - return self::getClient()->send($to, $subject, $text, $file); + return self::getClient()->send($to, $subject, $text, $files); } } diff --git a/app/Services/Mail/Mailgun.php b/app/Services/Mail/Mailgun.php index dd2bf20c..c680decd 100644 --- a/app/Services/Mail/Mailgun.php +++ b/app/Services/Mail/Mailgun.php @@ -29,15 +29,18 @@ class Mailgun extends Base ]; } - public function send($to, $subject, $text, $file) + public function send($to, $subject, $text, $files) { + $line=array(); + foreach($files as $file){ + array_push($line,array('filePath'=>$file, 'filename'=>'attachment')) + } $this->mg->messages()->send($this->domain,[ 'from' => $this->sender, 'to' => $to, 'subject' => $subject, - 'html' => $text - ],[ - 'inline' => $file + 'html' => $text + 'inline' => $inline ] ); } From 1afa771c5128ac85b47efa3e718ecaf62b349f5d Mon Sep 17 00:00:00 2001 From: Anankke Date: Wed, 27 Mar 2019 21:45:25 -0400 Subject: [PATCH 3/8] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0c62c62d..65bb0557 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ Telegram 频道 :https://t.me/sspanel_Uim +Telegram 非官方水群 :https://t.me/SSUnion 演示站: [sspanel.host](https://sspanel.host) 账号和密码都是 admin 对接节点的 mukey=NimaQu From 80e3368b75eb7ce02a5d24954abc80a08590612c Mon Sep 17 00:00:00 2001 From: CGDF <17256673+CGDF-Github@users.noreply.github.com> Date: Thu, 28 Mar 2019 14:43:37 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BF=AE=E5=A4=8Dmailgun?= =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/Mail/Mailgun.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/app/Services/Mail/Mailgun.php b/app/Services/Mail/Mailgun.php index c680decd..cbb73597 100644 --- a/app/Services/Mail/Mailgun.php +++ b/app/Services/Mail/Mailgun.php @@ -33,15 +33,26 @@ class Mailgun extends Base { $line=array(); foreach($files as $file){ - array_push($line,array('filePath'=>$file, 'filename'=>'attachment')) + array_push($line,array('filePath'=>$file, 'filename'=>'attachment')); } - $this->mg->messages()->send($this->domain,[ + if(count($line)==0){ + $this->mg->messages()->send($this->domain,[ 'from' => $this->sender, 'to' => $to, 'subject' => $subject, - 'html' => $text + 'html' => $text + ] + ); + } + else{ + $this->mg->messages()->send($this->domain,[ + 'from' => $this->sender, + 'to' => $to, + 'subject' => $subject, + 'html' => $text, 'inline' => $inline - ] - ); + ] + ); + } } } From eb24a832e40deade2bb3980423492b79fe2b5777 Mon Sep 17 00:00:00 2001 From: CGDF <17256673+CGDF-Github@users.noreply.github.com> Date: Thu, 28 Mar 2019 15:01:58 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=86=8D=E5=86=8D=E6=AC=A1=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dmailgub=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/Mail/Mailgun.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Services/Mail/Mailgun.php b/app/Services/Mail/Mailgun.php index cbb73597..c5a21e9a 100644 --- a/app/Services/Mail/Mailgun.php +++ b/app/Services/Mail/Mailgun.php @@ -31,11 +31,11 @@ class Mailgun extends Base public function send($to, $subject, $text, $files) { - $line=array(); + $inline=array(); foreach($files as $file){ - array_push($line,array('filePath'=>$file, 'filename'=>'attachment')); + array_push($inline,array('filePath'=>$file, 'filename'=>'attachment')); } - if(count($line)==0){ + if(count($inline)==0){ $this->mg->messages()->send($this->domain,[ 'from' => $this->sender, 'to' => $to, From 522ae6943183ff2f4dfd59f19651c1ad85e080c2 Mon Sep 17 00:00:00 2001 From: CGDF <17256673+CGDF-Github@users.noreply.github.com> Date: Thu, 28 Mar 2019 15:18:58 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E4=BF=A1?= =?UTF-8?q?=E9=99=84=E4=BB=B6name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/Mail/Mailgun.php | 2 +- app/Services/Mail/SendGrid.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Services/Mail/Mailgun.php b/app/Services/Mail/Mailgun.php index c5a21e9a..2743a866 100644 --- a/app/Services/Mail/Mailgun.php +++ b/app/Services/Mail/Mailgun.php @@ -33,7 +33,7 @@ class Mailgun extends Base { $inline=array(); foreach($files as $file){ - array_push($inline,array('filePath'=>$file, 'filename'=>'attachment')); + array_push($inline,array('filePath'=>$file, 'filename'=>basename($file))); } if(count($inline)==0){ $this->mg->messages()->send($this->domain,[ diff --git a/app/Services/Mail/SendGrid.php b/app/Services/Mail/SendGrid.php index 9431a235..6f836e16 100644 --- a/app/Services/Mail/SendGrid.php +++ b/app/Services/Mail/SendGrid.php @@ -37,7 +37,7 @@ class SendGrid extends Base $attachment = new \SendGrid\Attachment(); $attachment->setContent(base64_encode(file_get_contents($file))); $attachment->setType("application/octet-stream"); - $attachment->setFilename("backup.zip"); + $attachment->setFilename(basename($file)); $attachment->setDisposition("attachment"); $attachment->setContentId("backup"); $mail->addAttachment($attachment); From ee7a397231db303a39e001eeefbfb33916bed9c8 Mon Sep 17 00:00:00 2001 From: abc1763613206 <30773956+abc1763613206@users.noreply.github.com> Date: Thu, 28 Mar 2019 18:34:42 +0800 Subject: [PATCH 7/8] docs: fix links --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 65bb0557..0a9323a0 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ - **商店**:商品增加同时连接设备数,用户限速属性 - 从肥羊那里**抄**来的:新用户注册现金奖励|高等级节点体验|设备数量限制 - **优化**:css和js等置入本地提升加载速度 -- 增加**v2Ray** 功能,详情请看 [wiki](https://github.com/NimaQu/ss-panel-v3-mod_Uim/wiki/v2ray-%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B) +- 增加**v2Ray** 功能,详情请看 wiki: [Indexyz 版](https://github.com/Anankke/ss-panel-v3-mod_Uim/wiki/v2ray---indexyz-%E7%89%88%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B) | [Rico 版](https://github.com/Anankke/ss-panel-v3-mod_Uim/wiki/v2ray---Rico-%E7%89%88%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B) Telegram 频道 :https://t.me/sspanel_Uim From 93fa0b5ec97e363d0906d986f7641de948daf775 Mon Sep 17 00:00:00 2001 From: Rico Date: Sat, 30 Mar 2019 17:05:09 +1100 Subject: [PATCH 8/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E5=92=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A5=97=E9=A4=90=E7=9A=84post=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/Admin/UserController.php | 134 +++++++++++++++++ config/routes.php | 2 + resources/email/newuser.tpl | 182 +++++++++++++++++++++++ 3 files changed, 318 insertions(+) create mode 100644 resources/email/newuser.tpl diff --git a/app/Controllers/Admin/UserController.php b/app/Controllers/Admin/UserController.php index 3fd7ad21..255e0362 100644 --- a/app/Controllers/Admin/UserController.php +++ b/app/Controllers/Admin/UserController.php @@ -6,16 +6,20 @@ use App\Models\User; use App\Models\Code; use App\Models\Ip; use App\Models\RadiusBan; +use App\Models\Bought; use App\Models\Relay; use App\Controllers\AdminController; use App\Services\Config; use App\Services\Auth; +use App\Services\Mail; use App\Utils; use App\Utils\Hash; use App\Utils\Radius; use App\Utils\QQWry; +use App\Utils\Check; use App\Utils\Tools; + class UserController extends AdminController { public function index($request, $response, $args) @@ -38,6 +42,136 @@ class UserController extends AdminController $table_config['ajax_url'] = 'user/ajax'; return $this->view()->assign('table_config', $table_config)->display('admin/user/index.tpl'); } + public function createNewUser($request, $response, $args){ + # 需要一个 userEmail + $email = $request->getParam('userEmail'); + $email = trim($email); + $email = strtolower($email); + // check email format + if (!Check::isEmailLegal($email)) { + $res['ret'] = 0; + $res['msg'] = "邮箱无效"; + return $response->getBody()->write(json_encode($res)); + } + // check email + $user = User::where('email', $email)->first(); + if ($user != null) { + $res['ret'] = 0; + $res['msg'] = "邮箱已经被注册了"; + return $response->getBody()->write(json_encode($res)); + } + // do reg user + $user = new User(); + $pass = Tools::genRandomChar(8); + $user->user_name =$email; + $user->email = $email; + $user->pass = Hash::passwordHash($pass); + $user->passwd = Tools::genRandomChar(6); + $user->port = Tools::getAvPort(); + $user->t = 0; + $user->u = 0; + $user->d = 0; + $user->method = Config::get('reg_method'); + $user->protocol = Config::get('reg_protocol'); + $user->protocol_param = Config::get('reg_protocol_param'); + $user->obfs = Config::get('reg_obfs'); + $user->obfs_param = Config::get('reg_obfs_param'); + $user->forbidden_ip = Config::get('reg_forbidden_ip'); + $user->forbidden_port = Config::get('reg_forbidden_port'); + $user->im_type = 2; + $user->im_value = $email; + $user->transfer_enable = Tools::toGB(Config::get('defaultTraffic')); + $user->invite_num = Config::get('inviteNum'); + $user->auto_reset_day = Config::get('reg_auto_reset_day'); + $user->auto_reset_bandwidth = Config::get('reg_auto_reset_bandwidth'); + $user->money = 0; + $user->class_expire = date("Y-m-d H:i:s", time() + Config::get('user_class_expire_default') * 3600); + $user->class = Config::get('user_class_default'); + $user->node_connector = Config::get('user_conn'); + $user->node_speedlimit = Config::get('user_speedlimit'); + $user->expire_in = date("Y-m-d H:i:s", time() + Config::get('user_expire_in_default') * 86400); + $user->reg_date = date("Y-m-d H:i:s"); + $user->reg_ip = $_SERVER["REMOTE_ADDR"]; + $user->plan = 'A'; + $user->theme = Config::get('theme'); + + $groups=explode(",", Config::get('ramdom_group')); + + $user->node_group=$groups[array_rand($groups)]; + + $ga = new GA(); + $secret = $ga->createSecret(); + + $user->ga_token = $secret; + $user->ga_enable = 0; + if ($user->save()) { + $res['ret'] = 1; + $res['msg'] = "新用户注册成功 用户名: ".$email." 随机初始密码: ".$pass; + $res['email_error']="success"; + $subject = Config::get('appName')."-新用户注册通知"; + $to = $user->email; + $text = "您好,管理员已经为您生成账户,用户名: ".$email.",登录密码为:". $pass.",感谢您的支持。 " ; + try { + Mail::send($to, $subject, 'newuser.tpl', [ + "user" => $user,"text" => $text + ], [ + ]); + } catch (\Exception $e) { + $res['email_error'] = $e->getMessage(); + } + return $response->getBody()->write(json_encode($res)); + } + $res['ret'] = 0; + $res['msg'] = "未知错误"; + return $response->getBody()->write(json_encode($res)); + } + public function buy($request, $response, $args){ + #shop 信息可以通过 App\Controllers\UserController:shop 获得 + # 需要shopId,disableothers,autorenew,userEmail + + $shopId = $request->getParam('shopId'); + $shop = Shop::where("id", $shopId)->where("status", 1)->first(); + $disableothers = $request->getParam('disableothers'); + $autorenew = $request->getParam('autorenew'); + $email=$request->getParam("userEmail"); + $user = User::where("email",'=', $email)->first(); + if ($user==null){ + $result['ret'] = 0; + $result['msg'] = "未找到该用户"; + return $response->getBody()->write(json_encode($result)); + } + if ($shop == null) { + $result['ret'] = 0; + $result['msg'] = "请选择套餐"; + return $response->getBody()->write(json_encode($result)); + } + if ($disableothers == 1) { + $boughts = Bought::where("userid", $user->id)->get(); + foreach ($boughts as $disable_bought) { + $disable_bought->renew = 0; + $disable_bought->save(); + } + } + $bought = new Bought(); + $bought->userid = $user->id; + $bought->shopid = $shop->id; + $bought->datetime = time(); + if ($autorenew == 0 || $shop->auto_renew == 0) { + $bought->renew = 0; + } else { + $bought->renew = time() + $shop->auto_renew * 86400; + } + + $price = $shop->price; + $bought->price = $price; + $bought->save(); + + $shop->buy($user); + $result['ret'] = 1; + $result['msg'] = "套餐添加成功"; + return $response->getBody()->write(json_encode($result)); + } + public function search($request, $response, $args) { diff --git a/config/routes.php b/config/routes.php index 371f2f02..37544bb6 100755 --- a/config/routes.php +++ b/config/routes.php @@ -293,6 +293,8 @@ $app->group('/admin', function () { $this->delete('/user', 'App\Controllers\Admin\UserController:delete'); $this->post('/user/changetouser', 'App\Controllers\Admin\UserController:changetouser'); $this->post('/user/ajax', 'App\Controllers\Admin\UserController:ajax'); + $this->post('/user/create', 'App\Controllers\Admin\UserController:createNewUser'); + $this->post('/user/buy', 'App\Controllers\Admin\UserController:buy'); $this->get('/coupon', 'App\Controllers\AdminController:coupon'); diff --git a/resources/email/newuser.tpl b/resources/email/newuser.tpl new file mode 100644 index 00000000..aa9c0d7c --- /dev/null +++ b/resources/email/newuser.tpl @@ -0,0 +1,182 @@ + + + + + + Billing e.g. invoices and receipts + + + + + + + + + + + + + +
+
+ + + + +
+ + + + + + + + + + + + + + + + +
+

{$config["appName"]}

+
+

您的账户已经生成

+
+ + + + + + + + + +
Hi, {$user->user_name}
邮箱: {$user->email} +
{$text} +
+
+ {$config["appName"]} +
+
+
+ +
+
+ + \ No newline at end of file