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

@@ -33,6 +33,7 @@ use App\Models\Project\RenewLog;
 use App\Models\RankData\RankData;
 use App\Models\RankData\RankData;
 use App\Models\Task\Task;
 use App\Models\Task\Task;
 use App\Models\Visit\Visit;
 use App\Models\Visit\Visit;
+use App\Models\WebSetting\WebLanguage;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
@@ -541,7 +542,7 @@ class ProjectController extends BaseController
         if(isset($this->map['entry_position']) && !empty($this->map['entry_position'])){
         if(isset($this->map['entry_position']) && !empty($this->map['entry_position'])){
             $this->map['entry_position'] = ['in',$this->map['entry_position']];
             $this->map['entry_position'] = ['in',$this->map['entry_position']];
         }
         }
-        $lists = $hrManagerModel->list($this->map,'id',['id','manage_id','name','entry_position','is_leader']);
+        $lists = $hrManagerModel->list($this->map,['sort','id'],['id','manage_id','name','entry_position','is_leader']);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
@@ -872,4 +873,17 @@ class ProjectController extends BaseController
         }
         }
         $this->response('success',Code::SUCCESS,$zone_list);
         $this->response('success',Code::SUCCESS,$zone_list);
     }
     }
+
+    /**
+     * @remark :获取小语种列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/30 10:59
+     */
+    public function languageLists(){
+        $webLanguageModel = new WebLanguage();
+        $lists = $webLanguageModel->list();
+        $this->response('success',Code::SUCCESS,$lists);
+    }
 }
 }

@@ -65,7 +65,16 @@ class CustomModuleContentController extends BaseController
     public function getCategoryList(){
     public function getCategoryList(){
         $categoryModel = new CustomModuleCategory();
         $categoryModel = new CustomModuleCategory();
         $list = $categoryModel->list(['project_id'=>$this->user['project_id'],'module_id'=>$this->param['module_id']],['id','name']);
         $list = $categoryModel->list(['project_id'=>$this->user['project_id'],'module_id'=>$this->param['module_id']],['id','name']);
-        $this->response('success',Code::SUCCESS,$list);
+        $menu = [];
+        if(!empty($list)){
+            foreach ($list as $v){
+                if($v['pid'] == 0){
+                    $v['sub'] = _get_child($v['id'],$list);
+                    $menu[]   = $v;
+                }
+            }
+        }
+        $this->response('success',Code::SUCCESS,$menu);
     }
     }
 
 
     /**
     /**

@@ -9,6 +9,7 @@
 
 
 namespace App\Http\Controllers\Bside\CustomModule;
 namespace App\Http\Controllers\Bside\CustomModule;
 
 
+use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\CustomModule\CustomModuleExtendLogic;
 use App\Http\Logic\Bside\CustomModule\CustomModuleExtendLogic;
 use App\Models\CustomModule\CustomModuleExtend;
 use App\Models\CustomModule\CustomModuleExtend;
@@ -30,7 +31,7 @@ class CustomModuleExtentController extends BaseController
         ]);
         ]);
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
         $filed = ['id','title','status','type','operator_id','project_id','module_id','created_at','updated_at'];
         $filed = ['id','title','status','type','operator_id','project_id','module_id','created_at','updated_at'];
-        $lists = $customModuleExtend->lists($this->map,$this->page,$this->row,$this->order,$filed);
+        $lists = $customModuleExtend->list($this->map,$this->order,$filed);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
@@ -59,8 +60,8 @@ class CustomModuleExtentController extends BaseController
      * @time   :2023/12/4 15:45
      * @time   :2023/12/4 15:45
      */
      */
     public function save(CustomModuleExtendLogic $logic){
     public function save(CustomModuleExtendLogic $logic){
-        $logic->extendSave();
-        $this->response('success');
+        $info = $logic->extendSave();
+        $this->response('success',Code::SUCCESS,$info);
     }
     }
 
 
     /**
     /**

@@ -14,8 +14,6 @@ use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\CustomModule\CustomModuleExtend;
 use App\Models\CustomModule\CustomModuleExtend;
 use App\Models\CustomModule\CustomModuleExtentContent;
 use App\Models\CustomModule\CustomModuleExtentContent;
-use App\Models\Product\Extend;
-use App\Models\Product\ExtendInfo;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 use mysql_xdevapi\Exception;
 use mysql_xdevapi\Exception;
@@ -248,7 +246,7 @@ class CustomModuleContentLogic extends BaseLogic
      */
      */
     public function saveExtendInfo($content_id,$extend){
     public function saveExtendInfo($content_id,$extend){
         //先删除以前的数据
         //先删除以前的数据
-        $extendInfoModel = new ExtendInfo();
+        $extendInfoModel = new CustomModuleExtentContent();
         $extendInfoModel->del(['content_id'=>$content_id]);
         $extendInfoModel->del(['content_id'=>$content_id]);
         if(empty($extend)) {
         if(empty($extend)) {
             return $this->success();
             return $this->success();
@@ -271,6 +269,7 @@ class CustomModuleContentLogic extends BaseLogic
      * @time   :2023/12/6 15:11
      * @time   :2023/12/6 15:11
      */
      */
     public function saveHandleExtend(&$v,$content_id){
     public function saveHandleExtend(&$v,$content_id){
+        unset($v['title']);
         if($v['type'] == 3){
         if($v['type'] == 3){
             foreach ($v['values'] as $k1=>$v1){
             foreach ($v['values'] as $k1=>$v1){
                 $v1['url'] = str_replace_url($v1['url']);
                 $v1['url'] = str_replace_url($v1['url']);
@@ -322,8 +321,8 @@ class CustomModuleContentLogic extends BaseLogic
     {
     {
         RouteMap::delRoute(RouteMap::SOURCE_MODULE, $id, $this->user['project_id']);
         RouteMap::delRoute(RouteMap::SOURCE_MODULE, $id, $this->user['project_id']);
         //通知
         //通知
-        $info = $this->model->read(['id' => $id], ['id', 'url']);
-        $this->curlDelRoute(['route'=>$info['url']]);
+        $info = $this->model->read(['id' => $id], ['id', 'route']);
+        $this->curlDelRoute(['route'=>$info['route']]);
         return $this->success();
         return $this->success();
     }
     }
 }
 }

@@ -50,7 +50,7 @@ class CustomModuleExtendLogic extends BaseLogic
         }else{
         }else{
             $this->extendAdd();
             $this->extendAdd();
         }
         }
-        return $this->success();
+        return $this->success($this->param);
     }
     }
 
 
     /**
     /**

@@ -13,7 +13,7 @@ use App\Models\Base;
 
 
 class CustomModuleExtentContent extends Base
 class CustomModuleExtentContent extends Base
 {
 {
-    protected $table = 'gl_custom_module_extent_content';
+    protected $table = 'gl_custom_module_extend_content';
     //连接数据库
     //连接数据库
     protected $connection = 'custom_mysql';
     protected $connection = 'custom_mysql';
 }
 }

@@ -176,6 +176,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/saveOtherProject', [Aside\Project\ProjectController::class, 'saveOtherProject'])->name('admin.project_saveOtherProject');//其他项目设置
         Route::any('/saveOtherProject', [Aside\Project\ProjectController::class, 'saveOtherProject'])->name('admin.project_saveOtherProject');//其他项目设置
         Route::any('/getOtherProject', [Aside\Project\ProjectController::class, 'getOtherProject'])->name('admin.project_getOtherProject');//获取其他项目设置
         Route::any('/getOtherProject', [Aside\Project\ProjectController::class, 'getOtherProject'])->name('admin.project_getOtherProject');//获取其他项目设置
         Route::any('/getChannel', [Aside\Project\ProjectController::class, 'getChannel'])->name('admin.project_getChannel');//其他项目设置
         Route::any('/getChannel', [Aside\Project\ProjectController::class, 'getChannel'])->name('admin.project_getChannel');//其他项目设置
+        Route::any('/languageLists', [Aside\Project\ProjectController::class, 'languageLists'])->name('admin.project_languageLists');//其他项目设置
         //获取关键词前缀和后缀
         //获取关键词前缀和后缀
         Route::prefix('keyword')->group(function () {
         Route::prefix('keyword')->group(function () {
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');