8000 '修改令牌刷新相关的bug' · aobics/laravel_template_with_vue@2f56b32 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2f56b32

Browse files
wmhellowmhello
committed
'修改令牌刷新相关的bug'
1 parent b1672c9 commit 2f56b32

35 files changed

+50
-101
lines changed

‎backend/app/Http/Controllers/Auth/LoginController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function logout()
9191

9292
public function refresh(Request $request)
9393
{
94-
$refreshToken = $request->input('refreshToken', '');
94+
$refreshToken = $request->input('refresh_token', '');
9595
if (empty($refreshToken)) {
9696
$refreshToken = $request->cookie('refreshToken');
9797
}
@@ -136,7 +136,7 @@ protected function token($data = []){
136136
'refresh_token' => $result['refresh_token'],
137137
'status' => 'success',
138138
'status_code' => 200
139-
], 200)->cookie('refreshToken', $result['refresh_token'], 43200);
139+
], 200);
140140
}
141141

142142
}

‎backend/app/Http/Controllers/LogController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function index(Request $request)
3737
->when($createdAt, function($query) use($createdAt) {
3838
return $query->whereDate('created_at', $createdAt);
3939
})
40-
->paginate($pageSize);
40+
->latest()->paginate($pageSize);
4141
return new LogLoginCollection($data);
4242
}
4343

@@ -65,7 +65,7 @@ public function show($id = null){
6565
->when($createdAt, function($query) use($createdAt) {
6666
return $query->whereDate('created_at', $createdAt);
6767
})
68-
->paginate($pageSize);
68+
->latest()->paginate($pageSize);
6969
return new LogLoginCollection($data);
7070
}
7171

‎backend/app/Providers/AuthServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function boot()
2727
{
2828
$this->registerPolicies();
2929
Passport::routes();
30-
Passport::tokensExpireIn(Carbon::now()->addMinutes(100));
30+
Passport::tokensExpireIn(Carbon::now()->addMinutes(60));
3131
Passport::refreshTokensExpireIn(Carbon::now()->addDays(30));
3232
//
3333
}

‎backend/nbproject/project.properties

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

‎backend/nbproject/project.xml

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

‎backend/routes/api.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
})->name('chat.kefu');
5858

5959
});
60-
Route::get('refresh', "Auth\LoginController@refresh")->name('users.refresh');
60+
Route::post('refresh', "Auth\LoginController@refresh")->name('users.refresh');
6161
Route::post('login', 'Auth\LoginController@login')->name('users.login');
6262

6363

‎frontend/dist/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>管理系统</title><link href=/static/css/chunk-elementUI.18b11d0e.css rel=stylesheet><link href=/static/css/chunk-libs.b12568c9.css rel=stylesheet><link href=/static/css/app.e2ef2f50.css rel=stylesheet></head><body><noscript><strong>We're sorry but 管理系统 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=https://fe.120yibao.com/common/tinymce/5.0.13/tinymce.min.js></script><script src=/static/js/chunk-elementUI.61cf193b.js></script><script src=/static/js/chunk-libs.add02a7a.js></script><script>(function(e){function c(c){for(var u,t,a=c[0],h=c[1],f=c[2],o=0,k=[];o<a.length;o++)t=a[o],d[t]&&k.push(d[t][0]),d[t]=0;for(u in h)Object.prototype.hasOwnProperty.call(h,u)&&(e[u]=h[u]);b&&b(c);while(k.length)k.shift()();return r.push.apply(r,f||[]),n()}function n(){for(var e,c=0;c<r.length;c++){for(var n=r[c],u=!0,t=1;t<n.length;t++){var a=n[t];0!==d[a]&&(u=!1)}u&&(r.splice(c--,1),e=h(h.s=n[0]))}return e}var u={},t={runtime:0},d={runtime:0},r=[];function a(e){return h.p+"static/js/"+({}[e]||e)+"."+{"chunk-0c0144f2":"ebfa40f1","chunk-1597b28a":"89ed0736","chunk-2d225822":"fae7881b","chunk-2d0c536c":"7a969aa5","chunk-30d60409":"9834f349","chunk-4b0f6a4b":"131629d6","chunk-51c1ffb1":"9698ea95","chunk-52202e38":"09770139","chunk-586328b0":"27967a49","chunk-68697b0f":"f7ebb895","chunk-689c7dfe":"8bebe8bb","chunk-68e46a84":"59d3596c","chunk-80122322":"04611056","chunk-6552f2ab":"3d91d09e","chunk-859bdd6c":"72808562","chunk-a2264d74":"544b4163","chunk-a333d6d8":"8f1491dc","chunk-fb02c430":"9913b7ea","chunk-2d0afe49":"340d4197","chunk-2d0ccb97":"db918614","chunk-2d0d43d7":"49c1da65","chunk-2d208a0b":"24f813bf","chunk-2d21b84c":"c1003108","chunk-2d21ee4a":"a5452a35","chunk-2d226cac":"7a4dff28","chunk-7e20d9b0":"09c3b5f2","chunk-7e21e850":"6b2c448c","chunk-9e76a64a":"ee50b5a5","chunk-b461012a":"d0efbf38","chunk-ed606062":"37b35dae","chunk-ed8a7108":"dbc77ad9","chunk-2d0ab800":"02de5754","chunk-2d0c798e":"824da555","chunk-2d221c26":"d7156bf3","chunk-2d22e189":"3ba74840","chunk-7704ac42":"19dfe7ac"}[e]+".js"}function h(c){if(u[c])return u[c].exports;var n=u[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,h),n.l=!0,n.exports}h.e=function(e){var c=[],n={"chunk-0c0144f2":1,"chunk-1597b28a":1,"chunk-30d60409":1,"chunk-51c1ffb1":1,"chunk-52202e38":1,"chunk-586328b0":1,"chunk-68697b0f":1,"chunk-689c7dfe":1,"chunk-68e46a84":1,"chunk-80122322":1,"chunk-859bdd6c":1,"chunk-a2264d74":1,"chunk-a333d6d8":1,"chunk-fb02c430":1};t[e]?c.push(t[e]):0!==t[e]&&n[e]&&c.push(t[e]=new Promise((function(c,n){for(var u="static/css/"+({}[e]||e)+"."+{"chunk-0c0144f2":"e0a083b4","chunk-1597b28a":"4d0480d0","chunk-2d225822":"31d6cfe0","chunk-2d0c536c":"31d6cfe0","chunk-30d60409":"69bd0f85","chunk-4b0f6a4b":"31d6cfe0","chunk-51c1ffb1":"76da8605","chunk-52202e38":"db4c7bf9","chunk-586328b0":"0c8a13c2","chunk-68697b0f":"5e9c0b21","chunk-689c7dfe":"68c84cd9","chunk-68e46a84":"b3e27e43","chunk-80122322":"79c947a7","chunk-6552f2ab":"31d6cfe0","chunk-859bdd6c":"68c84cd9","chunk-a2264d74":"c22ad281","chunk-a333d6d8":"68c84cd9","chunk-fb02c430":"d721c445","chunk-2d0afe49":"31d6cfe0","chunk-2d0ccb97":"31d6cfe0","chunk-2d0d43d7":"31d6cfe0","chunk-2d208a0b":"31d6cfe0","chunk-2d21b84c":"31d6cfe0","chunk-2d21ee4a":"31d6cfe0","chunk-2d226cac":"31d6cfe0","chunk-7e20d9b0":"31d6cfe0","chunk-7e21e850":"31d6cfe0","chunk-9e76a64a":"31d6cfe0","chunk-b461012a":"31d6cfe0","chunk-ed606062":"31d6cfe0","chunk-ed8a7108":"31d6cfe0","chunk-2d0ab800":"31d6cfe0","chunk-2d0c798e":"31d6cfe0","chunk-2d221c26":"31d6cfe0","chunk-2d22e189":"31d6cfe0","chunk-7704ac42":"31d6cfe0"}[e]+".css",d=h.p+u,r=document.getElementsByTagName("link"),a=0;a<r.length;a++){var f=r[a],o=f.getAttribute("data-href")||f.getAttribute("href");if("stylesheet"===f.rel&&(o===u||o===d))return c()}var k=document.getElementsByTagName("style");for(a=0;a<k.length;a++){f=k[a],o=f.getAttribute("data-href");if(o===u||o===d)return c()}var b=document.createElement("link");b.rel="stylesheet",b.type="text/css",b.onload=c,b.onerror=function(c){var u=c&&c.target&&c.target.src||d,r=new Error("Loading CSS chunk "+e+" failed.\n("+u+")");r.code="CSS_CHUNK_LOAD_FAILED",r.request=u,delete t[e],b.parentNode.removeChild(b),n(r)},b.href=d;var i=document.getElementsByTagName("head")[0];i.appendChil A088 d(b)})).then((function(){t[e]=0})));var u=d[e];if(0!==u)if(u)c.push(u[2]);else{var r=new Promise((function(c,n){u=d[e]=[c,n]}));c.push(u[2]=r);var f,o=document.createElement("script");o.charset="utf-8",o.timeout=120,h.nc&&o.setAttribute("nonce",h.nc),o.src=a(e),f=function(c){o.onerror=o.onload=null,clearTimeout(k);var n=d[e];if(0!==n){if(n){var u=c&&("load"===c.type?"missing":c.type),t=c&&c.target&&c.target.src,r=new Error("Loading chunk "+e+" failed.\n("+u+": "+t+")");r.type=u,r.request=t,n[1](r)}d[e]=void 0}};var k=setTimeout((function(){f({type:"timeout",target:o})}),12e4);o.onerror=o.onload=f,document.head.appendChild(o)}return Promise.all(c)},h.m=e,h.c=u,h.d=function(e,c,n){h.o(e,c)||Object.defineProperty(e,c,{enumerable:!0,get:n})},h.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},h.t=function(e,c){if(1&c&&(e=h(e)),8&c)return e;if(4&c&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(h.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&c&&"string"!=typeof e)for(var u in e)h.d(n,u,function(c){return e[c]}.bind(null,u));return n},h.n=function(e){var c=e&&e.__esModule?function(){return e["default"]}:function(){return e};return h.d(c,"a",c),c},h.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},h.p="/",h.oe=function(e){throw console.error(e),e};var f=window["webpackJsonp"]=window["webpackJsonp"]||[],o=f.push.bind(f);f.push=c,f=f.slice();for(var k=0;k<f.length;k++)c(f[k]);var b=o;n()})([]);</script><script src=/static/js/app.075e4d0f.js></script></body></html>
1+
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>管理系统</title><link href=/static/css/chunk-elementUI.18b11d0e.css rel=stylesheet><link href=/static/css/chunk-libs.b12568c9.css rel=stylesheet><link href=/static/css/app.e2ef2f50.css rel=stylesheet></head><body><noscript><strong>We're sorry but 管理系统 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=https://fe.120yibao.com/common/tinymce/5.0.13/tinymce.min.js></script><script src=/static/js/chunk-elementUI.9c97fcda.js></script><script src=/static/js/chunk-libs.4d58c34f.js></script><script>(function(e){function c(c){for(var u,t,a=c[0],f=c[1],h=c[2],o=0,k=[];o<a.length;o++)t=a[o],d[t]&&k.push(d[t][0]),d[t]=0;for(u in f)Object.prototype.hasOwnProperty.call(f,u)&&(e[u]=f[u]);b&&b(c);while(k.length)k.shift()();return r.push.apply(r,h||[]),n()}function n(){for(var e,c=0;c<r.length;c++){for(var n=r[c],u=!0,t=1;t<n.length;t++){var a=n[t];0!==d[a]&&(u=!1)}u&&(r.splice(c--,1),e=f(f.s=n[0]))}return e}var u={},t={runtime:0},d={runtime:0},r=[];function a(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-080d6210":"2b28ddea","chunk-0c0144f2":"ebfa40f1","chunk-2d225822":"fae7881b","chunk-2d0c536c":"7a969aa5","chunk-2fb48757":"6e71ee76","chunk-6552f2ab":"3d91d09e","chunk-4b0f6a4b":"7c5ffee4","chunk-51c1ffb1":"e4f1d7a9","chunk-52202e38":"09770139","chunk-54715cb6":"f2aa5da6","chunk-586328b0":"27967a49","chunk-67f08afe":"71589c81","chunk-68697b0f":"f7ebb895","chunk-689c7dfe":"8bebe8bb","chunk-68e46a84":"59d3596c","chunk-72be7d9c":"7ecb7083","chunk-859bdd6c":"72808562","chunk-a333d6d8":"8f1491dc","chunk-fb02c430":"9913b7ea","chunk-2d0ab800":"02de5754","chunk-2d0afe49":"340d4197","chunk-2d0c798e":"824da555","chunk-2d0ccb97":"db918614","chunk-2d0d43d7":"49c1da65","chunk-2d208a0b":"24f813bf","chunk-2d21b84c":"c1003108","chunk-2d21ee4a":"a5452a35","chunk-2d221c26":"d7156bf3","chunk-2d226cac":"cd5ca6e1","chunk-2d22e189":"3ba74840","chunk-7704ac42":"19dfe7ac","chunk-7e20d9b0":"09c3b5f2","chunk-7e21e850":"6b2c448c","chunk-ed606062":"37b35dae","chunk-ed8a7108":"dbc77ad9"}[e]+".js"}function f(c){if(u[c])return u[c].exports;var n=u[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,f),n.l=!0,n.exports}f.e=function(e){var c=[],n={"chunk-080d6210":1,"chunk-0c0144f2":1,"chunk-2fb48757":1,"chunk-51c1ffb1":1,"chunk-52202e38":1,"chunk-54715cb6":1,"chunk-586328b0":1,"chunk-68697b0f":1,"chunk-689c7dfe":1,"chunk-68e46a84":1,"chunk-72be7d9c":1,"chunk-859bdd6c":1,"chunk-a333d6d8":1,"chunk-fb02c430":1};t[e]?c.push(t[e]):0!==t[e]&&n[e]&&c.push(t[e]=new Promise((function(c,n){for(var u="static/css/"+({}[e]||e)+"."+{"chunk-080d6210":"a3917136","chunk-0c0144f2":"e0a083b4","chunk-2d225822":"31d6cfe0","chunk-2d0c536c":"31d6cfe0","chunk-2fb48757":"79c947a7","chunk-6552f2ab":"31d6cfe0","chunk-4b0f6a4b":"31d6cfe0","chunk-51c1ffb1":"76da8605","chunk-52202e38":"db4c7bf9","chunk-54715cb6":"69bd0f85","chunk-586328b0":"0c8a13c2","chunk-67f08afe":"31d6cfe0","chunk-68697b0f":"5e9c0b21","chunk-689c7dfe":"68c84cd9","chunk-68e46a84":"b3e27e43","chunk-72be7d9c":"1309093c","chunk-859bdd6c":"68c84cd9","chunk-a333d6d8":"68c84cd9","chunk-fb02c430":"d721c445","chunk-2d0ab800":"31d6cfe0","chunk-2d0afe49":"31d6cfe0","chunk-2d0c798e":"31d6cfe0","chunk-2d0ccb97":"31d6cfe0","chunk-2d0d43d7":"31d6cfe0","chunk-2d208a0b":"31d6cfe0","chunk-2d21b84c":"31d6cfe0","chunk-2d21ee4a":"31d6cfe0","chunk-2d221c26":"31d6cfe0","chunk-2d226cac":"31d6cfe0","chunk-2d22e189":"31d6cfe0","chunk-7704ac42":"31d6cfe0","chunk-7e20d9b0":"31d6cfe0","chunk-7e21e850":"31d6cfe0","chunk-ed606062":"31d6cfe0","chunk-ed8a7108":"31d6cfe0"}[e]+".css",d=f.p+u,r=document.getElementsByTagName("link"),a=0;a<r.length;a++){var h=r[a],o=h.getAttribute("data-href")||h.getAttribute("href");if("stylesheet"===h.rel&&(o===u||o===d))return c()}var k=document.getElementsByTagName("style");for(a=0;a<k.length;a++){h=k[a],o=h.getAttribute("data-href");if(o===u||o===d)return c()}var b=document.createElement("link");b.rel="stylesheet",b.type="text/css",b.onload=c,b.onerror=function(c){var u=c&&c.target&&c.target.src||d,r=new Error("Loading CSS chunk "+e+" failed.\n("+u+")");r.code="CSS_CHUNK_LOAD_FAILED",r.request=u,delete t[e],b.parentNode.removeChild(b),n(r)},b.href=d;var i=document.getElementsByTagName("head")[0];i.appendChild(b)})).then((function(){t[e]=0})));var u=d[e];if(0!==u)if(u)c.push(u[2]);else{var r=new Promise((function(c,n){u=d[e]=[c,n]}));c.push(u[2]=r);var h,o=document.createElement("script");o.charset="utf-8",o.timeout=120,f.nc&&o.setAttribute("nonce",f.nc),o.src=a(e),h=function(c){o.onerror=o.onload=null,clearTimeout(k);var n=d[e];if(0!==n){if(n){var u=c&&("load"===c.type?"missing":c.type),t=c&&c.target&&c.target.src,r=new Error("Loading chunk "+e+" failed.\n("+u+": "+t+")");r.type=u,r.request=t,n[1](r)}d[e]=void 0}};var k=setTimeout((function(){h({type:"timeout",target:o})}),12e4);o.onerror=o.onload=h,document.head.appendChild(o)}return Promise.all(c)},f.m=e,f.c=u,f.d=function(e,c,n){f.o(e,c)||Object.defineProperty(e,c,{enumerable:!0,get:n})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,c){if(1&c&&(e=f(e)),8&c)return e;if(4&c&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(f.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&c&&"string"!=typeof e)for(var u in e)f.d(n,u,function(c){return e[c]}.bind(null,u));return n},f.n=function(e){var c=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="/",f.oe=function(e){throw console.error(e),e};var h=window["webpackJsonp"]=window["webpackJsonp"]||[],o=h.push.bind(h);h.push=c,h=h.slice();for(var k=0;k<h.length;k++)c(h[k]);var b=o;n()})([]);</script><script src=/static/js/app.c23da30d.js></script></body></html>

‎frontend/dist/static/css/chunk-080d6210.a3917136.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.page-one button[data-v-39b11663]{margin-left:10px}

‎frontend/dist/static/css/chunk-80122322.79c947a7.css renamed to ‎frontend/dist/static/css/chunk-2fb48757.79c947a7.css

File renamed without changes.

‎frontend/dist/static/css/chunk-30d60409.69bd0f85.css renamed to ‎frontend/dist/static/css/chunk-54715cb6.69bd0f85.css

File renamed without changes.

0 commit comments

Comments
 (0)
0