mirror of
https://github.com/ProxyPanel/ProxyPanel.git
synced 2026-04-11 23:19:05 +00:00
Translation rework!!
This commit is contained in:
@@ -57,19 +57,19 @@ class UserController extends Controller
|
||||
}
|
||||
|
||||
return view('user.index', array_merge([
|
||||
'remainDays' => $expireTime < date('Y-m-d') ? -1 : Helpers::daysToNow($expireTime),
|
||||
'resetDays' => $user->reset_time ? Helpers::daysToNow($user->reset_time) : 0,
|
||||
'unusedTraffic' => flowAutoShow($unusedTraffic),
|
||||
'expireTime' => $expireTime,
|
||||
'banedTime' => $user->ban_time ?: 0,
|
||||
'unusedPercent' => $totalTransfer > 0 ? round($unusedTraffic / $totalTransfer, 2) * 100 : 0,
|
||||
'announcements' => Article::type(2)->take(5)->latest()->Paginate(1), // 公告
|
||||
'remainDays' => $expireTime < date('Y-m-d') ? -1 : Helpers::daysToNow($expireTime),
|
||||
'resetDays' => $user->reset_time ? Helpers::daysToNow($user->reset_time) : 0,
|
||||
'unusedTraffic' => flowAutoShow($unusedTraffic),
|
||||
'expireTime' => $expireTime,
|
||||
'banedTime' => $user->ban_time,
|
||||
'unusedPercent' => $totalTransfer > 0 ? round($unusedTraffic / $totalTransfer, 2) * 100 : 0,
|
||||
'announcements' => Article::type(2)->take(5)->latest()->Paginate(1), // 公告
|
||||
'isTrafficWarning' => $user->isTrafficWarning(), // 流量异常判断
|
||||
'paying_user' => $user->activePayingUser(), // 付费用户判断
|
||||
'userLoginLog' => $user->loginLogs()->latest()->first(), // 近期登录日志
|
||||
'paying_user' => $user->activePayingUser(), // 付费用户判断
|
||||
'userLoginLog' => $user->loginLogs()->latest()->first(), // 近期登录日志
|
||||
'subscribe_status' => $user->subscribe->status,
|
||||
'subType' => $subType,
|
||||
'subUrl' => route('sub', $user->subscribe->code),
|
||||
'subType' => $subType,
|
||||
'subUrl' => route('sub', $user->subscribe->code),
|
||||
], $this->dataFlowChart($user->id)));
|
||||
}
|
||||
|
||||
@@ -79,28 +79,28 @@ class UserController extends Controller
|
||||
$user = auth()->user();
|
||||
// 系统开启登录加积分功能才可以签到
|
||||
if (! sysConfig('is_checkin')) {
|
||||
return Response::json(['status' => 'fail', 'message' => '系统未开启签到功能']);
|
||||
return Response::json(['status' => 'fail', 'title' => trans('common.failed'), 'message' => trans('user.home.attendance.disable')]);
|
||||
}
|
||||
|
||||
// 已签到过,验证是否有效
|
||||
if (Cache::has('userCheckIn_'.$user->id)) {
|
||||
return Response::json(['status' => 'fail', 'message' => '已经签到过了,明天再来吧']);
|
||||
return Response::json(['status' => 'success', 'title' => trans('common.success'), 'message' => trans('user.home.attendance.done')]);
|
||||
}
|
||||
|
||||
$traffic = random_int((int) sysConfig('min_rand_traffic'), (int) sysConfig('max_rand_traffic')) * MB;
|
||||
|
||||
if (! $user->incrementData($traffic)) {
|
||||
return Response::json(['status' => 'fail', 'message' => '签到失败,系统异常']);
|
||||
return Response::json(['status' => 'fail', 'title' => trans('common.failed'), 'message' => trans('user.home.attendance.failed')]);
|
||||
}
|
||||
|
||||
// 写入用户流量变动记录
|
||||
Helpers::addUserTrafficModifyLog($user->id, null, $user->transfer_enable, $user->transfer_enable + $traffic, '[签到]');
|
||||
Helpers::addUserTrafficModifyLog($user->id, null, $user->transfer_enable, $user->transfer_enable + $traffic, trans('user.home.attendance.attribute'));
|
||||
|
||||
// 多久后可以再签到
|
||||
$ttl = sysConfig('traffic_limit_time') ? sysConfig('traffic_limit_time') * Minute : Day;
|
||||
Cache::put('userCheckIn_'.$user->id, '1', $ttl);
|
||||
|
||||
return Response::json(['status' => 'success', 'message' => '签到成功,系统送您 '.flowAutoShow($traffic).'流量']);
|
||||
return Response::json(['status' => 'success', 'message' => trans('user.home.attendance.success', ['data' => flowAutoShow($traffic)])]);
|
||||
}
|
||||
|
||||
// 节点列表
|
||||
@@ -138,54 +138,53 @@ class UserController extends Controller
|
||||
{
|
||||
$user = auth()->user();
|
||||
if ($request->isMethod('POST')) {
|
||||
$old_password = $request->input('old_password');
|
||||
$new_password = $request->input('new_password');
|
||||
$username = $request->input('username');
|
||||
$wechat = $request->input('wechat');
|
||||
$qq = $request->input('qq');
|
||||
$passwd = $request->input('passwd');
|
||||
|
||||
// 修改密码
|
||||
if ($old_password && $new_password) {
|
||||
if (! Hash::check($old_password, $user->password)) {
|
||||
return Redirect::back()->withErrors('旧密码错误,请重新输入');
|
||||
if ($request->has(['password', 'new_password'])) {
|
||||
$data = $request->only(['password', 'new_password']);
|
||||
|
||||
if (! Hash::check($data['password'], $user->password)) {
|
||||
return Redirect::back()->withErrors(trans('auth.password.reset.error.wrong'));
|
||||
}
|
||||
|
||||
if (Hash::check($new_password, $user->password)) {
|
||||
return Redirect::back()->withErrors('新密码不可与旧密码一样,请重新输入');
|
||||
if (Hash::check($data['new_password'], $user->password)) {
|
||||
return Redirect::back()->withErrors(trans('auth.password.reset.error.same'));
|
||||
}
|
||||
|
||||
// 演示环境禁止改管理员密码
|
||||
if ($user->id === 1 && config('app.demo')) {
|
||||
return Redirect::back()->withErrors('演示环境禁止修改管理员密码');
|
||||
return Redirect::back()->withErrors(trans('auth.password.reset.error.demo'));
|
||||
}
|
||||
|
||||
if (! $user->update(['password' => $new_password])) {
|
||||
return Redirect::back()->withErrors('修改失败');
|
||||
if (! $user->update(['password' => $data['new_password']])) {
|
||||
return Redirect::back()->withErrors(trans('common.update_action', ['action' => trans('common.failed')]));
|
||||
}
|
||||
|
||||
return Redirect::back()->with('successMsg', '修改成功');
|
||||
return Redirect::back()->with('successMsg', trans('common.update_action', ['action' => trans('common.success')]));
|
||||
// 修改代理密码
|
||||
}
|
||||
|
||||
if ($passwd) {
|
||||
if ($request->has('passwd')) {
|
||||
$passwd = $request->input('passwd');
|
||||
if (! $user->update(['passwd' => $passwd])) {
|
||||
return Redirect::back()->withErrors('修改失败');
|
||||
return Redirect::back()->withErrors(trans('common.update_action', ['action' => trans('common.failed')]));
|
||||
}
|
||||
|
||||
return Redirect::back()->with('successMsg', '修改成功');
|
||||
return Redirect::back()->with('successMsg', trans('common.update_action', ['action' => trans('common.success')]));
|
||||
}
|
||||
|
||||
// 修改联系方式
|
||||
if (empty($username)) {
|
||||
return Redirect::back()->withErrors('修改失败,昵称不能为空值');
|
||||
if ($request->has(['username', 'wechat', 'qq'])) {
|
||||
$data = $request->only(['username', 'wechat', 'qq']);
|
||||
if (empty($data['username'])) {
|
||||
return Redirect::back()->withErrors(trans('validation.required', ['attribute' => trans('validation.attributes.username')]));
|
||||
}
|
||||
|
||||
if (! $user->update($data)) {
|
||||
return Redirect::back()->withErrors(trans('common.update_action', ['action' => trans('common.failed')]));
|
||||
}
|
||||
}
|
||||
|
||||
if (! $user->update(['username' => $username, 'wechat' => $wechat, 'qq' => $qq])) {
|
||||
return Redirect::back()->withErrors('修改失败');
|
||||
}
|
||||
|
||||
return Redirect::back()->with('successMsg', '修改成功');
|
||||
return Redirect::back()->with('successMsg', trans('common.update_action', ['action' => trans('common.success')]));
|
||||
}
|
||||
|
||||
return view('user.profile');
|
||||
@@ -203,9 +202,9 @@ class UserController extends Controller
|
||||
|
||||
return view('user.services', [
|
||||
'chargeGoodsList' => Goods::type(3)->whereStatus(1)->orderBy('price')->limit(10)->get(),
|
||||
'goodsList' => Goods::whereStatus(1)->where('type', '<=', '2')->orderByDesc('type')->orderByDesc('sort')->paginate(10)->appends($request->except('page')),
|
||||
'renewTraffic' => $renewPrice->renew ?? 0,
|
||||
'dataPlusDays' => $dataPlusDays > date('Y-m-d') ? Helpers::daysToNow($dataPlusDays) : 0,
|
||||
'goodsList' => Goods::whereStatus(1)->where('type', '<=', '2')->orderByDesc('type')->orderByDesc('sort')->paginate(10)->appends($request->except('page')),
|
||||
'renewTraffic' => $renewPrice->renew ?? 0,
|
||||
'dataPlusDays' => $dataPlusDays > date('Y-m-d') ? Helpers::daysToNow($dataPlusDays) : 0,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -216,7 +215,7 @@ class UserController extends Controller
|
||||
$order = Order::userActivePlan()->firstOrFail();
|
||||
$renewCost = $order->goods->renew;
|
||||
if ($user->credit < $renewCost) {
|
||||
return Response::json(['status' => 'fail', 'message' => '余额不足,请充值余额']);
|
||||
return Response::json(['status' => 'fail', 'message' => trans('user.reset_data.lack')]);
|
||||
}
|
||||
|
||||
$user->update(['u' => 0, 'd' => 0]);
|
||||
@@ -225,9 +224,9 @@ class UserController extends Controller
|
||||
$user->updateCredit(-$renewCost);
|
||||
|
||||
// 记录余额操作日志
|
||||
Helpers::addUserCreditLog($user->id, null, $user->credit, $user->credit - $renewCost, -1 * $renewCost, '用户自行重置流量');
|
||||
Helpers::addUserCreditLog($user->id, null, $user->credit, $user->credit - $renewCost, -1 * $renewCost, trans('user.reset_data.logs'));
|
||||
|
||||
return Response::json(['status' => 'success', 'message' => '重置成功']);
|
||||
return Response::json(['status' => 'success', 'message' => trans('user.reset_data.success')]);
|
||||
}
|
||||
|
||||
// 工单
|
||||
@@ -242,7 +241,7 @@ class UserController extends Controller
|
||||
public function invoices(Request $request)
|
||||
{
|
||||
return view('user.invoices', [
|
||||
'orderList' => auth()->user()->orders()->with(['goods', 'payment'])->orderByDesc('id')->paginate(10)->appends($request->except('page')),
|
||||
'orderList' => auth()->user()->orders()->with(['goods', 'payment'])->orderByDesc('id')->paginate(10)->appends($request->except('page')),
|
||||
'prepaidPlan' => Order::userPrepay()->exists(),
|
||||
]);
|
||||
}
|
||||
@@ -255,13 +254,13 @@ class UserController extends Controller
|
||||
if ($activePlan->save()) {
|
||||
// 关闭先前套餐后,新套餐自动运行
|
||||
if (Order::userActivePlan()->exists()) {
|
||||
return Response::json(['status' => 'success', 'message' => '激活成功']);
|
||||
return Response::json(['status' => 'success', 'message' => trans('common.active_item', ['attribute' => trans('common.success')])]);
|
||||
}
|
||||
|
||||
return Response::json(['status' => 'success', 'message' => '关闭']);
|
||||
return Response::json(['status' => 'success', 'message' => trans('common.close')]);
|
||||
}
|
||||
|
||||
return Response::json(['status' => 'fail', 'message' => '关闭失败']);
|
||||
return Response::json(['status' => 'fail', 'message' => trans('common.close_item', ['attribute' => trans('common.failed')])]);
|
||||
}
|
||||
|
||||
// 订单明细
|
||||
@@ -279,12 +278,14 @@ class UserController extends Controller
|
||||
$content = str_replace(['atob', 'eval'], '', $content);
|
||||
|
||||
if (empty($title) || empty($content)) {
|
||||
return Response::json(['status' => 'fail', 'message' => '请输入标题和内容']);
|
||||
return Response::json([
|
||||
'status' => 'fail', 'message' => trans('validation.required', ['attribute' => trans('validation.attributes.title').'&'.trans('validation.attributes.content')]),
|
||||
]);
|
||||
}
|
||||
|
||||
if ($user->tickets()->create(['title' => $title, 'content' => $content])) {
|
||||
$emailTitle = '新工单提醒';
|
||||
$content = '标题:【'.$title.'】<br>用户:'.$user->email.'<br>内容:'.$content;
|
||||
if ($user->tickets()->create(compact('title', 'content'))) {
|
||||
$emailTitle = trans('common.new').trans('user.ticket.attribute');
|
||||
$content = trans('validation.attributes.title').':【'.$title.'】<br>'.trans('validation.attributes.email').':'.$user->email.'<br>'.trans('validation.attributes.content').':'.$content;
|
||||
|
||||
// 发邮件通知管理员
|
||||
if (sysConfig('webmaster_email')) {
|
||||
@@ -294,10 +295,10 @@ class UserController extends Controller
|
||||
|
||||
PushNotification::send($emailTitle, $content);
|
||||
|
||||
return Response::json(['status' => 'success', 'message' => '提交成功']);
|
||||
return Response::json(['status' => 'success', 'message' => trans('common.submit_item', ['attribute' => trans('common.success')])]);
|
||||
}
|
||||
|
||||
return Response::json(['status' => 'fail', 'message' => '提交失败']);
|
||||
return Response::json(['status' => 'fail', 'message' => trans('common.submit_item', ['attribute' => trans('common.failed')])]);
|
||||
}
|
||||
|
||||
// 回复工单
|
||||
@@ -311,11 +312,13 @@ class UserController extends Controller
|
||||
$content = substr(str_replace(['atob', 'eval'], '', clean($request->input('content'))), 0, 300);
|
||||
|
||||
if (empty($content)) {
|
||||
return Response::json(['status' => 'fail', 'message' => '回复内容不能为空']);
|
||||
return Response::json([
|
||||
'status' => 'fail', 'message' => trans('validation.required', ['attribute' => trans('validation.attributes.title').'&'.trans('validation.attributes.content')]),
|
||||
]);
|
||||
}
|
||||
|
||||
if ($ticket->status === 2) {
|
||||
return Response::json(['status' => 'fail', 'message' => '错误:该工单已关闭']);
|
||||
return Response::json(['status' => 'fail', 'message' => trans('user.ticket.failed_closed')]);
|
||||
}
|
||||
|
||||
if ($ticket->reply()->create(['user_id' => auth()->id(), 'content' => $content])) {
|
||||
@@ -323,8 +326,8 @@ class UserController extends Controller
|
||||
$ticket->status = 0;
|
||||
$ticket->save();
|
||||
|
||||
$title = '工单回复提醒';
|
||||
$content = '标题:【'.$ticket->title.'】<br>用户回复:'.$content;
|
||||
$title = trans('user.ticket.attribute').trans('user.ticket.reply');
|
||||
$content = trans('validation.attributes.title').':【'.$ticket->title.'】<br>'.trans('user.ticket.reply').':'.$content;
|
||||
|
||||
// 发邮件通知管理员
|
||||
if (sysConfig('webmaster_email')) {
|
||||
@@ -334,14 +337,14 @@ class UserController extends Controller
|
||||
|
||||
PushNotification::send($title, $content);
|
||||
|
||||
return Response::json(['status' => 'success', 'message' => '回复成功']);
|
||||
return Response::json(['status' => 'success', 'message' => trans('user.ticket.reply').trans('common.success')]);
|
||||
}
|
||||
|
||||
return Response::json(['status' => 'fail', 'message' => '回复失败']);
|
||||
return Response::json(['status' => 'fail', 'message' => trans('user.ticket.reply').trans('common.failed')]);
|
||||
}
|
||||
|
||||
return view('user.replyTicket', [
|
||||
'ticket' => $ticket,
|
||||
'ticket' => $ticket,
|
||||
'replyList' => $ticket->reply()->with('user')->oldest()->get(),
|
||||
]);
|
||||
}
|
||||
@@ -352,12 +355,12 @@ class UserController extends Controller
|
||||
$id = $request->input('id');
|
||||
|
||||
if (Ticket::uid()->whereId($id)->close()) {
|
||||
PushNotification::send('工单关闭提醒', '工单:ID'.$id.'用户已手动关闭');
|
||||
PushNotification::send(trans('common.close_item', ['attribute' => trans('user.ticket.attribute')]), trans('user.ticket.close_msg', ['id' => $id]));
|
||||
|
||||
return Response::json(['status' => 'success', 'message' => '关闭成功']);
|
||||
return Response::json(['status' => 'success', 'message' => trans('common.close_item', ['attribute' => trans('common.success')])]);
|
||||
}
|
||||
|
||||
return Response::json(['status' => 'fail', 'message' => '关闭失败']);
|
||||
return Response::json(['status' => 'fail', 'message' => trans('common.close_item', ['attribute' => trans('common.failed')])]);
|
||||
}
|
||||
|
||||
// 邀请码
|
||||
@@ -366,14 +369,14 @@ class UserController extends Controller
|
||||
if (Order::uid()->active()->where('origin_amount', '>', 0)->doesntExist()) {
|
||||
return Response::view(
|
||||
'auth.error',
|
||||
['message' => '本功能对非付费用户禁用!请 <a class="btn btn-sm btn-danger" href="/">返 回</a>'],
|
||||
['message' => trans('user.purchase_required').' <a class="btn btn-sm btn-danger" href="/">'.trans('common.back').'</a>'],
|
||||
402
|
||||
);
|
||||
}
|
||||
|
||||
return view('user.invite', [
|
||||
'num' => auth()->user()->invite_num, // 还可以生成的邀请码数量
|
||||
'inviteList' => Invite::uid()->with(['invitee', 'inviter'])->paginate(10), // 邀请码列表
|
||||
'num' => auth()->user()->invite_num, // 还可以生成的邀请码数量
|
||||
'inviteList' => Invite::uid()->with(['invitee', 'inviter'])->paginate(10), // 邀请码列表
|
||||
'referral_traffic' => flowAutoShow(sysConfig('referral_traffic') * MB),
|
||||
'referral_percent' => sysConfig('referral_percent'),
|
||||
]);
|
||||
@@ -384,7 +387,7 @@ class UserController extends Controller
|
||||
{
|
||||
$user = auth()->user();
|
||||
if ($user->invite_num <= 0) {
|
||||
return Response::json(['status' => 'fail', 'message' => '生成失败:已无邀请码生成名额']);
|
||||
return Response::json(['status' => 'fail', 'message' => trans('user.invite.generate_failed')]);
|
||||
}
|
||||
|
||||
$obj = new Invite();
|
||||
@@ -395,10 +398,10 @@ class UserController extends Controller
|
||||
if ($obj) {
|
||||
$user->update(['invite_num' => $user->invite_num - 1]);
|
||||
|
||||
return Response::json(['status' => 'success', 'message' => '生成成功']);
|
||||
return Response::json(['status' => 'success', 'message' => trans('common.generate_item', ['attribute' => trans('common.success')])]);
|
||||
}
|
||||
|
||||
return Response::json(['status' => 'fail', 'message' => '生成邀请码失败']);
|
||||
return Response::json(['status' => 'fail', 'message' => trans('common.generate_item', ['attribute' => trans('common.failed')])]);
|
||||
}
|
||||
|
||||
// 使用优惠券
|
||||
@@ -408,44 +411,46 @@ class UserController extends Controller
|
||||
$good_price = $request->input('price');
|
||||
|
||||
if (empty($coupon_sn)) {
|
||||
return Response::json(['status' => 'fail', 'title' => '使用失败', 'message' => '请输入您的优惠劵!']);
|
||||
return Response::json([
|
||||
'status' => 'fail', 'title' => trans('common.failed'), 'message' => trans('validation.required', ['attribute' => trans('user.coupon.attribute')]),
|
||||
]);
|
||||
}
|
||||
|
||||
$coupon = Coupon::whereSn($coupon_sn)->whereIn('type', [1, 2])->first();
|
||||
if (! $coupon) {
|
||||
return Response::json(['status' => 'fail', 'title' => '优惠券不存在', 'message' => '请确认优惠券是否输入正确!']);
|
||||
return Response::json(['status' => 'fail', 'title' => trans('common.failed'), 'message' => trans('user.unknown').trans('user.coupon.attribute')]);
|
||||
}
|
||||
|
||||
if ($coupon->status === 1) {
|
||||
return Response::json(['status' => 'fail', 'title' => '抱歉', 'message' => '优惠券已被使用!']);
|
||||
return Response::json(['status' => 'fail', 'title' => trans('common.sorry'), 'message' => trans('user.coupon.attribute').trans('user.status.used')]);
|
||||
}
|
||||
|
||||
if ($coupon->status === 2) {
|
||||
return Response::json(['status' => 'fail', 'title' => '抱歉', 'message' => '优惠券已失效!']);
|
||||
return Response::json(['status' => 'fail', 'title' => trans('common.sorry'), 'message' => trans('user.coupon.attribute').trans('user.status.expired')]);
|
||||
}
|
||||
|
||||
if ($coupon->end_time < time()) {
|
||||
if ($coupon->getRawOriginal('end_time') < time()) {
|
||||
$coupon->status = 2;
|
||||
$coupon->save();
|
||||
|
||||
return Response::json(['status' => 'fail', 'title' => '抱歉', 'message' => '优惠券已失效!']);
|
||||
return Response::json(['status' => 'fail', 'title' => trans('common.sorry'), 'message' => trans('user.coupon.attribute').trans('user.status.expired')]);
|
||||
}
|
||||
|
||||
if ($coupon->start_time > date('Y-m-d H:i:s')) {
|
||||
return Response::json(['status' => 'fail', 'title' => '优惠券尚未生效', 'message' => '请等待活动正式开启']);
|
||||
return Response::json(['status' => 'fail', 'title' => trans('user.coupon.inactive'), 'message' => trans('user.coupon.wait_active', ['time' => $coupon->start_time])]);
|
||||
}
|
||||
|
||||
if ($good_price < $coupon->rule) {
|
||||
return Response::json(['status' => 'fail', 'title' => '使用条件未满足', 'message' => '请购买价格更高的套餐']);
|
||||
return Response::json(['status' => 'fail', 'title' => trans('user.coupon.limit'), 'message' => trans('user.coupon.higher', ['amount' => $coupon->rule])]);
|
||||
}
|
||||
|
||||
$data = [
|
||||
'name' => $coupon->name,
|
||||
'type' => $coupon->type,
|
||||
'name' => $coupon->name,
|
||||
'type' => $coupon->type,
|
||||
'value' => $coupon->value,
|
||||
];
|
||||
|
||||
return Response::json(['status' => 'success', 'data' => $data, 'message' => '优惠券有效']);
|
||||
return Response::json(['status' => 'success', 'data' => $data, 'message' => trans('common.applied', ['attribute' => trans('user.coupon.attribute')])]);
|
||||
}
|
||||
|
||||
// 购买服务
|
||||
@@ -457,8 +462,8 @@ class UserController extends Controller
|
||||
|
||||
return view('user.buy', [
|
||||
'dataPlusDays' => $dataPlusDays > date('Y-m-d') ? Helpers::daysToNow($dataPlusDays) : 0,
|
||||
'activePlan' => Order::userActivePlan()->exists(),
|
||||
'goods' => $good,
|
||||
'activePlan' => Order::userActivePlan()->exists(),
|
||||
'goods' => $good,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -482,24 +487,24 @@ class UserController extends Controller
|
||||
$subscribe_link = route('sub', $subscribe->code);
|
||||
|
||||
return view('user.help', [
|
||||
'sub' => $data,
|
||||
'paying_user' => auth()->user()->activePayingUser(), // 付费用户判断
|
||||
'Shadowrocket_install' => 'itms-services://?action=download-manifest&url='.sysConfig('website_url').'/clients/Shadowrocket.plist', // 客户端安装
|
||||
'Quantumult_install' => 'itms-services://?action=download-manifest&url='.sysConfig('website_url').'/clients/Quantumult.plist', // 客户端安装
|
||||
'subscribe_status' => $subscribe->status, // 订阅连接
|
||||
'link' => $subscribe_link,
|
||||
'subscribe_link' => 'sub://'.base64url_encode($subscribe_link),
|
||||
'Shadowrocket_link' => 'shadowrocket://add/sub://'.base64url_encode($subscribe_link).'?remarks='.urlencode(sysConfig('website_name').' '.sysConfig('website_url')),
|
||||
'sub' => $data,
|
||||
'paying_user' => auth()->user()->activePayingUser(), // 付费用户判断
|
||||
'Shadowrocket_install' => 'itms-services://?action=download-manifest&url='.sysConfig('website_url').'/clients/Shadowrocket.plist', // 客户端安装
|
||||
'Quantumult_install' => 'itms-services://?action=download-manifest&url='.sysConfig('website_url').'/clients/Quantumult.plist', // 客户端安装
|
||||
'subscribe_status' => $subscribe->status, // 订阅连接
|
||||
'link' => $subscribe_link,
|
||||
'subscribe_link' => 'sub://'.base64url_encode($subscribe_link),
|
||||
'Shadowrocket_link' => 'shadowrocket://add/sub://'.base64url_encode($subscribe_link).'?remarks='.urlencode(sysConfig('website_name').' '.sysConfig('website_url')),
|
||||
'Shadowrocket_linkQrcode' => 'sub://'.base64url_encode($subscribe_link).'#'.base64url_encode(sysConfig('website_name')),
|
||||
'Clash_link' => "clash://install-config?url={$subscribe_link}",
|
||||
'Surge_link' => "surge:///install-config?url={$subscribe_link}",
|
||||
'Quantumultx' => 'quantumult-x:///update-configuration?remote-resource='.json_encode([
|
||||
'server_remote' => "{$subscribe_link}, tag=".urlencode(sysConfig('website_name').' '.sysConfig('website_url')),
|
||||
'filter_remote' => '',
|
||||
'Clash_link' => "clash://install-config?url={$subscribe_link}",
|
||||
'Surge_link' => "surge:///install-config?url={$subscribe_link}",
|
||||
'Quantumultx' => 'quantumult-x:///update-configuration?remote-resource='.json_encode([
|
||||
'server_remote' => "{$subscribe_link}, tag=".urlencode(sysConfig('website_name').' '.sysConfig('website_url')),
|
||||
'filter_remote' => '',
|
||||
'rewrite_remote' => '',
|
||||
]),
|
||||
'Quantumult_linkOut' => 'quantumult://configuration?server='.base64url_encode($subscribe_link).'&filter='.base64url_encode('https://raw.githubusercontent.com/ZBrettonYe/VPN-Rules-Collection/master/Profiles/Quantumult/Pro.conf').'&rejection='.base64url_encode('https://raw.githubusercontent.com/ZBrettonYe/VPN-Rules-Collection/master/Profiles/Quantumult/Rejection.conf'),
|
||||
'Quantumult_linkIn' => 'quantumult://configuration?server='.base64url_encode($subscribe_link).'&filter='.base64url_encode('https://raw.githubusercontent.com/ZBrettonYe/VPN-Rules-Collection/master/Profiles/Quantumult/BacktoCN.conf').'&rejection='.base64url_encode('https://raw.githubusercontent.com/ZBrettonYe/VPN-Rules-Collection/master/Profiles/Quantumult/Rejection.conf'),
|
||||
'Quantumult_linkOut' => 'quantumult://configuration?server='.base64url_encode($subscribe_link).'&filter='.base64url_encode('https://raw.githubusercontent.com/ZBrettonYe/VPN-Rules-Collection/master/Profiles/Quantumult/Pro.conf').'&rejection='.base64url_encode('https://raw.githubusercontent.com/ZBrettonYe/VPN-Rules-Collection/master/Profiles/Quantumult/Rejection.conf'),
|
||||
'Quantumult_linkIn' => 'quantumult://configuration?server='.base64url_encode($subscribe_link).'&filter='.base64url_encode('https://raw.githubusercontent.com/ZBrettonYe/VPN-Rules-Collection/master/Profiles/Quantumult/BacktoCN.conf').'&rejection='.base64url_encode('https://raw.githubusercontent.com/ZBrettonYe/VPN-Rules-Collection/master/Profiles/Quantumult/Rejection.conf'),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -517,13 +522,13 @@ class UserController extends Controller
|
||||
|
||||
DB::commit();
|
||||
|
||||
return Response::json(['status' => 'success', 'message' => '更换成功']);
|
||||
return Response::json(['status' => 'success', 'message' => trans('common.replace').trans('common.success')]);
|
||||
} catch (Exception $e) {
|
||||
DB::rollBack();
|
||||
|
||||
Log::error('更换订阅地址异常:'.$e->getMessage());
|
||||
Log::error(trans('user.subscribe.error').':'.$e->getMessage());
|
||||
|
||||
return Response::json(['status' => 'fail', 'message' => '更换失败'.$e->getMessage()]);
|
||||
return Response::json(['status' => 'fail', 'message' => trans('common.replace').trans('common.failed').$e->getMessage()]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -531,17 +536,17 @@ class UserController extends Controller
|
||||
public function switchToAdmin(): JsonResponse
|
||||
{
|
||||
if (! Session::has('admin')) {
|
||||
return Response::json(['status' => 'fail', 'message' => '非法请求']);
|
||||
return Response::json(['status' => 'fail', 'message' => trans('error.unauthorized')]);
|
||||
}
|
||||
|
||||
// 管理员信息重新写入user
|
||||
$user = auth()->loginUsingId(Session::get('admin'));
|
||||
Session::forget('admin');
|
||||
if ($user) {
|
||||
return Response::json(['status' => 'success', 'message' => '身份切换成功']);
|
||||
return Response::json(['status' => 'success', 'message' => trans('toggle_action', ['action' => trans('common.success')])]);
|
||||
}
|
||||
|
||||
return Response::json(['status' => 'fail', 'message' => '身份切换失败']);
|
||||
return Response::json(['status' => 'fail', 'message' => trans('toggle_action', ['action' => trans('common.failed')])]);
|
||||
}
|
||||
|
||||
public function charge(Request $request): ?JsonResponse
|
||||
@@ -552,7 +557,7 @@ class UserController extends Controller
|
||||
$query->whereType(3)->whereStatus(0);
|
||||
}),
|
||||
],
|
||||
], ['coupon_sn.required' => '券码不能为空', 'coupon_sn.exists' => '该券不可用']);
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
return Response::json(['status' => 'fail', 'message' => $validator->errors()->all()]);
|
||||
@@ -564,7 +569,8 @@ class UserController extends Controller
|
||||
DB::beginTransaction();
|
||||
// 写入日志
|
||||
$user = auth()->user();
|
||||
Helpers::addUserCreditLog($user->id, null, $user->credit, $user->credit + $coupon->value, $coupon->value, '用户手动充值 - [充值券:'.$request->input('coupon_sn').']');
|
||||
Helpers::addUserCreditLog($user->id, null, $user->credit, $user->credit + $coupon->value, $coupon->value,
|
||||
trans('user.recharge').' - ['.trans('user.coupon.recharge').':'.$request->input('coupon_sn').']');
|
||||
|
||||
// 余额充值
|
||||
$user->updateCredit($coupon->value);
|
||||
@@ -573,16 +579,16 @@ class UserController extends Controller
|
||||
$coupon->update(['status' => 1]);
|
||||
|
||||
// 写入卡券日志
|
||||
Helpers::addCouponLog('账户余额充值使用', $coupon->id);
|
||||
Helpers::addCouponLog(trans('user.recharge_credit'), $coupon->id);
|
||||
|
||||
DB::commit();
|
||||
|
||||
return Response::json(['status' => 'success', 'message' => '充值成功']);
|
||||
return Response::json(['status' => 'success', 'message' => trans('user.recharge').trans('common.success')]);
|
||||
} catch (Exception $e) {
|
||||
Log::error('卡劵充值错误:'.$e->getMessage());
|
||||
Log::error(trans('user.recharge').trans('common.failed').$e->getMessage());
|
||||
DB::rollBack();
|
||||
|
||||
return Response::json(['status' => 'fail', 'message' => '充值失败']);
|
||||
return Response::json(['status' => 'fail', 'message' => trans('user.recharge').trans('common.failed')]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user