Merge remote-tracking branch 'origin/master' into akun

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Bside\Setting;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Setting\WebSettingFromLogic;
 use App\Http\Logic\Bside\Setting\WebSettingFromLogic;
+use Illuminate\Http\Request;
 
 
 /**
 /**
  * @name:表单设置
  * @name:表单设置
@@ -32,4 +33,28 @@ class WebSettingFromController extends BaseController
         $webSettingFromLogic->setting_from_save();
         $webSettingFromLogic->setting_from_save();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * 保存询盘请求返回信息
+     * @param Request $request
+     * @param WebSettingFromLogic $webSettingFromLogic
+     */
+    public function saveBack(Request $request, WebSettingFromLogic $webSettingFromLogic)
+    {
+        $message = $request->input('message', 'success');
+        $url = $request->input('url');
+        $webSettingFromLogic->fromBackMsgSet($message, $url);
+        $this->response('success');
+    }
+
+    /**
+     * 获取询盘请求返回信息
+     * @param Request $request
+     * @param WebSettingFromLogic $webSettingFromLogic
+     */
+    public function getBack(Request $request, WebSettingFromLogic $webSettingFromLogic)
+    {
+        $result = $webSettingFromLogic->fromBackMsgGet();
+        $this->response('success', Code::SUCCESS, $result);
+    }
 }
 }

@@ -56,7 +56,7 @@ class ProjectLogic extends BaseLogic
         $info = $this->model->with('payment')->with('deploy_build')->with('deploy_optimize')->with('online_check')
         $info = $this->model->with('payment')->with('deploy_build')->with('deploy_optimize')->with('online_check')
             ->with('project_after')->where(['id'=>$id])->first()->toArray();
             ->with('project_after')->where(['id'=>$id])->first()->toArray();
         $info['online_check']['name'] = (new Manage())->getName(!empty($info['online_check']['created_manage_id']) ?? '');
         $info['online_check']['name'] = (new Manage())->getName(!empty($info['online_check']['created_manage_id']) ?? '');
-        $info['deploy_optimize']['minor_keywords'] = json_decode(!empty($info['deploy_optimize']['minor_keywords']) ?? []);
+        $info['deploy_optimize']['minor_keywords'] = !empty($info['deploy_optimize']['minor_keywords']) ? json_decode($info['deploy_optimize']['minor_keywords']) : [];
         $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];
         $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];
         if($info['extend_type'] != 0){
         if($info['extend_type'] != 0){
             $info['type'] = $info['extend_type'];
             $info['type'] = $info['extend_type'];
@@ -353,8 +353,8 @@ class ProjectLogic extends BaseLogic
                 'project_id'=>$project_id,
                 'project_id'=>$project_id,
                 'name'=>$lead_name,
                 'name'=>$lead_name,
                 'type'=>UserModel::TYPE_ONE,
                 'type'=>UserModel::TYPE_ONE,
-                'operator_id'=>$this->manager['id'],
-                'create_id'=>$this->manager['id'],
+                'operator_id'=>$this->manager['id'] ?? 0,
+                'create_id'=>$this->manager['id'] ?? 0,
             ];
             ];
             $userModel->add($data);
             $userModel->add($data);
         }
         }

@@ -4,6 +4,7 @@ namespace App\Http\Logic\Bside\Setting;
 
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\WebSetting\WebSettingForm;
 use App\Models\WebSetting\WebSettingForm;
+use App\Models\WebSetting\WebSettingFormBack;
 
 
 class WebSettingFromLogic extends BaseLogic
 class WebSettingFromLogic extends BaseLogic
 {
 {
@@ -54,4 +55,32 @@ class WebSettingFromLogic extends BaseLogic
         return $this->success();
         return $this->success();
     }
     }
 
 
+    /**
+     * 保存询盘请求返回信息
+     * @param $message
+     * @param $url
+     * @return WebSettingFormBack|mixed
+     */
+    public function fromBackMsgSet($message, $url)
+    {
+        $project_id = $this->user['project_id'];
+        $info = WebSettingFormBack::saveBack($project_id, $message, $url);
+        return $info;
+    }
+
+    /**
+     * 获取询盘请求返回信息
+     * @return mixed
+     */
+    public function fromBackMsgGet()
+    {
+        $project_id = $this->user['project_id'];
+        $info = WebSettingFormBack::getBack($project_id);
+        $result = [
+            'message' => $info->message ?? '',
+            'url' => $info->url ?? '',
+            'other' => $info->other ?? ''
+        ];
+        return $result;
+    }
 }
 }

@@ -14,4 +14,7 @@ class NewsCategory extends Base
     //连接数据库
     //连接数据库
     protected $connection = 'custom_mysql';
     protected $connection = 'custom_mysql';
 
 
+    const STATUS_SHOW = 0;
+    const STATUS_HIDE = 1;
+
 }
 }

+<?php
+/**
+ * Created by PhpStorm.
+ * User: zhl
+ * Date: 2023/10/10
+ * Time: 17:01
+ */
+
+namespace App\Models\WebSetting;
+
+use App\Models\Base;
+
+/**
+ * Class WebSettingFormBack
+ * @package App\Models\WebSetting
+ */
+class WebSettingFormBack extends Base
+{
+    /**
+     * @var string
+     */
+    protected $table = 'gl_web_setting_form_back';
+
+    /**
+     * 保存返回信息
+     * @param int $project_id
+     * @param string $message
+     * @param string $url
+     * @param string $other
+     * @return WebSettingFormBack|mixed
+     */
+    public static function saveBack($project_id = 0, $message = '', $url = '', $other = '')
+    {
+        $info = self::getBack($project_id);
+        if (empty($info))
+            $info = new self();
+        $info->project_id = $project_id;
+        $info->message = $message;
+        $info->url = $url;
+        $info->other = $other;
+        $info->save();
+        return $info;
+    }
+
+    /**
+     * 根据企业获取返回信息设置
+     * @param int $project_id
+     * @return mixed
+     */
+    public static function getBack($project_id = 0)
+    {
+        return self::where(['project_id' => $project_id])->first();
+    }
+}

@@ -37,6 +37,9 @@ class ProjectServer extends BaseService
         config(['database.connections.custom_mysql.database' => $project->databaseName()]);
         config(['database.connections.custom_mysql.database' => $project->databaseName()]);
         config(['database.connections.custom_mysql.username' => $project->mysqlConfig->user]);
         config(['database.connections.custom_mysql.username' => $project->mysqlConfig->user]);
         config(['database.connections.custom_mysql.password' => $project->mysqlConfig->password]);
         config(['database.connections.custom_mysql.password' => $project->mysqlConfig->password]);
+
+        //清除现有的数据库连接配置
+        DB::purge('custom_mysql');
         //重连
         //重连
         DB::connection('custom_mysql')->reconnect();
         DB::connection('custom_mysql')->reconnect();
 
 

@@ -134,6 +134,8 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::prefix('from')->group(function () {
         Route::prefix('from')->group(function () {
             Route::any('/', [\App\Http\Controllers\Bside\Setting\WebSettingFromController::class, 'info'])->name('web_setting_from_info');
             Route::any('/', [\App\Http\Controllers\Bside\Setting\WebSettingFromController::class, 'info'])->name('web_setting_from_info');
             Route::any('/save', [\App\Http\Controllers\Bside\Setting\WebSettingFromController::class, 'save'])->name('web_setting_from_info');
             Route::any('/save', [\App\Http\Controllers\Bside\Setting\WebSettingFromController::class, 'save'])->name('web_setting_from_info');
+            Route::any('/get_back', [\App\Http\Controllers\Bside\Setting\WebSettingFromController::class, 'getBack'])->name('web_get_from_back');
+            Route::any('/set_back', [\App\Http\Controllers\Bside\Setting\WebSettingFromController::class, 'saveBack'])->name('web_setting_from_back');
         });
         });
         //多语言设置
         //多语言设置
         Route::prefix('country')->group(function () {
         Route::prefix('country')->group(function () {