Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

+<?php
+
+namespace App\Http\Controllers\Aside\Projects;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Projects\InquiryInfoLogic;
+
+/**
+ * @remark :询盘中心
+ * @class  :InquiryInfoController.php
+ * @author :lyh
+ * @time   :2023/7/11 14:33
+ */
+class InquiryInfoController extends BaseController
+{
+
+    /**
+     * @remark :获取询盘中心列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/11 15:23
+     */
+    public function lists(InquiryInfoLogic $inquiryInfoLogic){
+        $lists = $inquiryInfoLogic->getInquiryLists($this->map,$this->page,$this->row,$this->order);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
+     * @remark :保存询盘信息
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/11 15:33
+     */
+    public function save(InquiryInfoLogic $inquiryInfoLogic){
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $this->request->validate([
+                'id'=>'required'
+            ],[
+                'id.required' => 'ID不能为空'
+            ]);
+        }
+        //参数验证
+        $this->validationParam();
+        $inquiryInfoLogic->inquirySave();
+        $this->response('success');
+    }
+
+    /**
+     * @remark :参数验证
+     * @name   :validationParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/11 15:34
+     */
+    public function validationParam(){
+        $this->request->validate([
+            'name'=>'required',//名称
+            'email'=>'required',//邮箱
+            'phone'=>'required',//电话号码
+            'ip'=>'required',//ip
+            'forward_url'=>'required',//转发网址
+            'message'=>'required',//发送内容
+            'delay'=>'required',//延迟发送时间
+            'type'=>'required',//询盘1类型
+        ],[
+            'name.required' => '名称不能为空',
+            'email.required' => '邮箱不能为空',
+            'phone.required' => '电话号码不能为空',
+            'ip.required' => 'ip不能为空',
+            'forward_url.required' => '转发网址不能为空',
+            'message.required' => '发送内容不能为空',
+            'delay.required' => '延迟发送时间不能为空',
+            'type.required' => '类型不能为空',
+        ]);
+    }
+}

@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Storage;
 
 
 /**
 /**
  * 精准询盘
  * 精准询盘
- * Class InquiryController
+ * Class InquiryInfoController
  * @package App\Http\Controllers\Bside
  * @package App\Http\Controllers\Bside
  * @author zbj
  * @author zbj
  * @date 2023/5/4
  * @date 2023/5/4

+<?php
+
+namespace App\Http\Logic\Aside\Projects;
+
+use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Projects\InquiryInfo;
+
+/**
+ * @remark :询盘中心
+ * @class  :InquiryInfoLogic.php
+ * @author :lyh
+ * @time   :2023/7/11 15:20
+ */
+class InquiryInfoLogic extends BaseLogic
+{
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->param = $this->requestAll;
+        $this->model = new InquiryInfo();
+    }
+
+    /**
+     * @remark :获取列表
+     * @name   :getInquiryLists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/11 15:25
+     */
+    public function getInquiryLists($map,$page,$row,$order = 'id'){
+        $query = $this->model->leftJoin('gl_inquiry_user', 'gl_inquiry_user.xp_id', '=', 'gl_inquiry_info.id')
+            ->orderBy('gl_inquiry_info.'.$order,'desc');
+        //搜索条件处理
+        if(isset($map['domain'])){
+            $query = $query->where('gl_inquiry_info.domain','like','%'.$map['domain'].'%');
+        }
+        $query = $this->searchParam($query,$map);
+        $lists = $query->paginate($row, $this->selectParam(), 'page', $page);
+        return $this->success($lists);
+    }
+
+    /**
+     * @remark :查询字段
+     * @name   :selectParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/11 16:57
+     */
+    public function selectParam(){
+        $select = [
+            'gl_inquiry_info.*',
+            'gl_inquiry_user.user_id',
+            'gl_inquiry_user.user_name',
+            'gl_inquiry_user.time',
+            'gl_inquiry_user.message',
+            'gl_inquiry_user.ip',
+            'gl_inquiry_user.url',
+            'gl_inquiry_user.`status`',
+            'gl_inquiry_user.yanchi',
+            'gl_inquiry_user.send_time'
+        ];
+        return $select;
+    }
+
+    /**
+     * @remark :自定义添加特殊询盘信息
+     * @name   :inquirySave
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/12 9:22
+     */
+    public function inquirySave(){
+
+    }
+}

+<?php
+
+namespace App\Models\Projects;
+
+use App\Models\Base;
+
+/**
+ * @remark :询盘中心
+ * @class  :InquiryInfo.php
+ * @author :lyh
+ * @time   :2023/7/11 15:21
+ */
+class InquiryInfo extends Base
+{
+    protected $table = 'gl_inquiry_info';
+}

+<?php
+
+namespace App\Models\Projects;
+
+use App\Models\Base;
+
+/**
+ * @remark :询盘转发表
+ * @class  :InquiryUser.php
+ * @author :lyh
+ * @time   :2023/7/11 15:57
+ */
+class InquiryUser extends Base
+{
+    protected $table = 'gl_inquiry_user';
+}

@@ -12,5 +12,7 @@ use App\Models\Base;
  */
  */
 class Projects extends Base
 class Projects extends Base
 {
 {
-    protected $table = 'gl_projects';
+    //连接数据库
+    protected $connection = 'projects_mysql';
+    protected $table = 'projects';
 }
 }

@@ -12,5 +12,6 @@ use App\Models\Base;
  */
  */
 class ProjectsSeoTask extends Base
 class ProjectsSeoTask extends Base
 {
 {
-    protected $table = 'gl_project_seo_task';
+    protected $connection = 'projects_mysql';
+    protected $table = 'project_seo_task';
 }
 }

@@ -102,6 +102,25 @@ return [
                 PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
                 PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
             ]) : [],
             ]) : [],
         ],
         ],
+        'projects_mysql' => [
+            'driver' => 'mysql',
+            'url' => '', // DB_DATABASE_URL
+            'host' => '192.30.242.45', // DB_DATABASE_HOST
+            'port' => '3306', // DB_DATABASE_PORT
+            'database' => 'google_seo_ips', // DB_DATABASE_CUSTOM
+            'username' => 'google_seo_ips', // DB_DATABASE_USER
+            'password' => 'hW67iAkmhcb5jHFr', // DB_DATABASE_PASSWORD
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => true,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
 
 
         'pgsql' => [
         'pgsql' => [
             'driver' => 'pgsql',
             'driver' => 'pgsql',

@@ -112,20 +112,6 @@ Route::middleware(['aloginauth'])->group(function () {
         });
         });
     });
     });
 
 
-    //优化gsc账号记录表
-    Route::prefix('gsc')->group(function () {
-        Route::any('/', [Aside\Project\ProjectGscController::class, 'lists'])->name('admin.lists');
-        Route::any('/domainLists', [Aside\Project\ProjectGscController::class, 'domainLists'])->name('admin.domainLists');
-        Route::any('/read', [Aside\Project\ProjectGscController::class, 'read'])->name('admin.read');
-        Route::any('/save', [Aside\Project\ProjectGscController::class, 'save'])->name('admin.save');
-        Route::any('/del', [Aside\Project\ProjectGscController::class, 'del'])->name('admin.del');
-    });
-
-    //gsc账号审核
-    Route::prefix('optimize')->group(function () {
-        Route::any('/empowerDomain', [Aside\Project\OptimizeController::class, 'empowerDomain'])->name('admin.empowerDomain');
-    });
-
     //企业服务配置信息
     //企业服务配置信息
     Route::prefix('service')->group(function () {
     Route::prefix('service')->group(function () {
         Route::any('/', [Aside\Service\ServiceController::class, 'lists'])->name('admin.service_lists');
         Route::any('/', [Aside\Service\ServiceController::class, 'lists'])->name('admin.service_lists');
@@ -212,6 +198,19 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::prefix('log')->group(function () {
         Route::prefix('log')->group(function () {
             Route::post('/', [Aside\Projects\ProjectsLogController::class, 'lists'])->name('projectsLog_lists');
             Route::post('/', [Aside\Projects\ProjectsLogController::class, 'lists'])->name('projectsLog_lists');
         });
         });
+        //优化gsc账号记录表
+        Route::prefix('gsc')->group(function () {
+            Route::any('/', [Aside\Project\ProjectGscController::class, 'lists'])->name('admin.lists');
+            Route::any('/domainLists', [Aside\Project\ProjectGscController::class, 'domainLists'])->name('admin.domainLists');
+            Route::any('/read', [Aside\Project\ProjectGscController::class, 'read'])->name('admin.read');
+            Route::any('/save', [Aside\Project\ProjectGscController::class, 'save'])->name('admin.save');
+            Route::any('/del', [Aside\Project\ProjectGscController::class, 'del'])->name('admin.del');
+        });
+
+        //gsc账号审核
+        Route::prefix('optimize')->group(function () {
+            Route::any('/empowerDomain', [Aside\Project\OptimizeController::class, 'empowerDomain'])->name('admin.empowerDomain');
+        });
     });
     });
 
 
 //    // 公共主题模版
 //    // 公共主题模版
@@ -264,6 +263,10 @@ Route::group([], function () {
             Route::any('/del', [Aside\Template\ATemplateTypeController::class, 'del'])->name('admin.ATemplateType_del');
             Route::any('/del', [Aside\Template\ATemplateTypeController::class, 'del'])->name('admin.ATemplateType_del');
         });
         });
     });
     });
+
+    Route::prefix('inquiry')->group(function () {
+        Route::any('/', [Aside\Projects\InquiryInfoController::class, 'lists'])->name('admin.inquiry_lists');
+    });
 });
 });