功能优化

@@ -170,6 +170,6 @@ trait UserGrid
         $this->gridTextField('login_times')->sortable();
         $this->gridTextField('login_times')->sortable();
 //        $this->gridDateField('last_login_time');
 //        $this->gridDateField('last_login_time');
         $this->gridDateField('created_at', __('registered_at'));
         $this->gridDateField('created_at', __('registered_at'));
-//        $this->gridSingleImageField('invite_qr_code', '小程序码');
+        $this->gridSingleImageField('invite_qr_code', '推广二维码');
     }
     }
 }
 }

@@ -77,7 +77,7 @@ class ToolCommand extends Command
         })->chunkById(100, function ($users)  {
         })->chunkById(100, function ($users)  {
             $users->each(function ($user) {
             $users->each(function ($user) {
                 // 生成用户小程序码
                 // 生成用户小程序码
-                $this->generateUserMiniProgramCode($user);
+                $this->generateUserQrCode($user);
             });
             });
         });
         });
     }
     }

@@ -62,7 +62,7 @@ class UserCreatedJob extends BaseJob
             $this->log('尝试次数过多');
             $this->log('尝试次数过多');
         } else {
         } else {
             // 生成用户小程序码
             // 生成用户小程序码
-            $this->generateUserMiniProgramCode($this->model);
+            $this->generateUserQrCode($this->model);
             // 创建用户的邀请记录
             // 创建用户的邀请记录
             $this->recordInviteRecord($this->model);
             $this->recordInviteRecord($this->model);
             // 创建用户钱包
             // 创建用户钱包

@@ -17,31 +17,15 @@
 namespace App\Models\Traits;
 namespace App\Models\Traits;
 
 
 use App\Factories\WechatFactory;
 use App\Factories\WechatFactory;
-use App\Jobs\User\TimesRecordCreatedJob;
-use App\Jobs\User\UserTimesUpdateJob;
-use App\Models\Category\CategoryLabelItem;
 use App\Models\Category\CategoryLabelItemRemote;
 use App\Models\Category\CategoryLabelItemRemote;
 use App\Models\Category\CategoryLabelRemote;
 use App\Models\Category\CategoryLabelRemote;
 use App\Models\Category\CategoryRemote;
 use App\Models\Category\CategoryRemote;
-use App\Models\Chat\ChatRecordItem;
 use App\Models\Chat\ChatRecordItemRemote;
 use App\Models\Chat\ChatRecordItemRemote;
 use App\Models\Chat\ChatRecordRemote;
 use App\Models\Chat\ChatRecordRemote;
-use App\Models\System\SystemSetting;
-use App\Models\User\TimesRecord;
 use App\Models\User\TimesRecordRemote;
 use App\Models\User\TimesRecordRemote;
-use App\Models\User\User;
 use App\Models\User\UserRemote;
 use App\Models\User\UserRemote;
-use App\Util\OpenAI\src\OpenAi;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Http\Response;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
-use Tectalic\OpenAi\Authentication;
-use Tectalic\OpenAi\ClientException;
-use Tectalic\OpenAi\Manager;
+use Illuminate\Support\Facades\Storage;
+use SimpleSoftwareIO\QrCode\Facades\QrCode;
 
 
 /**
 /**
  * Trait SyncTrait
  * Trait SyncTrait
@@ -61,11 +45,15 @@ trait SyncTrait
                 'user_id' => $model->user_id,
                 'user_id' => $model->user_id,
                 'category_id' => $model->category_id,
                 'category_id' => $model->category_id,
                 'label_id' => $model->label_id,
                 'label_id' => $model->label_id,
+                'type' => $model->type,
+                'consume_times' => $model->consume_times,
+                'context' => $model->context,
                 'labels' => my_json_encode($model->labels),
                 'labels' => my_json_encode($model->labels),
                 'start_statement' => $model->start_statement,
                 'start_statement' => $model->start_statement,
                 'question' => $model->question,
                 'question' => $model->question,
                 'ai_model' => $model->ai_model,
                 'ai_model' => $model->ai_model,
                 'status' => $model->status,
                 'status' => $model->status,
+                'synchronized' => 1,
                 'created_at' => $model->created_at,
                 'created_at' => $model->created_at,
                 'updated_at' => $model->updated_at,
                 'updated_at' => $model->updated_at,
             ]);
             ]);
@@ -140,6 +128,8 @@ trait SyncTrait
                 if (!UserRemote::find($model->id)) {
                 if (!UserRemote::find($model->id)) {
                     UserRemote::create([
                     UserRemote::create([
                         'id' => $model->id,
                         'id' => $model->id,
+                        'pid'      => $model->pid,
+                        'gid'      => $model->gid,
                         'name'      => $model->name,
                         'name'      => $model->name,
                         'password'  => $model->password,
                         'password'  => $model->password,
                         'mobile'    => $model->mobile,
                         'mobile'    => $model->mobile,
@@ -165,6 +155,8 @@ trait SyncTrait
                 if(!UserRemote::find($model->id)) {
                 if(!UserRemote::find($model->id)) {
                     UserRemote::create([
                     UserRemote::create([
                         'id' => $model->id,
                         'id' => $model->id,
+                        'pid'      => $model->pid,
+                        'gid'      => $model->gid,
                         'name'      => $model->name,
                         'name'      => $model->name,
                         'username'      => $model->username,
                         'username'      => $model->username,
                         'password'  => $model->password,
                         'password'  => $model->password,
@@ -180,8 +172,8 @@ trait SyncTrait
                         'login_times'     => $model->login_times,
                         'login_times'     => $model->login_times,
                         'created_at'     => $model->created_at,
                         'created_at'     => $model->created_at,
                     ]);
                     ]);
-                    $model->synchronized = 1;
-                    $model->save();
+//                    $model->synchronized = 1;
+//                    $model->save();
                 }
                 }
                 break;
                 break;
         }
         }
@@ -356,18 +348,84 @@ trait SyncTrait
     }
     }
 
 
     /**
     /**
-     * 创建用户的邀请二维码
+     * 本地生成文件
      *
      *
-     * @param $user
+     * @param $model
+     * @return string
      */
      */
-    public function generateUserMiniProgramCode($user)
+    public function generateUserQrCode($user)
     {
     {
-        $factory = app(WechatFactory::class);
-        $result = $factory->generateMiniProgramCode($user->id);
-        if ($result) {
-            $user->invite_qr_code = $result;
+        // 设置上传路径和文件名
+        $dir = config('filesystems.disks.qr_code.root');
+        $id = $user->id;
+//            $logo = splice_file_path(optional($model->enterprise)->logo);
+//            if (!$logo) {
+//                $logo =   config('app.url') .'/assets/admin/img/logo.png';
+//            }
+        // add by Richer 于2022年6月10日14:02:26使用系统的logo
+        dump($dir);
+        // 生成二维码
+        if (!is_dir($dir)) {
+            mkdir(iconv("UTF-8", "GBK", $dir), 0777, true);
+        }
+        $filename = $id .'.png';
+        $filepath   = $dir . '/' . $filename;
+
+        dump($filepath);
+        $url = config('app.url') .  '?inviter_id='.$user->id;
+
+//            if (!file_exists($filepath)) {
+        // 生成二维码
+        QrCode::format('png')
+            ->backgroundColor(255, 255, 255) // 设置背景色
+            ->size(200) // 设置尺寸
+            ->margin(1) // 边距设置
+//                    ->eyeColor(0, 0, 0, 0, 255, 215, 0)
+//                    ->eyeColor(1, 0, 0, 0, 255, 215, 0)
+//                    ->eyeColor(2, 0, 0, 0, 255, 215, 0)
+//                    ->eyeColor(1, 0, 0, 0, 205, 127, 50)
+//                    ->eyeColor(1, 0, 0, 0, 166, 124, 64)
+            ->errorCorrection('H') // 容错级别设置:
+            ->generate($url, $filepath);
+//            }
+        // 返回二维码图片路径
+        $img_src = config('filesystems.disks.qr_code.url') . '/'. $filename;
+        dump($img_src);
+
+        // 创建一张空的画布，像素3628x1757，背景白色
+//            $img = Image::canvas(300, 300, '#fff');
+//            // 获取本地图片，可以获取input上传文件
+//            $leftImage = Image::make('https://www.baidu.com/img/flexible/logo/pc/result.png')->resize(30, 30);
+//            $rightImage = Image::make($img_src)->resize(220, 220);
+//            // 插入到画布，left-top是距离左侧和顶部，值对应的是后面 100 100 处
+//            $img->insert($leftImage, 'left-top', 0, 0);
+//            $img->insert($rightImage, 'center');
+//            //可以直接返回图像，也可通过$img->save()进行保存图片
+        $user->invite_qr_code = ltrim($img_src);
         $user->save();
         $user->save();
+
+        return $img_src;
     }
     }
+
+    /**
+     * 创建用户的邀请二维码
+     *
+     * @param $user
+     */
+    public function generateUserQrCode1($user)
+    {
+        $url = config('app.url') .  '?inviter_id='.$user->id;
+
+        QrCode::generate($url, '../public/q/qrcode.svg');
+
+        $user_id = $user->id;
+
+
+
+        $filename = $user_id . '.png'; // 文件名
+        Storage::disk('qr_code')->put($filename, $url); // 存储到本地
+
+        return  $url = Storage::disk('qr_code')->url($filename); // 获取 URL;
     }
     }
 
 
     /**
     /**

@@ -102,10 +102,10 @@ return [
             'root' => storage_path('app/public/chunk_file'),
             'root' => storage_path('app/public/chunk_file'),
         ],
         ],
         // 用户小程序码
         // 用户小程序码
-        'mini_program_code' => [
+        'qr_code' => [
             'driver' => 'local',
             'driver' => 'local',
-            'root' => storage_path('app/public/mini_program_code'),
-            'url' => env('APP_URL') . '/storage/mini_program_code',
+            'root' => storage_path('app/public/qr_code'),
+            'url' => env('APP_URL') . '/storage/qr_code',
             'visibility' => 'public',
             'visibility' => 'public',
         ],
         ],
     ],
     ],

 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>chatApp</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>chatApp</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-        document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.fc0b6f42.js></script><script src=./static/js/index.293a48ba.js></script></body></html>
+        document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.87f773bf.js></script><script src=./static/js/index.c244513e.js></script></body></html>