Commit 3cdde2db 3cdde2db8c5fd1e76de8ce4efc754f502ecf9f59 by lemon

*

1 parent 85e739e2
......@@ -10,4 +10,5 @@ use Illuminate\Routing\Controller as BaseController;
class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
}
......
......@@ -4,8 +4,11 @@ namespace App\Http\Controllers\Musician;
use App\Http\Controllers\Controller;
use App\Services\MusicianSongService;
use Illuminate\Http\Request;
/**
* Class MusicianSongController
* @package App\Http\Controllers\Musician
*/
class MusicianSongController extends Controller
{
/**
......
......@@ -2,6 +2,7 @@
namespace App\Http;
use App\Http\Middleware\AuthIdentifier;
use Illuminate\Foundation\Http\Kernel as HttpKernel;
class Kernel extends HttpKernel
......@@ -21,6 +22,7 @@ class Kernel extends HttpKernel
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
AuthIdentifier::class
];
/**
......@@ -62,6 +64,5 @@ class Kernel extends HttpKernel
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
'identifier'=> \App\Http\Middleware\AuthIdentifier::class,
];
}
......
......@@ -58,7 +58,7 @@ class BaseModel extends Model
*/
public function scopeIdentify(Builder $builder)
{
return $builder->whereIn('stakeholder_id', [request()->get('identifier')->identifier]);
return $builder->whereIn('stakeholder_id', request()->get('stakeholder_ids'));
}
}
......
......@@ -39,7 +39,7 @@ class RouteServiceProvider extends ServiceProvider
$this->routes(function () {
Route::prefix('api')
->middleware(['api', 'identifier'])
->middleware('api')
->namespace($this->namespace . '\Musician')
->group(base_path('routes/api.php'));
......
......@@ -23,14 +23,14 @@ class MusicianSongService extends Service
*/
public function releaseSong()
{
$song_ids = array_unique(SongStakeholder::query()->identify()->pluck('song_id')->toArray());
$song_ids = array_filter(array_unique(SongStakeholder::query()->identify()->pluck('song_id')->toArray()));
if (empty($song_ids)) return Response::success();
$song_table = Song::table();
$songip_table = SongsIp::table();
$res = Song::query()->join($songip_table, "{$song_table}.id", '=', "{$songip_table}.song_id")
->with('contractDetail')->whereIn("{$songip_table}.song_id", $song_ids)->select(["{$song_table}.id", 'publish_song'])
->groupBy(["song_id"])->paginate($this->pageSize);
......
......@@ -174,8 +174,7 @@ return [
// App\Providers\BroadcastServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
\App\Providers\DataBaseQueryServiceProvider::class,
App\Providers\DataBaseQueryServiceProvider::class,
],
......
......@@ -56,7 +56,7 @@ return [
'collation' => 'utf8mb4_unicode_ci',
'prefix' => '',
'prefix_indexes' => true,
'strict' => true,
'strict' => false,
'engine' => null,
'options' => extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
......@@ -104,7 +104,7 @@ return [
'collation' => 'utf8mb4_unicode_ci',
'prefix' => '',
'prefix_indexes' => true,
'strict' => true,
'strict' => false,
'engine' => null,
'options' => extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
......
<?php
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Route;
use App\Http\Controllers\Api;
/*
|--------------------------------------------------------------------------
......@@ -14,10 +12,12 @@ use App\Http\Controllers\Api;
| is assigned the "api" middleware group. Enjoy building your API!
|
*/
Route::group([], function (){
//首页-音乐人
Route::get('musician_song', 'MusicianSongController@list');
Route::get('musician_song/{song_id}', 'MusicianSongController@detail');
Route::get('musician_song/{song_id}/right', 'MusicianSongController@right');
//经纪约列表
......@@ -37,6 +37,4 @@ Route::group([], function (){
//提现请求
Route::post('musician/withdraw_prepare', 'App\Controller\Musician\MusicianWithdrawController@prepare');
});
......