Merge branch 'master' into develop

routes/api.php

@@ -44,7 +44,7 @@
     Route::post('/drug-limit', 'App\Api\Controllers\DrugController@drugLimit');
     Route::post('/drug-limit', 'App\Api\Controllers\DrugController@drugLimit');
     # Route::get('/test', 'App\Api\Controllers\DrugController@test');
     # Route::get('/test', 'App\Api\Controllers\DrugController@test');
     # 获取药店列表
     # 获取药店列表
-    Route::get('/pharmacys', 'App\Api\Controllers\PharmacyController@PharmacyList');
+    Route::get('/pharmacys', 'App\Api\Controllers\PharmacyController@PharmacyList')->withoutMiddleware(['checkrole']);
     # 药店详情
     # 药店详情
     Route::post('/pharmacy-detail', 'App\Api\Controllers\PharmacyController@detail');
     Route::post('/pharmacy-detail', 'App\Api\Controllers\PharmacyController@detail');
     # 药店纠错
     # 药店纠错
@@ -94,7 +94,7 @@
     # 医师详情
     # 医师详情
     Route::post('/doctor-detail', 'App\Api\Controllers\DoctorController@detail');
     Route::post('/doctor-detail', 'App\Api\Controllers\DoctorController@detail');
     # 医师上传签名
     # 医师上传签名
-    Route::post('/doctor-upload', 'App\Api\Controllers\DoctorController@upload');
+    Route::post('/doctor-upload', 'App\Api\Controllers\DoctorController@upload')->withoutMiddleware(['checkrole']);
     # 医师纠错
     # 医师纠错
     Route::post('/doctor-correction', 'App\Api\Controllers\DoctorController@correction');
     Route::post('/doctor-correction', 'App\Api\Controllers\DoctorController@correction');
     # 医师退出
     # 医师退出
@@ -111,7 +111,7 @@
     # 药师详情
     # 药师详情
     Route::post('/pharmacist-detail', 'App\Api\Controllers\PharmacistController@detail');
     Route::post('/pharmacist-detail', 'App\Api\Controllers\PharmacistController@detail');
     # 证书上传
     # 证书上传
-    Route::post('/pharmacist-uploadcertificate', 'App\Api\Controllers\PharmacistController@uploadCertificate');
+    Route::post('/pharmacist-uploadcertificate', 'App\Api\Controllers\PharmacistController@uploadCertificate')->withoutMiddleware(['checkrole']);
     # 药师新增
     # 药师新增
     Route::post('/pharmacist-add', 'App\Api\Controllers\PharmacistController@add');
     Route::post('/pharmacist-add', 'App\Api\Controllers\PharmacistController@add');
     # 药师编辑
     # 药师编辑
@@ -119,7 +119,7 @@
     # 设置默认药师
     # 设置默认药师
     Route::post('/pharmacist-setdefault', 'App\Api\Controllers\PharmacistController@setDefault');
     Route::post('/pharmacist-setdefault', 'App\Api\Controllers\PharmacistController@setDefault');
     # 药师签名上传
     # 药师签名上传
-    Route::post('/pharmacist-upload', 'App\Api\Controllers\PharmacistController@upload');
+    Route::post('/pharmacist-upload', 'App\Api\Controllers\PharmacistController@upload')->withoutMiddleware(['checkrole']);
     # 药师删除
     # 药师删除
     Route::post('/pharmacist-delete', 'App\Api\Controllers\PharmacistController@delete');
     Route::post('/pharmacist-delete', 'App\Api\Controllers\PharmacistController@delete');
     # 获取系统配置
     # 获取系统配置