忽略性提交

.gitignore

@@ -4,7 +4,7 @@
 /public/js
 /public/css
 /public/images
-
+/public/images/QRCodeIMG/*.png
 /resources/images/QRCodeIMG/*.png
 /public/mix-manifest.json
 /storage/*.key

app/Http/Controllers/QRCodeController.php

@@ -42,7 +42,7 @@ class QRCodeController extends Controller
             $time=strtotime(Cache::get('last_refresh_date'));
             $qrCode_refresh=config('hr.qrCode_refresh');
             if ($qrCode_refresh){
-                $date=md5(date('Y-m-d H:i:s', strtotime('+30second',$time)));
+                $date=date('Y-m-d H:i:s', strtotime('+30second',$time));
                 $url=url("personnel/checking-in/userDutyCheck/clock?key=").$date;
                 $url=$url."&&userWorkgroupID=".$userWorkgroup->id;
             }else{

app/Http/Controllers/UserDutyCheckController.php

@@ -38,8 +38,8 @@ class UserDutyCheckController extends Controller
             $time=strtotime(Cache::get('last_refresh_date'));
             $key=$request->input('key');
             if (!$key) return view('exception.404',['error'=>'二维码失效！']);
-            $date=md5(date('Y-m-d H:i:s', strtotime('+30second',$time)));
-            if ($key!=$date) return view('exception.404',['error'=>'二维码失效！']);
+            $date=date('Y-m-d H:i:s');
+            if ($key<$date) return view('exception.404',['error'=>'二维码失效！']);
         }
         $userLaborToken=$request->cookie('userLaborToken');
         if ($userLaborToken && Cache::has('tokenStr_'.$userLaborToken)) {

resources/views/personnel/checking-in/QRcode.blade.php

@@ -65,7 +65,7 @@
             mounted(){
                 let _this=this;
                 let refreshQRCode=function(){
-                    axios.post('{{url('refreshQRCode')}}',{beforeTime:_this.last_refresh_date,warehouseId:_this.warehouseId})
+                    axios.post('{{url('personnel/checking-in/refreshQRCode')}}',{beforeTime:_this.last_refresh_date,warehouseId:_this.warehouseId})
                         .then(function (response) {
                             _this.userWorkgroups=response.data.userWorkgroups;
                             _this.last_refresh_date=response.data.last_refresh_date;

resources/views/personnel/checking-in/getQRcode.blade.php

@@ -9,7 +9,7 @@
         <div class="card col-md-10 offset-md-1 p-0">
             <div class="card-body">
                 <div class="list-group list-group-horizontal-lg align-content-center" v-if="warehouses">
-                    <a target="_blank"  class="btn list-group-item col-md-2" type="button" :href="('{{url('QRCode?warehouseId=')}}'+warehouse.id)"  :class="warehouse==checkedWarehouse ? 'btn-primary' : 'btn-outline-primary'"
+                    <a target="_blank"  class="btn list-group-item col-md-2" type="button" :href="('{{url('personnel/checking-in/QRCode?warehouseId=')}}'+warehouse.id)"  :class="warehouse==checkedWarehouse ? 'btn-primary' : 'btn-outline-primary'"
                        v-for="warehouse in warehouses">@{{ warehouse.name }}</a>
                 </div>
                 <h3 v-else>还未录入仓库，请先录入仓库！</h3>

routes/web.php

@@ -130,9 +130,9 @@ Route::resource('store/storeItem','StoreItemsController');
 //进入打卡
 Route::get('personnel/checking-in/goGetQRCode','QRCodeController@goGetQRCode');
 //进入二维码显示页面
-Route::get('QRCode','QRCodeController@QRCode');
+Route::get('personnel/checking-in/QRCode','QRCodeController@QRCode');
 //获取刷新二维码
-Route::post('refreshQRCode','QRCodeController@refreshQRCode');
+Route::post('personnel/checking-in/refreshQRCode','QRCodeController@refreshQRCode');
 /**
  *  用户打卡
  */