社媒对接

app/Admin/Controllers/AuthController.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 
 use App\Models\DistAdminDistributor;
+use DateTimeZone;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Http\Controllers\AuthController as BaseAuthController;

app/Admin/Controllers/BaseVideoController.php

@@ -6,6 +6,7 @@ use App\Admin\Repositories\BaseProductCategory;
 use App\Admin\Repositories\BaseVideo;
 use App\Admin\Repositories\BaseVideoCategory;
 use App\Libraries\CommonHelper;
+use Carbon\Carbon;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;

app/Distributor/Controllers/SmmPostController.php

@@ -79,7 +79,7 @@ class SmmPostController extends AdminDistController
                 ->options([ 0=>admin_trans_label('graphic'), 1=>admin_trans_label('videos')])->default(0)->required();
 
             //用户当前时间
-            $now = utcToLocalTime(Carbon::now());
+            $now = utcToLocalTime();
             $form->datetime('send_time', admin_trans_label('send_time'))->placeholder(' ')->default($now)->required();
 
             $rootAccounts = SmmUserAccount::getUserAccounts();

app/helpers.php

@@ -1,5 +1,6 @@
 <?php
 
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Session;
@@ -344,11 +345,17 @@ if (!function_exists('toStoragePath')) {
 
 /*
  * 将UTC时间转换为当前浏览器时区时间
+ * 空，返回当前浏览器时间
  */
 if (!function_exists('utcToLocalTime')) {
-    function utcToLocalTime($utcTime) {
+    function utcToLocalTime($utcTime = '') {
         $timeZoneName = Session::get('timeZoneName') ?? 'UTC';
 
+        if (empty($utcTime)) {
+            return Carbon::now($timeZoneName)->format('Y-m-d H:i:s');
+        }
+
+
         // 创建 UTC 时区对象
         $utcTimezone = new DateTimeZone('UTC');
 
@@ -369,9 +376,15 @@ if (!function_exists('utcToLocalTime')) {
 
 /*
  * 将当前浏览器时区时间转换为UTC时间
+ * 空返回当前的UTC时间
  */
 if (!function_exists('localTimeToUtc')) {
-    function localTimeToUtc($inputTime) {
+    function localTimeToUtc($inputTime = '') {
+
+        if (empty($inputTime)) {
+            return Carbon::now('UTC')->format('Y-m-d H:i:s');
+        }
+
         $timeZoneName = Session::get('timeZoneName') ?? 'UTC';
 
         // 创建分销商时区对象