From e2c2a776f9945f2ad3878e4e5fd26f91a3578059 Mon Sep 17 00:00:00 2001
From: weiz <weiz@lihai.com>
Date: Mon, 20 Nov 2023 10:18:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=81=E5=85=89=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/LogisticsLogic.php             | 10 +++++++---
 app/common.php                               | 19 +++++++++++++++++++
 app/common/controller/LogisticController.php | 10 ++++++++++
 config/app.php                               |  6 +++++-
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php
index fc76b59c..a5d18e1e 100644
--- a/app/api/logic/LogisticsLogic.php
+++ b/app/api/logic/LogisticsLogic.php
@@ -245,10 +245,14 @@ class LogisticsLogic extends BaseLogic
         //推送消息
         $register_id = Courier::field('register_id')->where('id',$courier['user_id'])->find();
         if($register_id && !empty($register_id['register_id'])){
-            $push_result = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！');
-            if($push_result['code'] == 0) {
-                Log::write('["极光推送："]'.$push_result['msg'],'error');
+            $push_result1 = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！');
+	        $push_result2 = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！');
+            if($push_result1['code'] == 0) {
+                Log::write('["极光推送："]'.$push_result1['msg'],'error');
             }
+	        if($push_result2['code'] == 0) {
+		        Log::write('["极光推送："]'.$push_result2['msg'],'error');
+	        }
         }
         return ['code'=>1, 'msg'=>'操作成功','data'=>['nickname'=>$courier['master_name'],'phone'=>$courier['master_phone']]];
     }
diff --git a/app/common.php b/app/common.php
index 13522c9e..960be279 100755
--- a/app/common.php
+++ b/app/common.php
@@ -341,6 +341,25 @@ function push_message($reg_id,$message){
     }
 }
 
+function push_message2($reg_id,$message){
+	//获取配置信息
+	$jpush_config = config('app.jpush2');
+	$app_key= $jpush_config['app_key'];     //这是app密钥，填你自己的
+	$master_secret= $jpush_config['master_secret'];    //这也是密钥，填你自己的
+	//实例化
+	$client = new Client($app_key,$master_secret);
+	$pusher = $client->push();
+	$pusher->setPlatform('all');
+	$pusher->addRegistrationId($reg_id);
+	$pusher->setNotificationAlert($message);
+	try {
+		$res = $pusher->send();
+		return ['code'=>1,'msg'=>'','data'=>$res];
+	} catch (\JPush\Exceptions\JPushException $e) {
+		return ['code'=>0,'msg'=>$e->getMessage(),'data'=>[]];
+	}
+}
+
 /**
 
  * 校验日期格式是否正确
diff --git a/app/common/controller/LogisticController.php b/app/common/controller/LogisticController.php
index f1f2fcf8..3c1ade3b 100644
--- a/app/common/controller/LogisticController.php
+++ b/app/common/controller/LogisticController.php
@@ -5,6 +5,7 @@
 	use app\common\model\logistics\Logistics;
 	use app\common\model\logistics\LogisticsRecord;
 	use app\common\model\logistics\Product;
+	use think\facade\Log;
 	
 	class LogisticController extends BaseLikeAdminController
 	{
@@ -178,4 +179,13 @@
 			//返回数据
 			return $result['code'] ==1  ? $this->success('配送完成') : $this->fail($result['msg']);
 		}
+		
+//		public function test() {
+//			$push_result = push_message2('1507bfd3f6c212e2012','您有一条新的配送任务，请尽快处理！！');
+//			if($push_result['code'] == 0) {
+//				Log::write('["极光推送："]'.$push_result['msg'],'error');
+//			}else{
+//				return $this->success('ok',$push_result);
+//			}
+//		}
 	}
\ No newline at end of file
diff --git a/config/app.php b/config/app.php
index c84880da..2dbd70d6 100755
--- a/config/app.php
+++ b/config/app.php
@@ -29,9 +29,13 @@ return [
     'error_message'    => '页面错误！请稍后再试～',
     // 显示错误信息
     'show_error_msg'   => false,
-    // 机关推送
+    // 极光推送
     'jpush' => [
         'app_key' => '5ced5ec5fa7bb86302944f0f',
         'master_secret' => 'd85135e7d8470c90b476e535',
     ],
+	'jpush2' => [
+		'app_key' => 'ef20394fbd9b59ead68f53b3',
+		'master_secret' => 'cb588b0d210df80b3659c543',
+	],
 ];