Skip to content

Commit d2583f4

Browse files
author
zhangjiangbin
committed
修正merge导致的bug
1 parent 573dae8 commit d2583f4

21 files changed

+606
-585
lines changed

‎app/Http/Controllers/AdminController.php‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,8 +1586,8 @@ public function exportInvite(Request $request)
15861586
$inviteList = Invite::query()->where('status', 0)->orderBy('id', 'asc')->get();
15871587

15881588
$filename = '邀请码' . date('Ymd');
1589-
Excel::create($filename, function($excel) use($inviteList) {
1590-
$excel->sheet('邀请码', function($sheet) use($inviteList) {
1589+
Excel::create($filename, function ($excel) use ($inviteList) {
1590+
$excel->sheet('邀请码', function ($sheet) use ($inviteList) {
15911591
$sheet->row(1, array(
15921592
'邀请码', '有效期'
15931593
));
@@ -1687,24 +1687,6 @@ public function resetUserTraffic(Request $request)
16871687
return Response::json(['status' => 'success', 'data' => '', 'message' => '操作成功']);
16881688
}
16891689

1690-
1691-
/**
1692-
* 以某用户登录
1693-
* @param Request $req 请求
1694-
* @return JSON 响应
1695-
*/
1696-
public function loginas(Request $req){
1697-
$id = $req->user_id;
1698-
$user = User::find($id);
1699-
if(!$user){
1700-
return ['errcode'=>-1,'errmsg'=>"用户不存在"];
1701-
}
1702-
$req->session()->put('admin',$req->session()->get("user"));
1703-
$req->session()->put('user', $user->toArray());
1704-
return ['errcode'=>0,'errmsg'=>"成功!"];
1705-
}
1706-
}
1707-
17081690
// 操作用户余额
17091691
public function handleUserBalance(Request $request)
17101692
{
@@ -1773,5 +1755,24 @@ public function userBalanceLogList(Request $request)
17731755

17741756
return Response::view('admin/userBalanceLogList', $view);
17751757
}
1776-
}
17771758

1759+
/**
1760+
* 以某用户登录
1761+
* @param Request $request
1762+
* @return \Illuminate\Http\JsonResponse
1763+
*/
1764+
public function loginas(Request $request)
1765+
{
1766+
$id = $request->get('user_id');
1767+
$user = User::query()->find($id);
1768+
if (!$user) {
1769+
return Response::json(['status' => 'fail', 'data' => '', 'message' => "用户不存在"]);
1770+
}
1771+
1772+
// 存储当前管理员身份信息，并将当前登录信息改成要切换的用户的身份信息
1773+
$request->session()->put('admin', $request->session()->get("user"));
1774+
$request->session()->put('user', $user->toArray());
1775+
1776+
return Response::json(['status' => 'success', 'data' => '', 'message' => "身份切换成功"]);
1777+
}
1778+
}

‎app/Http/Controllers/Controller.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
class Controller extends BaseController
1616
{
1717
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
18+
1819
// 生成SS密码
1920
public function makeRandStr($length = 6)
2021
{
@@ -66,18 +67,21 @@ public static function flowAutoShow($value = 0)
6667
public static function toMB($traffic)
6768
{
6869
$mb = 1048576;
70+
6971
return $traffic * $mb;
7072
}
7173

7274
public static function toGB($traffic)
7375
{
7476
$gb = 1048576 * 1024;
77+
7578
return $traffic * $gb;
7679
}
7780

7881
public static function flowToGB($traffic)
7982
{
8083
$gb = 1048576 * 1024;
84+
8185
return $traffic / $gb;
8286
}
8387

‎app/Http/Controllers/DonateController.php‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎app/Http/Controllers/LoginController.php‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public function index(Request $request)
3131
$username = trim($request->get('username'));
3232
$password = trim($request->get('password'));
3333
$captcha = trim($request->get('captcha'));
34+
3435
if (empty($username) || empty($password)) {
3536
$request->session()->flash('errorMsg', '请输入用户名和密码');
3637

@@ -60,14 +61,15 @@ public function index(Request $request)
6061

6162
return Redirect::back()->withInput();
6263
}
63-
if($request->remember){
64-
$rememberme_token = $this->makeRandStr(20);
65-
// 更新登录信息
66-
User::query()->where('id', $user->id)->update(['last_login' => time(),"rememberme_token"=>$rememberme_token]);
67-
68-
}else{
69-
$rememberme_token = "";
70-
// 更新登录信息
64+
65+
// 更新登录信息
66+
$remember_token = "";
67+
User::query()->where('id', $user->id)->update(['last_login' => time()]);
68+
if ($request->get('remember')) {
69+
$remember_token = $this->makeRandStr(20);
70+
71+
User::query()->where('id', $user->id)->update(['last_login' => time(), "remember_token" => $remember_token]);
72+
} else {
7173
User::query()->where('id', $user->id)->update(['last_login' => time()]);
7274
}
7375

@@ -101,18 +103,19 @@ public function index(Request $request)
101103

102104
// 根据权限跳转
103105
if ($user->is_admin) {
104-
return Redirect::to('admin')->cookie('remember',$rememberme_token,36000);
106+
return Redirect::to('admin')->cookie('remember', $remember_token, 36000);
105107
}
106108

107-
return Redirect::to('user')->cookie('remember',$rememberme_token,36000);
109+
return Redirect::to('user')->cookie('remember', $remember_token, 36000);
108110
} else {
109-
if($request->cookie("remember")){
110-
$u = User::where("rememberme_token",$request->cookie("remember"))->first();
111-
if($u){
111+
if ($request->cookie("remember")) {
112+
$u = User::query()->where("remember_token", $request->cookie("remember"))->first();
113+
if ($u) {
112114
$request->session()->put('user', $u->toArray());
113115
if ($u->is_admin) {
114116
return Redirect::to('admin');
115117
}
118+
116119
return Redirect::to('user');
117120
}
118121
}
@@ -127,7 +130,8 @@ public function index(Request $request)
127130
public function logout(Request $request)
128131
{
129132
$request->session()->flush();
130-
return Redirect::to('login')->cookie('remember',"",36000);;
133+
134+
return Redirect::to('login')->cookie('remember', "", 36000);
131135
}
132136

133137
}

0 commit comments

Comments
 (0)