diff --git a/app/controller/AdminAgentTeam.php b/app/controller/AdminAgentTeam.php index 2707933..85b6307 100644 --- a/app/controller/AdminAgentTeam.php +++ b/app/controller/AdminAgentTeam.php @@ -4,7 +4,6 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; -use app\middleware\CheckAdmin; use app\model\AdminDownScoresRecords; use app\model\AdminUpScoresRecords; use app\model\AgentRechargeRecords; @@ -19,8 +18,6 @@ use think\facade\Session; class AdminAgentTeam extends BaseController { - protected $middleware = [CheckAdmin::class]; - /** * 代理列表 * @return array diff --git a/app/controller/AdminStatistics.php b/app/controller/AdminStatistics.php index 527c7df..fab9cb7 100644 --- a/app/controller/AdminStatistics.php +++ b/app/controller/AdminStatistics.php @@ -4,7 +4,6 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; -use app\middleware\CheckAdmin; use app\model\AdminDownScoresRecords; use app\model\AdminUpScoresRecords; use app\model\AgentUser; @@ -16,8 +15,6 @@ use app\model\User as UserModel; class AdminStatistics extends BaseController { - protected $middleware = [CheckAdmin::class]; - /** * 待办 * @throws \think\db\exception\DataNotFoundException diff --git a/app/controller/AdminUser.php b/app/controller/AdminUser.php index 735cb08..9c17ccb 100644 --- a/app/controller/AdminUser.php +++ b/app/controller/AdminUser.php @@ -4,7 +4,6 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; -use app\middleware\CheckAdmin; use think\facade\Db; use think\facade\Request; use think\facade\Session; @@ -13,8 +12,6 @@ use app\model\AdminUser as AdminModel; class AdminUser extends BaseController { - protected $middleware = [CheckAdmin::class]; - protected $relationType = [1 => '用户', 2 => '代理']; /** diff --git a/app/controller/AdminUserTeam.php b/app/controller/AdminUserTeam.php index 740963b..8b5bdb3 100644 --- a/app/controller/AdminUserTeam.php +++ b/app/controller/AdminUserTeam.php @@ -4,7 +4,6 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; -use app\middleware\CheckAdmin; use app\model\AdminDownScoresRecords; use app\model\AdminUpScoresRecords; use app\model\RechargeRecords; @@ -20,8 +19,6 @@ use think\exception\ValidateException; class AdminUserTeam extends BaseController { - protected $middleware = [CheckAdmin::class]; - /** * 获取用户列表 * @return array diff --git a/app/controller/AdminZoneManage.php b/app/controller/AdminZoneManage.php index e00d482..06fca33 100644 --- a/app/controller/AdminZoneManage.php +++ b/app/controller/AdminZoneManage.php @@ -4,7 +4,6 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; -use app\middleware\CheckAdmin; use app\model\ZoneGoods; use app\model\ZoneGoodsParam; use app\validate\Zone as ZoneValidate; @@ -14,8 +13,6 @@ use think\facade\Request; class AdminZoneManage extends BaseController { - protected $middleware = [CheckAdmin::class]; - /** * 刮奖专区列表 * @return array diff --git a/app/controller/AgentTeam.php b/app/controller/AgentTeam.php index 4838194..07f05d8 100644 --- a/app/controller/AgentTeam.php +++ b/app/controller/AgentTeam.php @@ -4,7 +4,6 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; -use app\middleware\CheckAgent; use app\model\AgentDownScoresRecords; use app\model\AgentUpScoresRecords; use app\model\AgentUser; @@ -21,8 +20,6 @@ use think\facade\Session; class AgentTeam extends BaseController { - protected $middleware = [CheckAgent::class]; - /** * 获取用户列表 * @return array diff --git a/app/controller/CustomerService.php b/app/controller/CustomerService.php index e7d99d0..19c3f28 100644 --- a/app/controller/CustomerService.php +++ b/app/controller/CustomerService.php @@ -4,7 +4,6 @@ declare (strict_types = 1); namespace app\controller; use app\BaseController; -use app\middleware\CheckAdmin; use app\Model\CustomerService as CustomerServiceModel; use app\validate\CustomerService as CustomerServiceValidate; use think\exception\ValidateException; @@ -13,8 +12,6 @@ use think\facade\Request; class CustomerService extends BaseController { - protected $middleware = [CheckAdmin::class]; - /** * 显示资源列表 */ diff --git a/app/controller/User.php b/app/controller/User.php index f1ec969..bafb303 100644 --- a/app/controller/User.php +++ b/app/controller/User.php @@ -2,7 +2,6 @@ namespace app\controller; use app\BaseController; -use app\middleware\CheckUser; use app\model\CustomerService as CustomerServiceModel; use app\model\User as UserModel; use app\validate\User as UserValidate; @@ -14,8 +13,6 @@ use think\facade\Session; class User extends BaseController { - protected $middleware = [CheckUser::class]; - /** * 找回密码 * @return array diff --git a/app/controller/Zone.php b/app/controller/Zone.php index db8f2ca..858bf2e 100644 --- a/app/controller/Zone.php +++ b/app/controller/Zone.php @@ -3,7 +3,6 @@ namespace app\controller; use app\BaseController; -use app\middleware\CheckUser; use app\model\ConsumptionRecords; use app\model\Zone as ZoneModel; use app\model\ZoneGoods; @@ -17,8 +16,6 @@ use think\facade\Session; class Zone extends BaseController { - protected $middleware = [CheckUser::class]; - /** * 首页专区列表 * @return array diff --git a/route/app.php b/route/app.php index fd9b4b3..93dbc0b 100644 --- a/route/app.php +++ b/route/app.php @@ -15,91 +15,91 @@ use app\middleware\CheckAdmin; # 登陆注册 Route::group('passport',function (){ - Route::post('register','passport/register')->allowCrossDomain(); - Route::post('login','passport/login')->allowCrossDomain(); - Route::post('retrieve','passport/retrieve')->allowCrossDomain(); - Route::post('changeCaptcha','passport/changeCaptcha')->allowCrossDomain(); - Route::post('sendCode','passport/sendCode')->allowCrossDomain(); - Route::post('adminLogin','passport/adminLogin')->allowCrossDomain(); - Route::post('agentLogin','passport/agentLogin')->allowCrossDomain(); -}); + Route::post('register','passport/register'); + Route::post('login','passport/login'); + Route::post('retrieve','passport/retrieve'); + Route::post('changeCaptcha','passport/changeCaptcha'); + Route::post('sendCode','passport/sendCode'); + Route::post('adminLogin','passport/adminLogin'); + Route::post('agentLogin','passport/agentLogin'); +})->allowCrossDomain(); # 用户 Route::group('index',function () { - Route::post('awardRecords','index/awardRecords')->allowCrossDomain(); - Route::post('rotationChart','index/rotationChart')->allowCrossDomain(); -}); + Route::post('awardRecords','index/awardRecords'); + Route::post('rotationChart','index/rotationChart'); +})->allowCrossDomain(); Route::group('user',function (){ - Route::post('modifyPassword','user/modifyPassword')->middleware(CheckUser::class)->allowCrossDomain(); - Route::post('withdrawalRecords','user/withdrawalRecords')->middleware(CheckUser::class)->allowCrossDomain(); - Route::post('rechargeRecords','user/rechargeRecords')->middleware(CheckUser::class)->allowCrossDomain(); - Route::post('consumptionRecords','user/consumptionRecords')->middleware(CheckUser::class)->allowCrossDomain(); - Route::post('awardsRecords','user/awardsRecords')->middleware(CheckUser::class)->allowCrossDomain(); - Route::post('userInfo','user/userInfo')->middleware(CheckUser::class)->allowCrossDomain(); -}); + Route::rule('modifyPassword','user/modifyPassword'); + Route::rule('withdrawalRecords','user/withdrawalRecords'); + Route::rule('rechargeRecords','user/rechargeRecords'); + Route::rule('consumptionRecords','user/consumptionRecords'); + Route::rule('awardsRecords','user/awardsRecords'); + Route::rule('userInfo','user/userInfo'); +})->middleware(CheckUser::class)->allowCrossDomain(); Route::group('zone',function(){ Route::post('zoneList','zone/zoneList')->allowCrossDomain(); - Route::post('zoneGoodsList','zone/zoneGoodsList')->middleware(CheckUser::class)->allowCrossDomain(); - Route::post('beginLottery','zone/beginLottery')->middleware(CheckUser::class)->allowCrossDomain(); - Route::post('endLottery','zone/endLottery')->middleware(CheckUser::class)->allowCrossDomain(); - Route::post('queryAwardsResult','zone/queryAwardsResult')->middleware(CheckUser::class)->allowCrossDomain(); - Route::post('beginInitInfo','zone/beginInitInfo')->middleware(CheckUser::class)->allowCrossDomain(); -}); + Route::post('zoneGoodsList','zone/zoneGoodsList'); + Route::post('beginLottery','zone/beginLottery'); + Route::post('endLottery','zone/endLottery'); + Route::post('queryAwardsResult','zone/queryAwardsResult'); + Route::post('beginInitInfo','zone/beginInitInfo'); +})->middleware(CheckUser::class)->allowCrossDomain(); # 代理 Route::group('agentTeam',function(){ - Route::post('userList','agentTeam/userList')->middleware(CheckAgent::class)->allowCrossDomain(); - Route::post('upScores','agentTeam/upScores')->middleware(CheckAgent::class)->allowCrossDomain(); - Route::post('downScores','agentTeam/downScores')->middleware(CheckAgent::class)->allowCrossDomain(); - Route::post('getAgentInviteCode','agentTeam/getAgentInviteCode')->middleware(CheckAgent::class)->allowCrossDomain(); - Route::post('getAgentUserInfo','agentTeam/getAgentUserInfo')->middleware(CheckAgent::class)->allowCrossDomain(); -}); + Route::post('userList','agentTeam/userList'); + Route::post('upScores','agentTeam/upScores'); + Route::post('downScores','agentTeam/downScores'); + Route::post('getAgentInviteCode','agentTeam/getAgentInviteCode'); + Route::post('getAgentUserInfo','agentTeam/getAgentUserInfo'); +})->middleware(CheckAgent::class)->allowCrossDomain(); # 总后台 Route::group('adminStatistics',function() { - Route::post('needStatistics','adminStatistics/needStatistics')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('userStatistics','adminStatistics/userStatistics')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('upAndDownStatistics','adminStatistics/upAndDownStatistics')->middleware(CheckAdmin::class)->allowCrossDomain(); -}); + Route::post('needStatistics','adminStatistics/needStatistics'); + Route::post('userStatistics','adminStatistics/userStatistics'); + Route::post('upAndDownStatistics','adminStatistics/upAndDownStatistics'); +})->middleware(CheckAdmin::class)->allowCrossDomain(); Route::group('adminUserTeam',function() { - Route::post('userList','adminUserTeam/userList')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('editUser','adminUserTeam/editUser')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('deleteUser','adminUserTeam/deleteUser')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('upScores','adminUserTeam/upScores')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('downScores','adminUserTeam/downScores')->middleware(CheckAdmin::class)->allowCrossDomain(); -}); + Route::post('userList','adminUserTeam/userList'); + Route::post('editUser','adminUserTeam/editUser'); + Route::post('deleteUser','adminUserTeam/deleteUser'); + Route::post('upScores','adminUserTeam/upScores'); + Route::post('downScores','adminUserTeam/downScores'); +})->middleware(CheckAdmin::class)->allowCrossDomain(); Route::group('adminAgentTeam',function() { - Route::post('agentList','adminAgentTeam/agentList')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('agentUpScores','adminAgentTeam/agentUpScores')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('agentDownScores','adminAgentTeam/agentDownScores')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('editAgent','adminAgentTeam/editAgent')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('deleteAgent','adminAgentTeam/deleteAgent')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('addAgent','adminAgentTeam/addAgent')->middleware(CheckAdmin::class)->allowCrossDomain(); -}); + Route::post('agentList','adminAgentTeam/agentList'); + Route::post('agentUpScores','adminAgentTeam/agentUpScores'); + Route::post('agentDownScores','adminAgentTeam/agentDownScores'); + Route::post('editAgent','adminAgentTeam/editAgent'); + Route::post('deleteAgent','adminAgentTeam/deleteAgent'); + Route::post('addAgent','adminAgentTeam/addAgent'); +})->middleware(CheckAdmin::class)->allowCrossDomain(); Route::group('adminUser',function() { - Route::post('userInfo','adminUser/userInfo')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('upScoresList','adminUser/upScoresList')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('downScoresList','adminUser/downScoresList')->middleware(CheckAdmin::class)->allowCrossDomain(); -}); + Route::post('userInfo','adminUser/userInfo'); + Route::post('upScoresList','adminUser/upScoresList'); + Route::post('downScoresList','adminUser/downScoresList'); +})->middleware(CheckAdmin::class)->allowCrossDomain(); Route::group('adminZoneManage',function() { - Route::post('zoneGoodsList','adminZoneManage/zoneGoodsList')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('zoneGoodsChangeStatus','adminZoneManage/zoneGoodsChangeStatus')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('goodsParamList','adminZoneManage/goodsParamList')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('goodsParamSave','adminZoneManage/goodsParamSave')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('goodsParamDel','adminZoneManage/goodsParamDel')->middleware(CheckAdmin::class)->allowCrossDomain(); -}); + Route::post('zoneGoodsList','adminZoneManage/zoneGoodsList'); + Route::post('zoneGoodsChangeStatus','adminZoneManage/zoneGoodsChangeStatus'); + Route::post('goodsParamList','adminZoneManage/goodsParamList'); + Route::post('goodsParamSave','adminZoneManage/goodsParamSave'); + Route::post('goodsParamDel','adminZoneManage/goodsParamDel'); +})->middleware(CheckAdmin::class)->allowCrossDomain(); Route::group('customerService',function() { - Route::post('list','customerService/list')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('save','customerService/save')->middleware(CheckAdmin::class)->allowCrossDomain(); - Route::post('delete','customerService/delete')->middleware(CheckAdmin::class)->allowCrossDomain(); -}); + Route::post('list','customerService/list'); + Route::post('save','customerService/save'); + Route::post('delete','customerService/delete'); +})->middleware(CheckAdmin::class)->allowCrossDomain(); # 支付(待开发) //Route::group('pay',function (){ // Route::post('pay','pay/pay');