|
@@ -23,7 +23,7 @@ Route::get('image/{md5}', [
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
|
|
+
|
|
|
///dd(request()->input('route'));
|
|
///dd(request()->input('route'));
|
|
|
//后台
|
|
//后台
|
|
|
if (strpos(request()->getRequestUri(), '/addons/') !== false) {
|
|
if (strpos(request()->getRequestUri(), '/addons/') !== false) {
|
|
@@ -62,24 +62,3 @@ if (strpos(request()->getRequestUri(), '/addons/') !== false) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
-=======
|
|
|
|
|
-
|
|
|
|
|
-// Route::get('/test',function() {
|
|
|
|
|
-
|
|
|
|
|
-// $password = bcrypt('admin');
|
|
|
|
|
-// dd($password);
|
|
|
|
|
-// dd(dict()->get('user_info','work_type'));
|
|
|
|
|
-// $password = bcrypt('admin');
|
|
|
|
|
-// dd($password);
|
|
|
|
|
-// $obj = new \App\Services\User\Info();
|
|
|
|
|
-// $obj = $obj->find(1);
|
|
|
|
|
-// var_dump($obj);exit;
|
|
|
|
|
-// });
|
|
|
|
|
-
|
|
|
|
|
-Route::get('/test', 'TestController@index');
|
|
|
|
|
-Route::get('/web/bind', 'Web\AuthController@bind');
|
|
|
|
|
-Route::any('/web/notify', 'Web\AuthController@notify');
|
|
|
|
|
-Route::any('/web/notify-account', 'Web\AuthController@notifyAccount');
|
|
|
|
|
-/*Route::group(['prefix'=>'web','namespace'=>'Web','middleware' => ['web', 'wechat.oauth:snsapi_userinfo']],function (){
|
|
|
|
|
- Route::any('bind','AuthController@bind');});*/
|
|
|
|
|
->>>>>>> master
|
|
|
