Merge branch 'Haozi'

app/Http/Controllers/api/email/SendEmailsController.php

@@ -19,12 +19,12 @@ class SendEmailsController extends Controller
                 'description'=>$request['description'],
             ];
         }else{
-            $email=User::query()->where('name','ldaaww')->pluck('email');
+            $email=User::query()->where('name','zhouzhendong')->pluck('email');
             $load=[
                 'title'=>'上传代码邮件通知',
                 'description'=>'开发者上传代码成功，如需部署请做后续操作',
             ];
         }
-        event(new GitPushedEvent($email,$load));
+        if ($email)event(new GitPushedEvent($email,$load));
     }
 }

app/Services/InventoryAccountService.php

@@ -47,7 +47,7 @@ class InventoryAccountService
         $ownerIds=app('OwnerService')->getSelection();
         $inventories=InventoryAccount::query()->with(['owner','creator'])->orderBy('id','desc')->whereIn('owner_id',$ownerIds);
         $columnQueryRules=[
-            'owner_id' => ['multi' => ','],
+            'owner' => ['alias'=>'owner_id','multi' => ','],
             'type' => ['multi' => ','],
             'date_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'date_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],

ci/executeCommand.sh

@@ -24,3 +24,7 @@ for file in `ls $update_path`
     done
 
 sshpass -p $password ssh -p 10022 $username@$Ip "cd $dsc; sudo php artisan view:clear"
+# shellcheck disable=SC2164
+cd "$update_path"
+# shellcheck disable=SC2035
+sudo rm -rf *

ci/judgePush.sh

@@ -7,7 +7,7 @@ path=$1
 # shellcheck disable=SC2164
 cd "$update_path"
 # shellcheck disable=SC2035
-rm -rf *
+#rm -rf *
 
 #将项目文件中3分钟之前改动的文件存到update文件
 # shellcheck disable=SC2038

ci/scpUpdate.sh

@@ -19,6 +19,6 @@ expect {
 expect eof"
 done
 
-sudo chmod 775 $update_path/* -R
+sudo chmod 775 $dsc/* -R