合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2052

@@ -13,6 +13,7 @@ use App\Console\Commands\Domain\DomainInfo;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Models\Ai\AiBlog;
 use App\Models\Ai\AiBlog;
 use App\Models\Ai\AiBlogAuthor;
 use App\Models\Ai\AiBlogAuthor;
+use App\Models\Ai\AiCommand;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\V6WeeklyReport;
 use App\Models\Com\V6WeeklyReport;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
@@ -31,6 +32,7 @@ use App\Models\WebSetting\WebLanguage;
 use App\Models\WebSetting\WebSetting;
 use App\Models\WebSetting\WebSetting;
 use App\Models\Workchat\MessagePush;
 use App\Models\Workchat\MessagePush;
 use App\Services\AiBlogService;
 use App\Services\AiBlogService;
+use App\Services\AiCommandService;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Schema;
@@ -54,6 +56,12 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
+        $string = '<p>Wow, the 137th Canton Fair was quite a game changer for EV Charging Pile suppliers! Seriously, it showcased some amazing growth in international participation and trade opportunities. Can you believe it? They reported a record-breaking 288,938 overseas buyers from 219 countries and regions, which is a 17.3% jump compared to the last fair. This kind of surge really highlights just how much the demand for electric vehicle infrastructure is ramping up. Industry forecasts suggest global EV sales could hit around 26 million units by 2030! And get this, export intentions at the fair climbed to a whopping $25.44 billion, marking a 3% increase. It’s clear that this fair has become a vital hub for manufacturers and suppliers in the EV Charging Pile sector, connecting them with international markets. Plus, the online platform keeps the networking going year-round, so companies can tap into new opportunities even after the fair wraps up. As everyone gears up for the 138th Canton Fair, it’s the perfect time for businesses to strategically carve out their space in the ever-growing EV charging scene.</p><img src="https://ecdn6.globalso.com/public/img/2025-05-24/9834757034_0.png" alt="Unlocking Global Opportunities at the 137th Canton Fair for Ev Charging Pile Suppliers" itemprop="image">';
+        $promote = AiCommand::where(['key' => 'ai_layout_design'])->first();
+        $promote = str_replace("{html}", $string, $promote->ai);
+        $aiCommandService = new AiCommandService();
+        $result = $aiCommandService->send_layout_design($promote);
+        dd($result);
         return true;
         return true;
     }
     }
 
 

@@ -6,6 +6,7 @@ namespace App\Console\Commands\Test;
 
 
 use App\Helper\Common;
 use App\Helper\Common;
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
+use App\Models\Ai\AiCommand;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\HomeCount\Count;
 use App\Models\HomeCount\Count;
 use App\Models\Inquiry\InquiryFormData;
 use App\Models\Inquiry\InquiryFormData;
@@ -17,6 +18,7 @@ use App\Models\Project\ProjectUpdateTdk;
 use App\Models\SyncSubmitTask\SyncSubmitTask as SyncSubmitTaskModel;
 use App\Models\SyncSubmitTask\SyncSubmitTask as SyncSubmitTaskModel;
 use App\Models\WebSetting\Translate as TranslateModel;
 use App\Models\WebSetting\Translate as TranslateModel;
 use App\Models\WebSetting\WebLanguage;
 use App\Models\WebSetting\WebLanguage;
+use App\Services\AiCommandService;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Carbon\Carbon;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
@@ -60,6 +62,13 @@ class Test extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
+        $string = '';
+        $promote = AiCommand::where(['key' => 'ai_layout_design'])->frist();
+        $promote = str_replace("{html}", $string, $promote->ai);
+        $aiCommandService = new AiCommandService();
+        $result = $aiCommandService->send_layout_design($promote);
+        dd($result);
+
         $string = 'eyJpdiI6ImxDWW96VUdGVk5QcEZ5dnRyd2lzVkE9PSIsInZhbHVlIjoiRGJSRXdQZDdtMFp1Tjh5c21jTWRKbjh4SWNMeWpRR1hWdE1HdVR3cEI5MjNYdjA0d2hKemV5ZjFoNUd4enNKaklaNXZwUUFtbDhIUkxyckVwYTJ6YnE3V2pMdmUyeU5lblNPQXNsbHl2U0hFOTZ1NERTTStUb2dnQmhMTzZMMXVCV0REeiszQ3NcL0l1ZGhTSkI5a3J3TkRoVFhteHpFcXpcL3FwRkVGVG1sN2xBTlFJemZiZ3N1Sk1PT3Z2T1Jld2MiLCJtYWMiOiIzZmU5OTRiZTMyNWZhNzczMzUzZTc1YjFlODg0MGFhNDJlM2Q2MDhhMDY4YWQxNWFlNjNlYjczYmJmZThkOWJlIn0%3D';
         $string = 'eyJpdiI6ImxDWW96VUdGVk5QcEZ5dnRyd2lzVkE9PSIsInZhbHVlIjoiRGJSRXdQZDdtMFp1Tjh5c21jTWRKbjh4SWNMeWpRR1hWdE1HdVR3cEI5MjNYdjA0d2hKemV5ZjFoNUd4enNKaklaNXZwUUFtbDhIUkxyckVwYTJ6YnE3V2pMdmUyeU5lblNPQXNsbHl2U0hFOTZ1NERTTStUb2dnQmhMTzZMMXVCV0REeiszQ3NcL0l1ZGhTSkI5a3J3TkRoVFhteHpFcXpcL3FwRkVGVG1sN2xBTlFJemZiZ3N1Sk1PT3Z2T1Jld2MiLCJtYWMiOiIzZmU5OTRiZTMyNWZhNzczMzUzZTc1YjFlODg0MGFhNDJlM2Q2MDhhMDY4YWQxNWFlNjNlYjczYmJmZThkOWJlIn0%3D';
         $string_aicc = 'eyJpdiI6ImE0UDhxK25EY3RXLzI3bGZYM3BRVUE9PSIsInZhbHVlIjoiZ01IN0JBMmpNQ0EwWjJ5VmhMVFNrS2ZlRjY3ZmVpRExtdjh3MTQ4enkyK2gzMjJCajV1QXNKYjA4YlV6Z0dVMU0xMWdOTmJXZ0NWTDdRS3lSUWNhNmJsUW5qc0pIYjE4cm40ZkVXNkdibWVnSVR2dG4wUVp5Y1MyU3RrUnJZd3RCa1IzZ05nRC9FVUt5Q2xuZmVYNDFnPT0iLCJtYWMiOiIyZjZiYmRjNWY5N2E0MGUxNjAzNWYxZjVlMGUyNWE2OTk0MzhiY2UyYWNkYzY5MzA0YmJmYmYzNjM1YjIyY2QwIn0=';
         $string_aicc = 'eyJpdiI6ImE0UDhxK25EY3RXLzI3bGZYM3BRVUE9PSIsInZhbHVlIjoiZ01IN0JBMmpNQ0EwWjJ5VmhMVFNrS2ZlRjY3ZmVpRExtdjh3MTQ4enkyK2gzMjJCajV1QXNKYjA4YlV6Z0dVMU0xMWdOTmJXZ0NWTDdRS3lSUWNhNmJsUW5qc0pIYjE4cm40ZkVXNkdibWVnSVR2dG4wUVp5Y1MyU3RrUnJZd3RCa1IzZ05nRC9FVUt5Q2xuZmVYNDFnPT0iLCJtYWMiOiIyZjZiYmRjNWY5N2E0MGUxNjAzNWYxZjVlMGUyNWE2OTk0MzhiY2UyYWNkYzY5MzA0YmJmYmYzNjM1YjIyY2QwIn0=';
         $string_fob = 'eyJpdiI6IlBwOXRPL1ZUV1F1SHZpVnpaQkUwSWc9PSIsInZhbHVlIjoiVGFxcTFmSDBvL0hkSldEWkh0elRlaXpkOHJTQW1OeWlDZmMvMndaeXF0SE5YYXd1YjE3MWpPTTZuVEdlSEYzY3VmeXdSbmI5T0d0ZkxXZTRxb3laNWpCdFJxQ2dlQlExemZrRVFFeStxQm40a2VuNWxpUmFpdFoyZjJxMzRLYXBOK0hKa0JvcFlVQklDWE9yR3hEdEVBPT0iLCJtYWMiOiI3NDg5ZDViMjJiNzM3ZjAyZDUxZTAxODVlYjdhYWVmZWFjZDM2ZTE0M2NkNjEwODdjNTJjNmM1NmNlOTUxYjdiIn0=';
         $string_fob = 'eyJpdiI6IlBwOXRPL1ZUV1F1SHZpVnpaQkUwSWc9PSIsInZhbHVlIjoiVGFxcTFmSDBvL0hkSldEWkh0elRlaXpkOHJTQW1OeWlDZmMvMndaeXF0SE5YYXd1YjE3MWpPTTZuVEdlSEYzY3VmeXdSbmI5T0d0ZkxXZTRxb3laNWpCdFJxQ2dlQlExemZrRVFFeStxQm40a2VuNWxpUmFpdFoyZjJxMzRLYXBOK0hKa0JvcFlVQklDWE9yR3hEdEVBPT0iLCJtYWMiOiI3NDg5ZDViMjJiNzM3ZjAyZDUxZTAxODVlYjdhYWVmZWFjZDM2ZTE0M2NkNjEwODdjNTJjNmM1NmNlOTUxYjdiIn0=';

+<?php
+/**
+ * @remark :
+ * @name   :BTemplateModuleRandomController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/5/27 15:33
+ */
+
+namespace App\Http\Controllers\Bside\Template;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\BTemplate\BTemplateModuleRandomLogic;
+use Illuminate\Http\Request;
+
+class BTemplateModuleRandomController extends BaseController
+{
+    public function __construct(Request $request)
+    {
+        parent::__construct($request);
+        $this->logic = new BTemplateModuleRandomLogic();
+    }
+
+    /**
+     * @remark :获取当前项目所有随机模块
+     * @name   :getRandomList
+     * @author :lyh
+     * @method :post
+     * @time   :2025/5/27 16:00
+     */
+    public function getRandomList(){
+        $this->request->validate([
+            'project_id'=>'required',
+        ],[
+            'project_id.required' => 'project_id不能为空',
+        ]);
+        $data = $this->logic->getRandomList();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :设置为随机模块
+     * @name   :saveRandomModule
+     * @author :lyh
+     * @method :post
+     * @time   :2025/5/27 15:34
+     */
+    public function saveRandomModule(){
+        $this->request->validate([
+            'module_id'=>'required',
+            'uuid'=>'required',
+            'project_id'=>'required',
+            'html'=>'required',
+        ],[
+            'module_id.required' => '左侧模块id不能为空',
+            'uuid.required' => 'uuid唯一不能为空',
+            'project_id.required' => 'project_id不能为空',
+            'html.required' => 'html不能为空',
+        ]);
+        $data = $this->logic->saveRandomModule();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :获取当前随机模块详情
+     * @name   :getRandomInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2025/5/27 15:47
+     */
+    public function getRandomInfo(){
+        $this->request->validate([
+            'module_id'=>'required',
+            'uuid'=>'required',
+            'project_id'=>'required',
+        ],[
+            'module_id.required' => '左侧模块id不能为空',
+            'uuid.required' => 'uuid唯一不能为空',
+            'project_id.required' => 'project_id不能为空',
+        ]);
+        $data = $this->logic->getRandomInfo();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+
+}

+<?php
+/**
+ * @remark :
+ * @name   :BTemplateModuleRandomLogic.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/5/27 15:36
+ */
+
+namespace App\Http\Logic\Bside\BTemplate;
+
+use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Template\TemplateModuleRandom;
+
+class BTemplateModuleRandomLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new TemplateModuleRandom();
+        $this->param = $this->requestAll;
+    }
+
+    /**
+     * @remark :保存为随机模块
+     * @name   :saveRandomModule
+     * @author :lyh
+     * @method :post
+     * @time   :2025/5/27 15:38
+     */
+    public function saveRandomModule(){
+        //查询当前uuid是否已存在
+        $info = $this->model->read(['project_id'=>$this->user['project_id'],'uuid'=>$this->param['uuid'],'module_id'=>$this->param['module_id']]);
+        try {
+            if($info === false){
+                //执行新增数据
+                $this->model->add($this->param);
+            }else{
+                //执行编辑
+                $this->model->edit(['html'=>$this->param['html']],['id'=>$this->param['id']]);
+            }
+        }catch (\Exception $e){
+            $this->fail('保存失败，请联系管理员');
+        }
+        return $this->success();
+    }
+
+    /**
+     * @remark :获取当前项目的所有随机模块
+     * @name   :getRandomList
+     * @author :lyh
+     * @method :post
+     * @time   :2025/5/27 15:59
+     */
+    public function getRandomList(){
+        $data = $this->model->list(['project_id'=>$this->user['project_id']],'id',['id','uuid','project_id','module_id']);
+        return $this->success($data);
+    }
+
+    /**
+     * @remark :获取当前模块是否为随机模块
+     * @name   :getIsRandomModule
+     * @author :lyh
+     * @method :post
+     * @time   :2025/5/27 15:47
+     */
+    public function getRandomInfo(){
+        $info = $this->model->read(['project_id'=>$this->user['project_id'],'uuid'=>$this->param['uuid'],'module_id'=>$this->param['module_id']]);
+        if($info === false){
+            $info = [];
+        }
+        return $this->success($info);
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :TemplateModuleRandom.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/5/27 15:31
+ */
+
+namespace App\Models\Template;
+
+use App\Models\Base;
+
+/**
+ * @remark :随机模块
+ * @name   :TemplateModuleRandom
+ * @author :lyh
+ * @method :post
+ * @time   :2025/5/27 15:32
+ */
+class TemplateModuleRandom extends Base
+{
+    protected $table = 'gl_public_template_module_random';
+}

@@ -49,7 +49,14 @@ class AiCommandService
             "Content-Type:application/json;charset=utf-8",
             "Content-Type:application/json;charset=utf-8",
         );
         );
         $result = http_post($this->url,json_encode($param,true),$header);
         $result = http_post($this->url,json_encode($param,true),$header);
-        return $result;
+        $data = $result['content'][0]['data'] ?? '';
+        $data = trim($data, "\"\n");
+        $data = preg_replace('/^```html\s*/', '', $data); // 去除开头
+        $data = preg_replace('/\s*```$/', '', $data);     // 去除结尾
+        $data = str_replace("\\n", "\n", $data);
+        $data = str_replace('\"', '"', $data);
+
+        return ['data'=>$data];
     }
     }
 
 
 }
 }

@@ -443,7 +443,13 @@ Route::middleware(['bloginauth'])->group(function () {
             Route::any('/save', [\App\Http\Controllers\Bside\Template\BTemplateModuleProjectController::class, 'save'])->name('template_module_project_save');
             Route::any('/save', [\App\Http\Controllers\Bside\Template\BTemplateModuleProjectController::class, 'save'])->name('template_module_project_save');
             Route::any('/del', [\App\Http\Controllers\Bside\Template\BTemplateModuleProjectController::class, 'del'])->name('template_module_project_del');
             Route::any('/del', [\App\Http\Controllers\Bside\Template\BTemplateModuleProjectController::class, 'del'])->name('template_module_project_del');
         });
         });
-
+        //随机模块
+        Route::prefix('random')->group(function () {
+            //获取所有左侧模版
+            Route::any('/getRandomList', [\App\Http\Controllers\Bside\Template\BTemplateModuleRandomController::class, 'getRandomList'])->name('template_random_getRandomList');
+            Route::any('/getRandomInfo', [\App\Http\Controllers\Bside\Template\BTemplateModuleRandomController::class, 'getRandomInfo'])->name('template_random_getRandomInfo');
+            Route::any('/saveRandomModule', [\App\Http\Controllers\Bside\Template\BTemplateModuleRandomController::class, 'saveRandomModule'])->name('template_random_saveRandomModule');
+        });
         //编辑记录
         //编辑记录
         Route::prefix('log')->group(function () {
         Route::prefix('log')->group(function () {
             //获取所有左侧模版
             //获取所有左侧模版