Merge branch 'develop' into yongpxu-dev
# Conflicts: # Server/application/command/SwitchFriendsCommand.php resolved by develop version # Server/application/cunkebao/controller/ContentLibraryController.php resolved by develop version # Server/application/cunkebao/controller/WorkbenchController.php resolved by develop version # Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php resolved by develop version # Server/application/job/WechatMomentsJob.php resolved by develop version # Server/application/job/WorkbenchAutoLikeJob.php resolved by develop version # Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php resolved by develop version
This commit is contained in:
@@ -45,6 +45,7 @@ Route::group('v1/', function () {
|
||||
Route::post('updateStatus', 'app\cunkebao\controller\plan\PlanSceneV1Controller@updateStatus');
|
||||
Route::get('detail', 'app\cunkebao\controller\plan\GetAddFriendPlanDetailV1Controller@index');
|
||||
Route::PUT('update', 'app\cunkebao\controller\plan\PostUpdateAddFriendPlanV1Controller@index');
|
||||
Route::get('getWxMinAppCode', 'app\cunkebao\controller\plan\PlanSceneV1Controller@getWxMinAppCode');
|
||||
});
|
||||
|
||||
// 流量池相关
|
||||
@@ -100,4 +101,18 @@ Route::group('v1/', function () {
|
||||
});
|
||||
})->middleware(['jwt']);
|
||||
|
||||
|
||||
|
||||
Route::group('v1/frontend', function () {
|
||||
|
||||
Route::group('business/poster', function () {
|
||||
Route::post('getone', 'app\cunkebao\controller\plan\PosterWeChatMiniProgram@getPosterTaskData');
|
||||
Route::post('decryptphone', 'app\cunkebao\controller\plan\PosterWeChatMiniProgram@getPhoneNumber');
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
return [];
|
||||
Reference in New Issue
Block a user