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

@@ -27,6 +27,18 @@ class BTemplateModuleController extends BaseController
     }
 
     /**
+     * @remark :获取详情
+     * @name   :read
+     * @author :lyh
+     * @method :post
+     * @time   :2023/10/17 15:30
+     */
+    public function read(BTemplateModuleLogic $BTemplateModuleLogic){
+        $info = $BTemplateModuleLogic->moduleRead();
+        $this->response('success',Code::SUCCESS,$info);
+    }
+
+    /**
      * @remark :获取所有模块类型
      * @name   :getType
      * @author :lyh

@@ -161,13 +161,13 @@ class DomainInfoLogic extends BaseLogic
         }
 
         $project_model = new Project();
-        $project_info = $project_model->read(['id',$info['project_id']],'serve_id');
+        $project_info = $project_model->read(['id'=>$info['project_id']],'serve_id');
         if($project_info === false){
             $this->fail('获取项目数据失败');
         }
 
         $server_model = new ServerConfig();
-        $server_info = $server_model->read(['id',$project_info['serve_id']],'init_domain');
+        $server_info = $server_model->read(['id'=>$project_info['serve_id']],'init_domain');
         if($server_info === false){
             $this->fail('获取服务器数据失败');
         }
@@ -180,16 +180,14 @@ class DomainInfoLogic extends BaseLogic
                 $this->fail('证书cert值不能为空');
             }
 
-//            $api_url = 'http://'.$server_info['init_domain'].'/setSsl';
-            $api_url = 'http://master2.globalso.com/api/setSsl';
+            $api_url = 'http://'.$server_info['init_domain'].'/api/setSsl';
             $api_param = [
                 'domain' => $info['domain'],
                 'private_key' => $this->param['key'],
                 'cert' => $this->param['cert'],
             ];
         }else{
-//            $api_url = 'http://'.$server_info['init_domain'].'/applySsl';
-            $api_url = 'http://master2.globalso.com/api/applySsl';
+            $api_url = 'http://'.$server_info['init_domain'].'/api/applySsl';
             $api_param = ['domain' => $info['domain']];
         }
 

@@ -503,14 +503,13 @@ class ProjectLogic extends BaseLogic
     public function createSite($param){
         if(isset($param['serve_id']) && $param['serve_id'] && isset($param['deploy_optimize']['domain']) && $param['deploy_optimize']['domain']){
             $server_model = new ServerConfig();
-            $server_info = $server_model->read(['id',$param['serve_id']],'init_domain');
+            $server_info = $server_model->read(['id'=>$param['serve_id']],'init_domain');
 
             $domain_model = new DomainInfo();
-            $domain_info = $domain_model->read(['id',$param['deploy_optimize']['domain']],'domain');
+            $domain_info = $domain_model->read(['id'=>$param['deploy_optimize']['domain']],'domain');
 
             if($server_info && $domain_info){
-//                $api_url = 'http://'.$server_info['init_domain'].'/api/createSite';
-                $api_url = 'http://master2.globalso.com/api/createSite';
+                $api_url = 'http://'.$server_info['init_domain'].'/api/createSite';
                 $api_param = ['domain'=>$domain_info['domain']];
                 try {
                     HttpUtils::get($api_url, $api_param);

@@ -22,7 +22,7 @@ class BTemplateModuleLogic extends BaseLogic
      * @method :post
      * @time   :2023/6/29 13:35
      */
-    public function ModuleList($map,$order = 'created_at',$filed = ['*']){
+    public function ModuleList($map,$order = 'created_at',$filed = ['id','name','type','sort','status','image','test_model']){
         $map['deleted_status'] = 0;
         $map['status'] = 0;
         $lists = $this->model->list($map,$order,$filed);
@@ -30,6 +30,18 @@ class BTemplateModuleLogic extends BaseLogic
     }
 
     /**
+     * @remark :获取模版详情
+     * @name   :moduleRead
+     * @author :lyh
+     * @method :post
+     * @time   :2023/10/17 15:36
+     */
+    public function moduleRead(){
+        $info = $this->model->read($this->param);
+        return $this->success($info);
+    }
+
+    /**
      * @remark :获取所有模块类型
      * @name   :ModuleType
      * @author :lyh

@@ -233,7 +233,12 @@ class CustomTemplateLogic extends BaseLogic
                 $commonInfo['head_html'].$preg_html.$commonInfo['footer_html'];
         }else{
             //兼容老数据，获取首页数据
-            $TemplateInfo = $this->webTemplateInfo($info['template_id'],1,0);
+            $TemplateInfo = (new BTemplate())->read([
+                'template_id'=>$info['template_id'],
+                'source'=>1,
+                'project_id'=>$this->user['project_id'],
+                'source_id'=>0,
+            ]);;
             if($TemplateInfo !== false){
                 $html = preg_replace('/<style id="globalsojs-styles">(.*?)<\/style>/s',$html_style , $TemplateInfo['html']);
                 //内容

@@ -91,7 +91,8 @@ class KeywordLogic extends  BaseLogic
                 $param['updated_at'] = $param['created_at'];
                 $param['title'] = $v;
                 $id = $this->model->insertGetId($param);
-                RouteMap::setRoute($v, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
+                $route = RouteMap::setRoute($v, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
+                $this->model->edit(['route'=>$route],['id'=>$id]);
             }
         }
         return $this->success();

@@ -294,6 +294,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::prefix('module')->group(function () {
             //获取所有左侧模版
             Route::any('/', [\App\Http\Controllers\Bside\Template\BTemplateModuleController::class, 'lists'])->name('template_module_lists');
+            Route::any('/read', [\App\Http\Controllers\Bside\Template\BTemplateModuleController::class, 'read'])->name('template_module_read');
             Route::any('/type', [\App\Http\Controllers\Bside\Template\BTemplateModuleController::class, 'getType'])->name('template_module_getType');
         });