gx

@@ -28,6 +28,10 @@ use App\Models\Project\MinorLanguages;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BCustomTemplate;
 use App\Models\Template\BCustomTemplate;
+use App\Models\Template\BTemplate;
+use App\Models\Template\BTemplateCom;
+use App\Models\Template\BTemplateCommon;
+use App\Models\Template\Setting;
 use App\Models\WebSetting\WebSettingService;
 use App\Models\WebSetting\WebSettingService;
 use App\Services\AmazonS3Service;
 use App\Services\AmazonS3Service;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
@@ -52,84 +56,47 @@ class Demo extends Command
      * @var string
      * @var string
      */
      */
     protected $description = 'demo';
     protected $description = 'demo';
-
-    public function s(){
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>181]);
+        $list = $projectModel->list(['delete_status'=>0]);
+        $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
-            $this->initSearch($v['id']);
+            $this->saveTemplateCom();
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }
 
 
-    /**
-     * @remark :创建search页面
-     * @name   :initSearch
-     * @author :lyh
-     * @method :post
-     * @time   :2024/4/25 11:35
-     */
-    public function initSearch($project_id){
-        $bCustomTemplateModel = new BCustomTemplate();
-        $info = $bCustomTemplateModel->read(['url'=>'search']);
-        if($info === false){
-            $time = date('Y-m-d H:i:s');
-            $info = DB::connection('custom_mysql')->table('gl_web_custom_template')->first();
-            if(empty($info)) {
-                $data = [
-                    'project_id' => $project_id,
-                    'name' => 'search',
-                    'status' => 1,
-                    'url' => 'search',
-                    'html' => '',
-                    'html_style' =>'search',
-                    'title' => 'search',
-                    'description' => 'Sorry. The page has either moved or cannot be found.',
-                    'created_at' => $time, 'updated_at' => $time];
-                $id = DB::connection('custom_mysql')->table('gl_web_custom_template')->insertGetId($data);
-                //路由
-                $info = DB::connection('custom_mysql')->table('gl_route_map')->first();
-                if(empty($info)) {
-                    $data = ['project_id' => $project_id, 'source' => RouteMap::SOURCE_PAGE, 'source_id' => $id, 'route' => 'search', 'created_at' => $time, 'updated_at' => $time];
-                    DB::connection('custom_mysql')->table('gl_route_map')->insert($data);
-                }
-            }
-        }
-        return true;
-    }
+    public function saveTemplateCom($project_id){
+        //获取当前项目选择的模版
+        $settingModel = new Setting();
+        $settingInfo = $settingModel->read(['project_id'=>$project_id]);
+        if($settingInfo !== false){
+            $templateCommonModel = new BTemplateCommon();
+            $commonList = $templateCommonModel->list(['template_id'=>$settingModel['template_id']]);
+            if(!empty($commonList)){
+                foreach ($commonList as $v){
+                    if($v['type'] == 1){//首页头部底部
+                        //保存一次公共头+底
 
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $this->param['project_id'] = 181;
-        $imageModel = new ImageModel();
-        //获取当前项目的所有图片
-        $imageList = $imageModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos','size']);
-        if(!empty($imageList)){
-            $amazonS3Service = new AmazonS3Service();
-            foreach ($imageList as $k => $v){
-                $amazonS3Service->syncImageFiles(getImageUrl($v['path']));
-                $imageModel->edit(['is_cos'=>0],['id'=>$v['id']]);
+                    }
+                    //保存一次公共头部+底部+other信息
+                    $bComTemplateModel = new BTemplateCom();
+                    $param = ['template_id'=>$settingModel['template_id'],'common_type'=>BTemplate::COMMON_HEAD,'source'=>BTemplate::SOURCE_COM];
+                    if($headInfo === false){
+                        $headData = ['html'=>$settingModel['template_id']['head_html'], 'html_style'=>$templateInfo['head_css'], 'project_id'=>$project_id];
+                        $bComTemplateModel->add(array_merge($condition,$headData));
                     }
                     }
                 }
                 }
-
-        $fileModel = new FileModel();
-        $fileList = $fileModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos','name']);
-        if(!empty($fileList)){
-            $amazonS3Service = new AmazonS3Service();
-            foreach ($fileList as $k => $v){
-                echo date('Y-m-d H:i:s') . '执行的数据id:' . $v['id'] . '名称：'.$v['name'] . PHP_EOL;
-                $amazonS3Service->syncImageFiles(getFileUrl($v['path']));
-                $fileModel->edit(['is_cos'=>0],['id'=>$v['id']]);
             }
             }
         }
         }
-        return true;
     }
     }
 }
 }

@@ -451,7 +451,7 @@ class ImageController extends Controller
                 foreach ($files as $file){
                 foreach ($files as $file){
                     if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){
                     if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){
                         if ($file->getSize() > $this->cache['image_max'] * 1024) {
                         if ($file->getSize() > $this->cache['image_max'] * 1024) {
-                            $this->response('图片最大为1024K',Code::SYSTEM_ERROR);
+                            $this->response('图片最大为'.$this->cache['image_max'],Code::SYSTEM_ERROR);
                         }
                         }
                     }else{
                     }else{
                         if ($file->getSize() > $max) {
                         if ($file->getSize() > $max) {
@@ -462,7 +462,7 @@ class ImageController extends Controller
             }else{
             }else{
                 if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){
                 if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){
                     if ($files->getSize() > $this->cache['image_max'] * 1024) {
                     if ($files->getSize() > $this->cache['image_max'] * 1024) {
-                        $this->response('图片最大为1024K',Code::SYSTEM_ERROR);
+                        $this->response('图片最大为'.$this->cache['image_max'],Code::SYSTEM_ERROR);
                     }
                     }
                 }else{
                 }else{
                     if ($files->getSize() > $max) {
                     if ($files->getSize() > $max) {

@@ -13,6 +13,7 @@ use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Project\PageSetting;
 use App\Models\Project\PageSetting;
 use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
+use App\Models\Template\BTemplateCom;
 use App\Models\Template\BTemplateCommon;
 use App\Models\Template\BTemplateCommon;
 use App\Models\Template\BTemplateLog;
 use App\Models\Template\BTemplateLog;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
@@ -64,13 +65,14 @@ class BTemplateLogLogic extends BaseLogic
             'is_list'=>$info['is_list'],'is_custom'=>$info['is_custom']];
             'is_list'=>$info['is_list'],'is_custom'=>$info['is_custom']];
         //TODO::还原头部+底部
         //TODO::还原头部+底部
         $bTemplateModel->edit(['html'=>$info['text']],$condition);
         $bTemplateModel->edit(['html'=>$info['text']],$condition);
-        $commonData = [
-            'head_html'=>$info['head_html'], 'head_css'=>$info['head_css'],
-            'footer_html'=>$info['footer_html'], 'footer_css'=>$info['footer_css']
-        ];
-        $type = $this->getCustomizedType($info['source'],$info['is_list']);
         $commonTemplateModel = new BTemplateCommon();
         $commonTemplateModel = new BTemplateCommon();
-        $commonTemplateModel->edit($commonData,['template_id'=>$info['template_id'],'type'=>$type,'project_id'=>$this->user['project_id']]);
+        //还原头部
+        $condition = ['template_id'=>$info['template_id'],'source'=>$info['source'],
+            'is_list'=>$info['is_list'],'is_custom'=>$info['is_custom'],'project_id'=>$this->user['project_id']];
+        $condition['common_type'] = BTemplate::COMMON_HEAD;
+        $commonTemplateModel->edit(['head'=>$info['head_html'], 'head_style'=>$info['head_css']],$condition);
+        $condition['common_type'] = BTemplate::COMMON_FOOTER;
+        $commonTemplateModel->edit(['footer_html'=>$info['footer_html'], 'footer_css'=>$info['footer_css']],$condition);
         return $this->success();
         return $this->success();
     }
     }
 
 
@@ -99,18 +101,9 @@ class BTemplateLogLogic extends BaseLogic
             $bTemplateModel->edit($data,$condition);
             $bTemplateModel->edit($data,$condition);
             //还原头部+底部
             //还原头部+底部
             $commonData = [
             $commonData = [
-                'head_html'=>$info['head_html'], 'head_css'=>$info['head_css'], 'footer_html'=>$info['footer_html'], 'footer_css'=>$info['footer_css']
+                'head_html'=>$info['head_html'], 'head_style'=>$info['head_css'], 'footer_html'=>$info['footer_html'], 'footer_css'=>$info['footer_style'],'other'=>$info['other']
             ];
             ];
-            $commonTemplateModel = new BTemplateCommon();
-            $type = $this->getType($info['source'],$info['is_list'],$info['is_custom']);
-            $commonTemplateModel->edit($commonData,['template_id'=>$info['template_id'],'type'=>$type,'project_id'=>$this->user['project_id']]);
-            if(!empty($info['other'])){
-                $commonTemplateModel->edit(['other'=>$info['other']],['project_id'=>$this->user['project_id'],'template_id'=>$info['template_id'],'type'=>$info['type']]);
-            }else{
-                $footer_other = str_replace('<header','',characterTruncation($info['text'],'/<style id="globalsojs-footer">(.*?)<header/s'));
-                $other = preg_replace('/<style id="globalsojs-footer">(.*?)<\/style>/s', '', $footer_other);
-                $commonTemplateModel->edit(['other'=>$other],['project_id'=>$this->user['project_id'],'template_id'=>$info['template_id'],'type'=>$type]);
-            }
+            $this->saveTemplateCom($commonData,$info['template_id'],$info['source'],$info['is_list'],$info['is_custom']);
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->fail('系统错误，请联系管理员');
             $this->fail('系统错误，请联系管理员');
         }
         }
@@ -118,36 +111,40 @@ class BTemplateLogLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :定制页面头部类型---根据source获取type类型
-     * @name   :getType
+     * @remark :保存公共部分（头部。底部。连接部分）
+     * @name   :saveTemplateCom
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/11/16 11:20
+     * @time   :2024/4/29 10:32
      */
      */
-    public function getCustomizedType($source,$is_list){
-        $type = BTemplate::TYPE_HOME;
-        if($source == BTemplate::SOURCE_PRODUCT){
-            if($is_list == BTemplate::IS_LIST){
-                $type = BTemplate::TYPE_PRODUCT_LIST;
+    public function saveTemplateCom($handleInfo,$template_id,$source,$is_list,$is_custom){
+        $typeArr = [BTemplate::COMMON_HEAD, BTemplate::COMMON_FOOTER, BTemplate::COMMON_OTHER];
+        $templateComModel = new BTemplateCom();
+        foreach ($typeArr as $type){
+            if($type == BTemplate::COMMON_HEAD){
+                $param['html'] = $handleInfo['head_html'];
+                $param['html_style'] = $handleInfo['head_style'];
+                $typeSource = $this->getType($source,$is_list,$is_custom,$type);//头部是否为独立头部
+            }elseif ($type == BTemplate::COMMON_FOOTER){
+                $param['html'] = $handleInfo['footer_html'];
+                $param['html_style'] = $handleInfo['footer_style'];
+                $typeSource = $this->getType($source,$is_list,$is_custom,$type);
             }else{
             }else{
-                $type = BTemplate::TYPE_PRODUCT_DETAIL;
+                $param['html'] = $handleInfo['other'];
+                $param['html_style'] = null;
+                $typeSource = $this->getType($source,$is_list,$is_custom);
             }
             }
-        }
-        if($source == BTemplate::SOURCE_BLOG){
-            if($is_list == BTemplate::IS_LIST){
-                $type = BTemplate::TYPE_BLOG_LIST;
-            }else{
-                $type = BTemplate::TYPE_BLOG_DETAIL;
-            }
-        }
-        if($source == BTemplate::SOURCE_NEWS){
-            if($is_list == BTemplate::IS_LIST){
-                $type = BTemplate::TYPE_NEWS_LIST;
+            //查看当前数据是否还存在
+            $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type];
+            $info = $templateComModel->read($condition);
+            if($info === false){
+                $data = array_merge($param,$condition);
+                $templateComModel->add($data);
             }else{
             }else{
-                $type = BTemplate::TYPE_NEWS_DETAIL;
+                $templateComModel->edit($param,$condition);
             }
             }
         }
         }
-        return $type;
+        return $this->success();
     }
     }
 
 
     /**
     /**
@@ -157,27 +154,26 @@ class BTemplateLogLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/10/21 17:29
      * @time   :2023/10/21 17:29
      */
      */
-    public function getType($source,$is_list,$is_custom = 0){
-        $type = BTemplate::SOURCE_HOME;//首页公共头部底部
+    public function getType($source,$is_list,$is_custom = BTemplate::IS_NO_CUSTOM,$CommonType = BTemplate::COMMON_HEAD){
+        $type = BTemplate::SOURCE_COM;//公共头部底部
         $is_head = $this->user['configuration']['is_head'] ?? BTemplate::IS_NO_HEADER;
         $is_head = $this->user['configuration']['is_head'] ?? BTemplate::IS_NO_HEADER;
-        if($is_custom == BTemplate::IS_CUSTOM){//拓展模块为首页头部
+        if($is_custom == BTemplate::IS_CUSTOM || $is_head == BTemplate::IS_NO_HEADER){//拓展模块为首页头部
             return $this->success($type);
             return $this->success($type);
         }
         }
         //查看页面是否设置自定义头部底部
         //查看页面是否设置自定义头部底部
-        if($is_head != BTemplate::IS_NO_HEADER) {
         $pageSettingModel = new PageSetting();
         $pageSettingModel = new PageSetting();
-            $pageInfo = $pageSettingModel->read(['project_id' => $this->user['project_id']]);
+        $pageInfo = $pageSettingModel->read(['project_id' => $this->user['project_id'],'type'=>$CommonType]);
         if ($pageInfo === false) {
         if ($pageInfo === false) {
             return $this->success($type);
             return $this->success($type);
         }
         }
-            if ($source == BTemplate::SOURCE_PRODUCT) {if ($is_list != BTemplate::IS_LIST) {if ($pageInfo['product_details'] != 0) {$type = BTemplate::TYPE_PRODUCT_DETAIL;}}
-            else {if ($pageInfo['product_list'] != 0) {$type = BTemplate::TYPE_PRODUCT_LIST;}}}
-            if ($source == BTemplate::SOURCE_BLOG) {if ($is_list != BTemplate::IS_LIST) {if ($pageInfo['blog_details'] != 0) {$type = BTemplate::TYPE_BLOG_DETAIL;}}
-            else {if ($pageInfo['blog_list'] != 0) {$type = BTemplate::TYPE_BLOG_LIST;}}}
-            if ($source == BTemplate::SOURCE_NEWS) {if ($is_list != BTemplate::IS_LIST) {if ($pageInfo['news_details'] != 0) {$type = BTemplate::TYPE_NEWS_DETAIL;}}
-            else {if ($pageInfo['news_list'] != 0) {$type = BTemplate::TYPE_NEWS_LIST;}}}
+        if($source == BTemplate::SOURCE_HOME){if ($pageInfo['home'] != 0){$type = BTemplate::SOURCE_HOME;}}
+        if ($source == BTemplate::SOURCE_PRODUCT) {if ($is_list != BTemplate::IS_LIST) {if ($pageInfo['product_details'] != 0) {$type = BTemplate::SOURCE_PRODUCT;}}
+        else {if ($pageInfo['product_list'] != 0) {$type = BTemplate::SOURCE_PRODUCT;}}}
+        if ($source == BTemplate::SOURCE_BLOG) {if ($is_list != BTemplate::IS_LIST) {if ($pageInfo['blog_details'] != 0) {$type = BTemplate::SOURCE_BLOG;}}
+        else {if ($pageInfo['blog_list'] != 0) {$type = BTemplate::SOURCE_BLOG;}}}
+        if ($source == BTemplate::SOURCE_NEWS) {if ($is_list != BTemplate::IS_LIST) {if ($pageInfo['news_details'] != 0) {$type = BTemplate::SOURCE_NEWS;}}
+        else {if ($pageInfo['news_list'] != 0) {$type = BTemplate::SOURCE_NEWS;}}}
         if ($source == BTemplate::SOURCE_KEYWORD) {if ($pageInfo['polymerization'] != 0) {$type = BTemplate::TYPE_CUSTOM_PAGE;}}
         if ($source == BTemplate::SOURCE_KEYWORD) {if ($pageInfo['polymerization'] != 0) {$type = BTemplate::TYPE_CUSTOM_PAGE;}}
-        }
         return $this->success($type);
         return $this->success($type);
     }
     }
 
 

@@ -7,6 +7,7 @@ use App\Models\Project\PageSetting;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Template\BCustomTemplate;
 use App\Models\Template\BCustomTemplate;
+use App\Models\Template\BTemplateCom;
 use App\Models\Template\BTemplateCommon;
 use App\Models\Template\BTemplateCommon;
 use App\Models\Template\BTemplateLog;
 use App\Models\Template\BTemplateLog;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
@@ -164,9 +165,9 @@ class CustomTemplateLogic extends BaseLogic
         $info = $templateCommonModel->read(['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>$type]);
         $info = $templateCommonModel->read(['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>$type]);
         $data = [
         $data = [
             'head_html'=>characterTruncation($html,'/<header\b[^>]*>(.*?)<\/header>/s'),
             'head_html'=>characterTruncation($html,'/<header\b[^>]*>(.*?)<\/header>/s'),
-            'head_css'=>characterTruncation($html,'/<style id="globalsojs-header">(.*?)<\/style>/s'),
+            'head_style'=>characterTruncation($html,'/<style id="globalsojs-header">(.*?)<\/style>/s'),
             'footer_html'=>characterTruncation($html,'/<footer\b[^>]*>(.*?)<\/footer>/s'),
             'footer_html'=>characterTruncation($html,'/<footer\b[^>]*>(.*?)<\/footer>/s'),
-            'footer_css'=>characterTruncation($html,'/<style id="globalsojs-footer">(.*?)<\/style>/s'),
+            'footer_style'=>characterTruncation($html,'/<style id="globalsojs-footer">(.*?)<\/style>/s'),
         ];
         ];
         $footer_other = str_replace('<header','',characterTruncation($html,'/<style id="globalsojs-footer">(.*?)<header/s'));
         $footer_other = str_replace('<header','',characterTruncation($html,'/<style id="globalsojs-footer">(.*?)<header/s'));
         $other = preg_replace('/<style id="globalsojs-footer">(.*?)<\/style>/s', '', $footer_other);
         $other = preg_replace('/<style id="globalsojs-footer">(.*?)<\/style>/s', '', $footer_other);
@@ -184,25 +185,66 @@ class CustomTemplateLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :获取设置的类型
+     * @remark :保存公共部分（头部。底部。连接部分）
+     * @name   :saveTemplateCom
+     * @author :lyh
+     * @method :post
+     * @time   :2024/4/29 10:32
+     */
+    public function saveTemplateCom($html,$template_id,$source,$is_list,$is_custom){
+        $typeArr = [BTemplate::COMMON_HEAD, BTemplate::COMMON_FOOTER, BTemplate::COMMON_OTHER];
+        $handleInfo = $this->handleCommonParam($html);
+        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($handleInfo, true) . PHP_EOL, FILE_APPEND);
+        $templateComModel = new BTemplateCom();
+        foreach ($typeArr as $type){
+            if($type == BTemplate::COMMON_HEAD){
+                $param['html'] = $handleInfo['head_html'];
+                $param['html_style'] = $handleInfo['head_style'];
+                $typeSource = $this->getType($type);//头部是否为独立头部
+            }elseif ($type == BTemplate::COMMON_FOOTER){
+                $param['html'] = $handleInfo['footer_html'];
+                $param['html_style'] = $handleInfo['footer_style'];
+                $typeSource = $this->getType($type);
+            }else{
+                $param['html'] = $handleInfo['other'];
+                $param['html_style'] = null;
+                $typeSource = $this->getType();
+            }
+            //查看当前数据是否还存在
+            $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type];
+            $info = $templateComModel->read($condition);
+            if($info === false){
+                $data = array_merge($param,$condition);
+                $templateComModel->add($data);
+            }else{
+                $templateComModel->edit($param,$condition);
+            }
+        }
+        return $this->success();
+    }
+
+    /**
+     * @remark :（非定制）保存时获取获取设置的类型
      * @name   :getType
      * @name   :getType
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/10/21 17:29
      * @time   :2023/10/21 17:29
      */
      */
-    public function getType(){
-        $type = 1;//首页公共头部底部
+    public function getType($CommonType = BTemplate::COMMON_HEAD){
+        $type = BTemplate::SOURCE_COM;//公共头部底部
+        $is_head = $this->user['configuration']['is_head'] ?? BTemplate::IS_NO_HEADER;
+        if($is_head == BTemplate::IS_NO_HEADER){//拓展模块为首页头部
+            return $this->success($type);
+        }
         //查看页面是否设置自定义头部底部
         //查看页面是否设置自定义头部底部
-        if(isset($this->user['configuration']['is_head']) && ($this->user['configuration']['is_head'] != 0)) {
         $pageSettingModel = new PageSetting();
         $pageSettingModel = new PageSetting();
-            $pageInfo = $pageSettingModel->read(['project_id' => $this->user['project_id']]);
+        $pageInfo = $pageSettingModel->read(['project_id' => $this->user['project_id'],'type'=>$CommonType]);
         if ($pageInfo !== false) {
         if ($pageInfo !== false) {
             if ($pageInfo['page_list'] != 0) {
             if ($pageInfo['page_list'] != 0) {
                 $type = 9;
                 $type = 9;
             }
             }
         }
         }
-        }
-        return $type;
+        return $this->success($type);
     }
     }
 
 
     /**
     /**