修改中间件

@@ -24,7 +24,6 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        AuthIdentifier::class
     ];
 
     /**
@@ -67,5 +66,6 @@ class Kernel extends HttpKernel
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'check.signature' => \App\Http\Middleware\CheckSignature::class,
+        'auth.identifier'=> AuthIdentifier::class,
     ];
 }

@@ -19,9 +19,11 @@ use Illuminate\Support\Facades\Log;
  */
 class AuthIdentifier
 {
-    protected $auth = [
-        'api'
-    ];
+    /**
+     * @var string[]
+     */
+    protected $auth = ['api'];
+
 
     /**
      * Handle an incoming request.
@@ -59,10 +61,8 @@ class AuthIdentifier
 
         if (empty($stakeholder_ids)) return Response::error(ErrorCode::MATCH_IDENTIFIER_FAIL);
 
-        $request->attributes->add([
-            'identifier'        =>  $identifier,
-            'stakeholder_ids'   =>  $stakeholder_ids,
-        ]);
+        $request->offsetSet('identifier', $identifier);
+        $request->offsetSet('stakeholder_ids', $stakeholder_ids);
 
         AUTH:
 

@@ -58,11 +58,11 @@ class BaseModel extends Model
         return $builder;
     }
 
-
-
     /**
      * @param Builder $builder
      * @return Builder
+     * @throws \Psr\Container\ContainerExceptionInterface
+     * @throws \Psr\Container\NotFoundExceptionInterface
      */
     public function scopeIdentify(Builder $builder)
     {

@@ -14,6 +14,8 @@ class Project extends BaseModel
 {
     use HasFactory,SoftDeletes;
 
-
+    /**
+     * @var string[]
+     */
     public $hidden = ['id'];
 }

@@ -42,6 +42,7 @@ class RouteServiceProvider extends ServiceProvider
             //音乐人
             Route::prefix('api')
                 ->middleware('api')
+                ->middleware('auth.identifier')
                 ->namespace($this->namespace . '\Musician')
                 ->group(base_path('routes/api.php'));
 

@@ -32,9 +32,9 @@ class IssueService extends Service
 
             $params['data']             =   $this->request->all();
             $params['ext']              =   [
-                'user_id'           =>  $this->identifier->company_id, //机构id
-                'operator'          =>  $this->identifier->user_id,    //操作人id
-                'stakeholder_ids'   =>  $this->stakeholder_ids,
+                'user_id'           =>  $this->request->get('identifier')->company_id, //机构id
+                'operator'          =>  $this->request->get('identifier')->user_id,    //操作人id
+                'stakeholder_ids'   =>  $this->request->get('stakeholder_ids'),
             ];
 
             Log::info(__METHOD__.':请求参数', ['params'=>$params, 'token'=>$token, 'uri'=>$client->post($this->request->getRequestUri())]);
@@ -62,7 +62,7 @@ class IssueService extends Service
      */
     public function subCompany()
     {
-        $company_ids = Stakeholder::query()->whereIn('id', $this->stakeholder_ids)->pluck('company_id')->toArray();
+        $company_ids = Stakeholder::query()->whereIn('id', $this->request->get('stakeholder_ids'))->pluck('company_id')->toArray();
         $subject = Subject::query()->whereIn('company_id', $company_ids)
             ->where('attr', 'like', "%3%")
             ->groupBy('no')

@@ -20,7 +20,7 @@ class MusicianAgreementService extends Service
      */
     public function treatyList()
     {
-        $res = Contract::query()->whereIn('stakeholder_id', $this->stakeholder_ids)->where('flag', 3)->where('date_ending', '>', $this->now)->with(['filesNewTreaty:id,key,link_id'])
+        $res = Contract::query()->whereIn('stakeholder_id', $this->request->get('stakeholder_ids'))->where('flag', 3)->where('date_ending', '>', $this->now)->with(['filesNewTreaty:id,key,link_id'])
                 ->select(['id', 'name as treaty_name', 'treaty_type', 'service_types as service_type', 'date_ending as deadline_date', 'music_nums as music_no'])->orderByDesc('created_at')->paginate($this->pageSize);
 
         $client = new CosHelper();
@@ -58,7 +58,7 @@ class MusicianAgreementService extends Service
 
         //歌曲版权
         $contract_table = Contract::table();
-        $contract = Contract::query()->with(['filesNew:id,key,link_id', 'moreSongs'])->where(['flag'=>1])->whereIn('sc.stakeholder_id', $this->stakeholder_ids)
+        $contract = Contract::query()->with(['filesNew:id,key,link_id', 'moreSongs'])->where(['flag'=>1])->whereIn('sc.stakeholder_id', $this->request->get('stakeholder_ids'))
                     ->join(StakeholderContract::table()." as sc", Contract::table().".id", '=', 'sc.contract_id')
                     ->select(["{$contract_table}.id", 'contract_no', 'name', 'right_type', 'proportion', 'date_signing', 'date_starting', 'date_ending', 'cooperation_type', 'prepaid_money', 'reward_money'])->get()->toArray();
 

@@ -46,7 +46,7 @@ class MusicianBalanceService extends Service
         $payer = StakeholderBalanceByPayer::query()->identify()->get();
         foreach ($payer as $item) {
             //计算个人所得税
-            $tax        =   ($this->identifier->type == 1) ? (string)$this->reckonPersonTax($item['balance']) : (string)0;
+            $tax        =   ($this->request->get('identifier')->type == 1) ? (string)$this->reckonPersonTax($item['balance']) : (string)0;
             //税后余额
             $balance    =   bcsub($item['balance'], $tax, Service::DECIMAL);
 
@@ -75,7 +75,7 @@ class MusicianBalanceService extends Service
 
         foreach ($payer as $item) {
 
-            $tax = ($this->identifier->type == 1) ? (string)$this->reckonPersonTax($item->balance) : (string)0;
+            $tax = ($this->request->get('identifier')->type == 1) ? (string)$this->reckonPersonTax($item->balance) : (string)0;
             //税后余额
             $amount = (string)bcsub($item->balance, $tax, Service::DECIMAL);
 

@@ -40,7 +40,7 @@ class MusicianSongService extends Service
                     foreach ($clause_res as $clause_res_item) {
                         if($clause = json_decode($clause_res_item)) {
                             foreach ($clause as $clause_item) {
-                                if (in_array($clause_item->stakeholder_id, $this->stakeholder_ids)) {
+                                if (in_array($clause_item->stakeholder_id, $this->request->get('stakeholder_ids'))) {
                                     $role = array_merge($role, Contract::transformRole($clause_item->right_type));
                                 }
                             }
@@ -143,7 +143,7 @@ class MusicianSongService extends Service
                 foreach ($clause_res as $clause) {
                     if ($clause = json_decode($clause)){
                         foreach ($clause as $clause_item) {
-                            if (in_array($clause_item->stakeholder_id, $this->stakeholder_ids)) {
+                            if (in_array($clause_item->stakeholder_id, $this->request->get('stakeholder_ids'))) {
                                 $role = array_merge($role, Contract::transformRole($clause_item->right_type));
                             }
                         }
@@ -227,7 +227,7 @@ class MusicianSongService extends Service
             $right = $role = $rights = [];
             if (!empty($item['contract']['stakeholder_contract'])) {
                 foreach ($item['contract']['stakeholder_contract'] as $stakeholder_contract) {
-                    if (in_array($stakeholder_contract['stakeholder_id'], $this->stakeholder_ids)) {
+                    if (in_array($stakeholder_contract['stakeholder_id'], $this->request->get('stakeholder_ids'))) {
                         $right[] = $stakeholder_contract;
                         $role = array_merge($role, Contract::transformRole($stakeholder_contract['right_type']));
 

@@ -85,7 +85,7 @@ class MusicianWithdrawService extends Service
     {
         if (RedisClient::instance('bills')->set(CacheKeyTools::billsConfirm($this->request->serial_no), true, 'EX', 3, 'NX')) {
 
-            $app = StakeholderIncomeSyncApp::query()->where(['serial_no'=>$this->request->serial_no, 'sync_status'=>1, 'withdraw_status'=>0, 'identifier'=>$this->identifier->identifier, 'type'=>1])->select(['id', 'subject_no', 'company_id', 'stakeholder_id', 'related_id'])->first();
+            $app = StakeholderIncomeSyncApp::query()->where(['serial_no'=>$this->request->serial_no, 'sync_status'=>1, 'withdraw_status'=>0, 'identifier'=>$this->request->get('identifier')->identifier, 'type'=>1])->select(['id', 'subject_no', 'company_id', 'stakeholder_id', 'related_id'])->first();
 
             DB::beginTransaction();
 
@@ -148,7 +148,7 @@ class MusicianWithdrawService extends Service
     {
         if (!$app = StakeholderIncomeSyncApp::query()->where([
                 'serial_no'=>$this->request->serial_no,
-                'identifier'=>$this->identifier->identifier,
+                'identifier'=>$this->request->get('identifier')->identifier,
                 'sync_status'=>1,
             ])
             ->first()) {

@@ -28,7 +28,13 @@ class PropertyTrackService extends Service
      */
     public function list()
     {
-        $res = PropertyTrack::query()->where(['create_admin'=>$this->identifier->company_id, 'from'=>1])
+        print_r($this->request->get('identifier'));
+        exit();
+
+        print_r(\request()->get('identifier'));
+        exit();
+
+        $res = PropertyTrack::query()->where(['create_admin'=>$this->request->get('identifier')->company_id, 'from'=>1])
                     ->when(filled($this->request->input('upload_time')), function (Builder $builder){
                         list($start, $end) = explode(' - ', $this->request->input('upload_time'));
                         $builder->whereBetween('upload_time', [trim($start), trim($end)]);
@@ -46,6 +52,7 @@ class PropertyTrackService extends Service
      */
     public function show()
     {
+
         $data = [];
 
         //详情
@@ -64,7 +71,7 @@ class PropertyTrackService extends Service
      */
     public function pending()
     {
-        $count = PropertyTrack::query()->where(['create_admin'=>$this->identifier->company_id])->whereNull('upload_time')->count();
+        $count = PropertyTrack::query()->where(['create_admin'=>$this->request->get('identifier')->company_id])->whereNull('upload_time')->count();
         return Response::success(['count'=>$count]);
     }
 

@@ -53,8 +53,6 @@ class Service
     public function __construct(Request $request)
     {
         $this->request          =   $request;
-        $this->identifier       =   $request->get('identifier');
-        $this->stakeholder_ids  =   $request->get('stakeholder_ids');
         $this->page             =   (int)$request->input('page', 1);
         $this->pageSize         =   (int)$request->input('pageSize', 10);
         $this->now              =   Carbon::now()->toDateTimeString();

@@ -30,7 +30,7 @@ class WithdrawService extends Service implements WithdrawInterface
         try {
 
             //修改状态-》提现中
-            StakeholderIncomeSyncApp::query()->where(['serial_no'=>$app->serial_no, 'identifier'=>$this->identifier->identifier, 'sync_status'=>1, 'withdraw_status'=>1])->update([
+            StakeholderIncomeSyncApp::query()->where(['serial_no'=>$app->serial_no, 'identifier'=>$this->request->get('identifier')->identifier, 'sync_status'=>1, 'withdraw_status'=>1])->update([
                 'withdraw_status'=>2
             ]);
 
@@ -43,7 +43,7 @@ class WithdrawService extends Service implements WithdrawInterface
             //提现申请日志
             StakeholderWithdrawAppLogs::query()->create([
                 'serial_no'  => $app->serial_no,
-                'identifier' => $this->identifier->identifier,
+                'identifier' => $this->request->get('identifier')->identifier,
                 'type'       => __FUNCTION__,
                 'withdraw_money'    => $app->total_money,
             ]);
@@ -72,7 +72,7 @@ class WithdrawService extends Service implements WithdrawInterface
         try {
 
             //修改状态-》提现中 -> 提现完成
-            StakeholderIncomeSyncApp::query()->where(['serial_no'=>$app->serial_no, 'identifier'=>$this->identifier->identifier, 'sync_status'=>1, 'withdraw_status'=>2])->update([
+            StakeholderIncomeSyncApp::query()->where(['serial_no'=>$app->serial_no, 'identifier'=>$this->request->get('identifier')->identifier, 'sync_status'=>1, 'withdraw_status'=>2])->update([
                 'withdraw_status'=>3
             ]);
 
@@ -85,7 +85,7 @@ class WithdrawService extends Service implements WithdrawInterface
             //提现申请日志
             StakeholderWithdrawAppLogs::query()->create([
                 'serial_no'  => $app->serial_no,
-                'identifier' => $this->identifier->identifier,
+                'identifier' => $this->request->get('identifier')->identifier,
                 'type'       => __FUNCTION__,
                 'withdraw_money'    => $app->total_money,
             ]);
@@ -115,7 +115,7 @@ class WithdrawService extends Service implements WithdrawInterface
         try {
 
             //修改状态-》提现中 -》 已确认
-            StakeholderIncomeSyncApp::query()->where(['serial_no'=>$app->serial_no, 'identifier'=>$this->identifier->identifier, 'sync_status'=>1, 'withdraw_status'=>2])->update([
+            StakeholderIncomeSyncApp::query()->where(['serial_no'=>$app->serial_no, 'identifier'=>$this->request->get('identifier')->identifier, 'sync_status'=>1, 'withdraw_status'=>2])->update([
                 'withdraw_status'=>1
             ]);
 
@@ -128,7 +128,7 @@ class WithdrawService extends Service implements WithdrawInterface
             //提现申请日志
             StakeholderWithdrawAppLogs::query()->create([
                 'serial_no'  => $app->serial_no,
-                'identifier' => $this->identifier->identifier,
+                'identifier' => $this->request->get('identifier')->identifier,
                 'type'       => __FUNCTION__,
                 'withdraw_money'    => $app->total_money,
             ]);

@@ -57,7 +57,7 @@ Route::group(["prefix"=>"issue"], function (){
 });
 
 //资产
-    Route::group(["prefix"=>"property"], function (){
+Route::group(["prefix"=>"property"], function (){
     Route::get('/track/list', 'PropertyTrackController@list');
     Route::get('/track/show', 'PropertyTrackController@show');
     Route::get('/track/pending', 'PropertyTrackController@pending');