Merge branch 'master' into yang

app/Console/Commands/LogExpireDelete.php

@@ -46,7 +46,7 @@ class LogExpireDelete extends Command
     public function deleteLog(){
         $expire_duration=config('logging.expire_duration');//保留的日志天数
         $date=Carbon::now()->subDays($expire_duration)->format('Y-m-d');
-        DB::connection("mysql3306")->table('logs')->where('created_at','<',$date)->delete();
+        DB::table('logs')->where('created_at','<',$date)->delete();
         DB::statement('OPTIMIZE TABLE logs');
     }
 }

app/Log.php

@@ -12,7 +12,6 @@ use App\Traits\ModelLogChanging;
 class Log extends Model
 {
     use ModelTimeFormat;
-    protected $connection="mysql3306";
     protected $fillable = [
          'description','type','method', 'class', 'ip','id_user','created_at','updated_at'
     ];

app/Order.php

@@ -12,7 +12,6 @@ class Order extends Model
     use ModelLogChanging;
     use ModelTimeFormat;
 
-    protected $connection="mysql3306";
     protected $fillable = [
         'id',
         'batch_id',

app/OrderCommodity.php

@@ -11,7 +11,6 @@ class OrderCommodity extends Model
 {
     use ModelLogChanging;
 
-    protected $connection="mysql3306";
     protected $fillable = [
         'id', 'order_id','commodity_id', 'amount','wms_ptltaskid','location'
     ];

app/OrderPackage.php

@@ -20,7 +20,6 @@ class OrderPackage extends Model
 
     use ModelTimeFormat;
 
-    protected $connection="mysql3306";
     protected $fillable = [
         'order_id',
         'logistic_number',

app/OrderPackageCommodities.php

@@ -20,7 +20,6 @@ class OrderPackageCommodities extends Model
     /*
      * amount => OracleActAllocationDetails->qty_each
      */
-    protected $connection="mysql3306";
     protected $fillable = [
         'order_package_id','commodity_id','amount'
     ];

app/OwnerFeeDetail.php

@@ -13,7 +13,6 @@ class OwnerFeeDetail extends Model
 {
 //    use ModelLogChanging;
 
-    protected $connection="mysql3306";
     protected $fillable = [
         "owner_id",         //货主ID
         "worked_at",        //作业时间

app/Services/OrderCommodityService.php

@@ -49,7 +49,7 @@ class OrderCommodityService
         return $orderCommodities;
     }
     public function batchUpdate($updateParams){
-        return app(BatchUpdateService::class)->batchUpdate('order_commodities',$updateParams,"mysql3306");
+        return app(BatchUpdateService::class)->batchUpdate('order_commodities',$updateParams);
     }
 
     public function syncOrderCommodity(&$orderHeaders)

app/Services/OrderPackageCommoditiesService.php

@@ -26,7 +26,7 @@ class OrderPackageCommoditiesService
     protected $modelClass=OrderPackageCommodities::class;
 
     public function batchUpdate($params){
-        return app(BatchUpdateService::class)->batchUpdate('order_package_commodities',$params,"mysql3306");
+        return app(BatchUpdateService::class)->batchUpdate('order_package_commodities',$params);
     }
 
     public function create(array $params){
@@ -60,7 +60,7 @@ class OrderPackageCommoditiesService
 
     public function batchUpdateItself($column, array $params)
     {
-        return app(BatchUpdateService::class)->batchUpdateItself('order_package_commodities', $column, $params,"mysql3306");
+        return app(BatchUpdateService::class)->batchUpdateItself('order_package_commodities', $column, $params);
     }
 
     public function getByOrderNos($orderNos)

app/Services/OrderPackageExceptionTypeCountingRecordService.php

@@ -19,7 +19,7 @@ class OrderPackageExceptionTypeCountingRecordService
      */
     public function updateOrCreate($days)
     {
-        DB::connection("mysql3306")->table("order_packages")
+        DB::table("order_packages")
             ->select(['exception_type',
                 DB::raw('count( * ) AS exception_type_count'),
                 DB::raw("DATE_FORMAT( sent_at, '%Y-%m-%d' ) AS sent_at_date "),
@@ -39,7 +39,7 @@ class OrderPackageExceptionTypeCountingRecordService
 
     public function updateOrCreateByDate($date)
     {
-        DB::connection("mysql3306")->table("order_packages")
+        DB::table("order_packages")
             ->select(['exception_type',
                 DB::raw('count( * ) AS exception_type_count'),
                 DB::raw("DATE_FORMAT( sent_at, '%Y-%m-%d' ) AS sent_at_date "),

app/Services/OrderPackageService.php

@@ -31,7 +31,7 @@ class OrderPackageService
 
     public function batchUpdate(array $params)
     {
-        return app(BatchUpdateService::class)->batchUpdate('order_packages', $params,"mysql3306");
+        return app(BatchUpdateService::class)->batchUpdate('order_packages', $params);
     }
 
     /** @var OrderTrackingService $orderTrackingService */

app/Services/OrderService.php

@@ -66,7 +66,7 @@ class OrderService
 
     public function batchUpdate($params)
     {
-        return app(BatchUpdateService::class)->batchUpdate('orders', $params,"mysql3306");
+        return app(BatchUpdateService::class)->batchUpdate('orders', $params);
     }
 
 

app/Services/PackageStatisticsService.php

@@ -19,7 +19,7 @@ class PackageStatisticsService
      */
     private function conditionQuery(array $params){
         $ownerIds = app('UserService')->getPermittingOwnerIds(auth()->user());
-        $query = DB::connection("mysql3306")->table('order_packages')->select(DB::raw('COUNT(*) AS count'))
+        $query = DB::table('order_packages')->select(DB::raw('COUNT(*) AS count'))
             ->whereIn('order_packages.owner_id',$ownerIds)
             ->whereNotNull('logistic_id')
             ->leftJoin('orders','order_packages.order_id','orders.id')

app/StoreItem.php

@@ -12,7 +12,6 @@ class StoreItem extends Model
     use ModelLogChanging;
 
     use ModelTimeFormat;
-    protected $connection="mysql3306";
     protected $fillable=[
         'store_id','asn_line_code','name',
         'sku','barcode','depository_id','amount','quality','status','commodity_id','expected_amount'