From 4db66d1a60067a644a0ed102e39adc359748d13f Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 14 Sep 2021 16:30:29 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/LoginController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/LoginController.php b/app/Http/Controllers/Api/LoginController.php index 4e6153b..a734a7a 100644 --- a/app/Http/Controllers/Api/LoginController.php +++ b/app/Http/Controllers/Api/LoginController.php @@ -53,9 +53,9 @@ class LoginController extends Controller ]; $app = Factory::openPlatform($config); - dd($app); + dd($app['auth']); } -dd($agent->toArray()); + try { $res = $app->auth->session($code); if (!empty($res['errcode']) || empty($res['openid']) && empty($res['unionid'])) { From 59f631ee4fd93aa251d65ef900db5d865035fb3a Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Tue, 14 Sep 2021 16:31:12 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/AdminSupplier/Renderable/SelectProduct.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/AdminSupplier/Renderable/SelectProduct.php b/app/AdminSupplier/Renderable/SelectProduct.php index c224857..ad6c093 100644 --- a/app/AdminSupplier/Renderable/SelectProduct.php +++ b/app/AdminSupplier/Renderable/SelectProduct.php @@ -26,7 +26,10 @@ class SelectProduct extends LazyRenderable $grid->disableBatchActions(); //$grid->model()->where('status', ProductStatus::ON_SALE); - $grid->model()->where('supplier_id', Admin::user()->id); + $grid->model()->where([ + 'supplier_id' => Admin::user()->id, + 'status' => ProductStatus::ON_SALE + ]); $grid->quickSearch(['title', 'supplier.name'])->placeholder('搜索产品名称、供应商'); $grid->column('id'); From a846781e9a5ccc15f1cd572e47fe824f43b6b21a Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 14 Sep 2021 16:32:19 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/LoginController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/LoginController.php b/app/Http/Controllers/Api/LoginController.php index a734a7a..9fed667 100644 --- a/app/Http/Controllers/Api/LoginController.php +++ b/app/Http/Controllers/Api/LoginController.php @@ -53,7 +53,7 @@ class LoginController extends Controller ]; $app = Factory::openPlatform($config); - dd($app['auth']); + dd($app); } try { From bdc84a120731f565223d3a3bdfe68afad7e967f2 Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 14 Sep 2021 16:36:22 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/LoginController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Api/LoginController.php b/app/Http/Controllers/Api/LoginController.php index 9fed667..a295842 100644 --- a/app/Http/Controllers/Api/LoginController.php +++ b/app/Http/Controllers/Api/LoginController.php @@ -53,6 +53,7 @@ class LoginController extends Controller ]; $app = Factory::openPlatform($config); + dump($app['miniprogram']); dd($app); } From a46881d080624da41bd39683036bfb83acfc5671 Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 14 Sep 2021 16:45:32 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/LoginController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/LoginController.php b/app/Http/Controllers/Api/LoginController.php index a295842..551c8f7 100644 --- a/app/Http/Controllers/Api/LoginController.php +++ b/app/Http/Controllers/Api/LoginController.php @@ -53,8 +53,8 @@ class LoginController extends Controller ]; $app = Factory::openPlatform($config); - dump($app['miniprogram']); - dd($app); + $refreshToken = $app->getAuthorizer($appid)['authorization_info']['authorizer_refresh_token']; + $app = $app->miniProgram($appid, $refreshToken); } try { From 7a39e3a04176013595b80517177af2b6d235f1e4 Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 14 Sep 2021 16:48:51 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/LoginController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/LoginController.php b/app/Http/Controllers/Api/LoginController.php index 551c8f7..e9a80a2 100644 --- a/app/Http/Controllers/Api/LoginController.php +++ b/app/Http/Controllers/Api/LoginController.php @@ -53,7 +53,10 @@ class LoginController extends Controller ]; $app = Factory::openPlatform($config); - $refreshToken = $app->getAuthorizer($appid)['authorization_info']['authorizer_refresh_token']; + $refreshToken = $app->getAuthorizer($appid)['authorization_info']['authorizer_refresh_token'] ?? null; + if (!$refreshToken) { + return $this->error('获取refresh_token失败'); + } $app = $app->miniProgram($appid, $refreshToken); } From 9c47db2244c26fd3f5167ae6fd67defcdd8d4739 Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Tue, 14 Sep 2021 16:55:19 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DemandProductController.php | 3 +-- app/Admin/Repositories/DemandProduct.php | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 app/Admin/Repositories/DemandProduct.php diff --git a/app/Admin/Controllers/DemandProductController.php b/app/Admin/Controllers/DemandProductController.php index 381d311..0b51f17 100644 --- a/app/Admin/Controllers/DemandProductController.php +++ b/app/Admin/Controllers/DemandProductController.php @@ -3,11 +3,10 @@ namespace App\Admin\Controllers; use App\Admin\Extensions\Grid\AuditDemandProduct; -use App\Admin\Repositories\Product; +use App\Admin\Repositories\DemandProduct; use App\Common\ProductStatus; use App\Common\UserStatus; use App\Models\Category; -use App\Models\DemandProduct; use App\Models\Supplier; use Dcat\Admin\Form; use Dcat\Admin\Grid; diff --git a/app/Admin/Repositories/DemandProduct.php b/app/Admin/Repositories/DemandProduct.php new file mode 100644 index 0000000..d2a7f68 --- /dev/null +++ b/app/Admin/Repositories/DemandProduct.php @@ -0,0 +1,16 @@ + Date: Tue, 14 Sep 2021 17:03:48 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E7=AB=9E=E6=A0=87=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DemandBiddingController.php | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/app/AdminSupplier/Controllers/DemandBiddingController.php b/app/AdminSupplier/Controllers/DemandBiddingController.php index 151d8e2..cdc5483 100755 --- a/app/AdminSupplier/Controllers/DemandBiddingController.php +++ b/app/AdminSupplier/Controllers/DemandBiddingController.php @@ -109,18 +109,6 @@ class DemandBiddingController extends AdminController $form->disableViewButton(); $form->disableViewCheck(); - $demand_id = request('demand_id'); - - $isBidding = \App\Models\DemandBidding::query() - ->where('demand_id',$demand_id) - ->where([ - 'bidding_user_type' => DemandTraits::$col[1], - 'bidding_user_id' => Admin::user()->id - ]) - ->exists(); - if ($demand_id && $isBidding) { - Admin::exit('你已经竞标过了，无需重复参加'); - } $form->display('id')->disable(); if(request('is_bidding',0)) { @@ -145,6 +133,21 @@ class DemandBiddingController extends AdminController $form->bidding_user_id = Admin::user()->id; }); + $form->saving(function (Form $form) { + if ($form->isCreating()) { + $isBidding = \App\Models\DemandBidding::query() + ->where('demand_id',$form->demand_id) + ->where([ + 'bidding_user_type' => DemandTraits::$col[1], + 'bidding_user_id' => Admin::user()->id + ]) + ->exists(); + if ($isBidding) { + Admin::exit('你已经竞标过了，无需重复参加'); + } + } + }); + $form->saved(function (Form $form) { $provinceId = Demand::query()->where('id',$this->demand_id)->value('province_id'); From 30991590b7e7f4c9d68b4998a751b2ad7a21b9bd Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 14 Sep 2021 17:16:38 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extensions/Grid/MiniProgramUpload.php | 12 +++++++++- app/Http/Controllers/Api/TestController.php | 24 +++++++++++++++---- ready.md | 3 +++ 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/app/Admin/Extensions/Grid/MiniProgramUpload.php b/app/Admin/Extensions/Grid/MiniProgramUpload.php index cde211b..20cf969 100644 --- a/app/Admin/Extensions/Grid/MiniProgramUpload.php +++ b/app/Admin/Extensions/Grid/MiniProgramUpload.php @@ -68,8 +68,18 @@ class MiniProgramUpload extends RowAction if (!$refreshToken) { return $this->response()->error('获取refresh_token失败'); } + $miniProgram = $openPlatform->miniProgram($agent->appid, $refreshToken); + + //设置业务域名 + /** @var \EasyWeChat\OpenPlatform\Authorizer\MiniProgram\Domain\Client $domain */ + $domain = $miniProgram['domain']; + $res = $domain->setWebviewDomain([env('APP_URL')]); + if (!isset($res['errcode'], $res['errmsg']) || $res['errcode'] != 0 || $res['errmsg'] != 'ok') { + throw new \Exception('设置业务域名失败！'); + } + /** @var Client $code */ - $code = $openPlatform->miniProgram($agent->appid, $refreshToken)['code'] ?? null; + $code = $miniProgram['code'] ?? null; if (!$code) { return $this->response()->error('获取code失败'); } diff --git a/app/Http/Controllers/Api/TestController.php b/app/Http/Controllers/Api/TestController.php index 9287a04..4862e3f 100644 --- a/app/Http/Controllers/Api/TestController.php +++ b/app/Http/Controllers/Api/TestController.php @@ -2,10 +2,8 @@ namespace App\Http\Controllers\Api; -use App\Models\Agent; -use App\Models\Order; -use App\Models\OrderProductItem; -use App\Models\Product; +use App\Models\AdminSetting; +use EasyWeChat\Factory; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; @@ -18,7 +16,23 @@ class TestController { public function index() { - return $this->login(2); + $appid = 'wx5bd5789ad8f89524'; + $setting = AdminSetting::val(['service_appid', 'service_appsecret', 'service_token', 'service_aeskey']); + $config = [ + 'app_id' => $setting['service_appid'], + 'secret' => $setting['service_appsecret'], + 'token' => $setting['service_token'], + 'aes_key' => $setting['service_aeskey'], + ]; + + $app = Factory::openPlatform($config); + $refreshToken = $app->getAuthorizer($appid)['authorization_info']['authorizer_refresh_token'] ?? null; + if (!$refreshToken) { + return $this->error('获取refresh_token失败'); + } + $miniProgram = $app->miniProgram($appid, $refreshToken); + $domain = $miniProgram['domain']; + return $domain->setWebviewDomain([env('APP_URL')]); } /** diff --git a/ready.md b/ready.md index 44a0d40..be36952 100644 --- a/ready.md +++ b/ready.md @@ -42,6 +42,9 @@ TRUNCATE `users`; TRUNCATE `user_channels`; TRUNCATE `user_favs`; TRUNCATE `user_money_logs`; +TRUNCATE `withdrawal`; +TRUNCATE `withdrawal_alipay`; +TRUNCATE `withdrawal_bank`; TRUNCATE `workorder`; TRUNCATE `workorder_item`; From c48aef2409200a59c0bd53f734241ba5bae8d0b4 Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 14 Sep 2021 17:18:24 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/TestController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/TestController.php b/app/Http/Controllers/Api/TestController.php index 4862e3f..eec2526 100644 --- a/app/Http/Controllers/Api/TestController.php +++ b/app/Http/Controllers/Api/TestController.php @@ -32,7 +32,7 @@ class TestController } $miniProgram = $app->miniProgram($appid, $refreshToken); $domain = $miniProgram['domain']; - return $domain->setWebviewDomain([env('APP_URL')]); + return $domain->modify([env('APP_URL')]) && $domain->setWebviewDomain([env('APP_URL')]); } /** From 51c1dacfe15a3b08d4022e54199e7ffde420a2b1 Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 14 Sep 2021 17:20:08 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/TestController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/TestController.php b/app/Http/Controllers/Api/TestController.php index eec2526..4862e3f 100644 --- a/app/Http/Controllers/Api/TestController.php +++ b/app/Http/Controllers/Api/TestController.php @@ -32,7 +32,7 @@ class TestController } $miniProgram = $app->miniProgram($appid, $refreshToken); $domain = $miniProgram['domain']; - return $domain->modify([env('APP_URL')]) && $domain->setWebviewDomain([env('APP_URL')]); + return $domain->setWebviewDomain([env('APP_URL')]); } /** From cd7791914f48cce4a0466795575de0c88cd4734d Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 14 Sep 2021 17:22:25 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/TestController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/TestController.php b/app/Http/Controllers/Api/TestController.php index 4862e3f..eec2526 100644 --- a/app/Http/Controllers/Api/TestController.php +++ b/app/Http/Controllers/Api/TestController.php @@ -32,7 +32,7 @@ class TestController } $miniProgram = $app->miniProgram($appid, $refreshToken); $domain = $miniProgram['domain']; - return $domain->setWebviewDomain([env('APP_URL')]); + return $domain->modify([env('APP_URL')]) && $domain->setWebviewDomain([env('APP_URL')]); } /** From 1bc9bd87aa030e9fed5272829ee29a602d3a5474 Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 14 Sep 2021 17:22:55 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/TestController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/TestController.php b/app/Http/Controllers/Api/TestController.php index eec2526..fa0e402 100644 --- a/app/Http/Controllers/Api/TestController.php +++ b/app/Http/Controllers/Api/TestController.php @@ -32,7 +32,7 @@ class TestController } $miniProgram = $app->miniProgram($appid, $refreshToken); $domain = $miniProgram['domain']; - return $domain->modify([env('APP_URL')]) && $domain->setWebviewDomain([env('APP_URL')]); + return [$domain->modify([env('APP_URL')]), $domain->setWebviewDomain([env('APP_URL')])]; } /** From 9a6ba5d1300a610a25871894ea095d7ff0a9a98b Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 14 Sep 2021 17:26:40 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/TestController.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/TestController.php b/app/Http/Controllers/Api/TestController.php index fa0e402..b59f1dc 100644 --- a/app/Http/Controllers/Api/TestController.php +++ b/app/Http/Controllers/Api/TestController.php @@ -32,7 +32,15 @@ class TestController } $miniProgram = $app->miniProgram($appid, $refreshToken); $domain = $miniProgram['domain']; - return [$domain->modify([env('APP_URL')]), $domain->setWebviewDomain([env('APP_URL')])]; + + $host = env('APP_URL'); + $param = [ + "action" => "add", + "requestdomain" => [$host], + "uploaddomain" => [$host], + "downloaddomain" => [$host], + ]; + return [$domain->modify($param), $domain->setWebviewDomain([env('APP_URL')])]; } /**