From 1a94118ab46fd0334715d7972e2db61b6c1d7c31 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 17 Sep 2020 11:54:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Commands/MigrateStore.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Console/Commands/MigrateStore.php b/app/Console/Commands/MigrateStore.php index 235e28e..21faf3f 100644 --- a/app/Console/Commands/MigrateStore.php +++ b/app/Console/Commands/MigrateStore.php @@ -76,7 +76,7 @@ class MigrateStore extends Command 'user_id'=>$value->user_id, 'admin_id'=>$value->admin_id, - 'mm_user_id'=>$value->mm_user_id, + 'mm_user_id'=>$value->mm_user_id ?? 0, 'sort'=>$value->number, 'loudspeaker_imei'=>$value->loudspeaker_imei, 'name'=>$value->name, @@ -112,7 +112,7 @@ class MigrateStore extends Command 'created_at' => $value->time_add ?strtotime($value->time_add) : 0, 'updated_at' => time(), ]; - + // 获商户摊号 $stallInfo = ''; $res = preg_match('/[0-9]/', $value->name, $matches, PREG_OFFSET_CAPTURE); @@ -130,7 +130,7 @@ class MigrateStore extends Command $newData = $storeData; $res = DB::table($newTableName)->insert($newData); if(!$res){ - $error[] = ['id'=>$storeId]; + $error[] = ['id'=>$storeId]; break; } $bar->advance(); From 03a8d45668b9157e947f4603a2e048f51c4ba1bd Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 17 Sep 2020 13:00:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Admin/routes.php b/app/Admin/routes.php index ee1a31f..2141cb8 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -35,7 +35,7 @@ Route::group([ $router->get('/coupon/TieForm', 'CouponTieController@CouponTieForm'); $router->get('/couponTie', 'CouponTieController@CouponTieList'); - $router->resource('/coupon_setting', 'v3\couponSettingController'); + $router->resource('/coupon_setting', 'v3\CouponSettingController'); $router->resource('/coupon', 'v3\couponController'); //获取所有市场 $router->any('/api/getAllMarket', 'LanzuServiceSpeakerController@getAllMarkets'); From 023620a9146ee5299a44687c3ef0b2ae82084e45 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 17 Sep 2020 13:02:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Envoy.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Envoy.blade.php b/Envoy.blade.php index 1d2835e..5f9e5c6 100644 --- a/Envoy.blade.php +++ b/Envoy.blade.php @@ -1,4 +1,4 @@ -@servers(['lanzu_dev' => 'root@120.24.33.109','lanzu_prod' => 'root@123.57.93.158']) +@servers(['lanzu_dev' => 'root@120.24.33.109','lanzu_prod' => 'root@39.96.12.39']) @story('deploy_dev',['on' => 'lanzu_dev']) git_dev From 63edc588e6006992a78ccbba9c244b29e2ecf5d5 Mon Sep 17 00:00:00 2001 From: Mike Date: Fri, 18 Sep 2020 16:34:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/hvvY0ph12d.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 public/hvvY0ph12d.txt diff --git a/public/hvvY0ph12d.txt b/public/hvvY0ph12d.txt new file mode 100644 index 0000000..e32d578 --- /dev/null +++ b/public/hvvY0ph12d.txt @@ -0,0 +1 @@ +ac188fc0665166af7d4733630a59f50a \ No newline at end of file