Merge remote-tracking branch 'origin/develop' into develop

app/Console/Commands/BalanceDue.php

@@ -43,6 +43,7 @@ class BalanceDue extends Command
      */
     public function handle()
     {
+    	Log::info('定时任务');
     	if (env('SMS_SWITCH' , '') == true) {
 			$orders = Order::query()
 				->where('status', OrderStatus::PAY_EARNEST)

app/Console/Kernel.php

@@ -27,7 +27,7 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
 		$schedule->command('demand:timeout')->everyMinute();
-		$schedule->command('balance:due')->everyMinute();
+		$schedule->command('balance:due')->timezone('Asia/Shanghai')->dailyAt('10:55');
         // $schedule->command('inspire')->hourly();
     }
 

app/Http/Controllers/Api/TestController.php

@@ -6,6 +6,7 @@ use App\Models\Agent;
 use App\Models\Order;
 use App\Models\OrderProductItem;
 use App\Models\Product;
+use App\Service\SmsService;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 
@@ -18,7 +19,8 @@ class TestController
 {
 	public function index()
 	{
-
+		$sms = new SmsService();
+		$sms->send('verify',['1','2'],[15677177320]);
 		return $this->login(2);
 	}
 

app/Service/SmsService.php

@@ -44,7 +44,7 @@ class SmsService
 		$this->client = new SmsClient($cred, 'ap-guangzhou', $clientProfile);
 	}
 
-	public function send($templateId, $templateParamSet, $phoneNumberSet, $signName = '易游天下')
+	public function send($templateId, $templateParamSet, $phoneNumberSet, $signName = '')
 	{
 		//if (!config('sms.debug') || config('sms.debug') == 'yes') {
 		//	Log::debug([$templateId, $templateParamSet, $phoneNumberSet, $signName]);

config/sms.php

@@ -8,7 +8,7 @@ return [
         'sms_sdk_app_id'=> env('SMS_SDK_APP_ID'),
         'secret_id' => env('SECRET_ID'),
         'secret_key' => env('SECRET_KEY'),
-        'sign_name' => '易游天下',
+        'sign_name' => env('SIGN_NAME','易游天下'),
         'templates' => [
 			'bidding' => '1120251', //{竞标人的公司名称}]参与了您发起的竞标{编号}，详情请登录{系统名称}查看。
 			'demand' => '1120254', //恭喜您中标啦！竞标[{编号}]已成功中标！详情请登录{系统名称}查看。