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

张关杰
app/Console/Commands/Test/Demo.php
app/Console/Commands/Update/ProjectUpdate.php
app/Http/Controllers/Aside/Project/MinorLanguagesController.php
app/Http/Logic/Aside/Project/ProjectLogic.php
app/Http/Logic/Bside/RankData/RankDataLogic.php
routes/aside.php
--- a/app/Console/Commands/Test/Demo.php
查看文件 @ebdc6ed
+++ b/app/Console/Commands/Test/Demo.php
查看文件 @ebdc6ed
@@ -269,8 +269,12 @@ class Demo extends Command
         $list = $projectModel->list(['delete_status'=>0,'type'=>['!=',0]]);
         foreach ($list as $v1){
             ProjectServer::useProject($v1['id']);
+            echo date('Y-m-d H:i:s') . '项目id:'.$v1['id'] . PHP_EOL;
             $navGroupModel = new BNavGroup();
             $groupList = $navGroupModel->list(['sort_list'=>['!=','']]);
+            if(empty($groupList)){
+                continue;
+            }
             foreach ($groupList as $k=>$v){
                 if(!empty($v['sort_list'])){
                     $sort_list = json_decode($v['sort_list']);
@@ -295,7 +299,7 @@ class Demo extends Command
         foreach ($subList as $k => $v){
             $v = (array)$v;
             $sort = $sort+1;
-            $navModel->edit(['pid'=>$pid,'sort'=>$sort],['id'=>$v['id']]);
+            $navModel->edit(['sort'=>$sort],['id'=>$v['id']]);
             if(!empty($v['sub'])){
                 $this->subSort($v['sub'],$sort,$v['id']);
             }
--- a/app/Console/Commands/Update/ProjectUpdate.php
查看文件 @ebdc6ed
+++ b/app/Console/Commands/Update/ProjectUpdate.php
查看文件 @ebdc6ed
@@ -562,15 +562,30 @@ class ProjectUpdate extends Command
                     $url = $api_url . '?' . http_build_query(['w' => $api_type, 'page' => 1, 'pagesize' => 0]);
                     $data = curl_c($url);
                     if (isset($data['code']) && $data['code'] == 200) {
-                        $category = [
-                            [
-                                'id' => 0,
-                                'name' => $custom_info['route'],
-                                'url' => '/' . $custom_info['route'],
-                                'parent' => 0,
-                                'children' => $data['data']['category'] ?? []
-                            ]
-                        ];
+                        //判断分类里面是否存在自定义模块路由
+                        $is_exist = 0;
+                        if ($data['data']['category'] ?? []) {
+                            foreach ($data['data']['category'] as $vc) {
+                                $c_route = $this->get_url_route($vc['url'] ?? '');
+                                if ($c_route == $custom_info['route']) {
+                                    $is_exist = 1;
+                                }
+                            }
+                        }
+                        if ($is_exist) {
+                            //存在，无需添加自定义模块路由为分类路由
+                            $category = $data['data']['category'];
+                        } else {
+                            //不存在，需要添加自定义模块路由为分类路由
+                            $category = [
+                                [
+                                    'id' => 0,
+                                    'name' => $custom_info['route'],
+                                    'url' => '/' . $custom_info['route'],
+                                    'parent' => $data['data']['category'] ?? []
+                                ]
+                            ];
+                        }
                         $this->category_custom_insert($project_id, $custom_info['id'], $category, 0);
                         $count = $data['data']['count'] ?? 0;
--- a/app/Http/Controllers/Aside/Project/MinorLanguagesController.php
查看文件 @ebdc6ed
+++ b/app/Http/Controllers/Aside/Project/MinorLanguagesController.php
查看文件 @ebdc6ed
@@ -12,6 +12,7 @@ namespace App\Http\Controllers\Aside\Project;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Models\Project\MinorLanguages;
+use App\Models\WebSetting\WebLanguage;
 /**
  * @remark :小语种
@@ -22,6 +23,13 @@ use App\Models\Project\MinorLanguages;
  */
 class MinorLanguagesController extends BaseController
 {
+    /**
+     * @remark :小语种列表
+     * @name   :getMinorLanguageList
+     * @author :lyh
+     * @method :post
+     * @time   :2024/3/1 10:35
+     */
     public function getMinorLanguageList(){
         $this->request->validate([
             'project_id'=>'required',
@@ -29,7 +37,20 @@ class MinorLanguagesController extends BaseController
             'project_id.required' => 'keyword不能为空',
         ]);
         $languageModel = new MinorLanguages();
-        $lists = $languageModel->list($this->map,'id',['language','type','keywords','service_day']);
+        $lists = $languageModel->list($this->map,'id',['language','type','keywords','service_day','lang']);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
+     * @remark :获取所有的小语种
+     * @name   :getLanguages
+     * @author :lyh
+     * @method :post
+     * @time   :2024/3/1 10:11
+     */
+    public function getLanguages(){
+        $webLanguageModel = new WebLanguage();
+        $lists = $webLanguageModel->list($this->map,'id',['short','chinese']);
         $this->response('success',Code::SUCCESS,$lists);
     }
 }
--- a/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @ebdc6ed
+++ b/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @ebdc6ed
@@ -322,12 +322,14 @@ class ProjectLogic extends BaseLogic
         if(!empty($minor_language)){
             foreach ($minor_language as $k => $v){
                 if(!empty($v['language'])){
+                    $v['created_at'] = date('Y-m-d H:i:s');
+                    $v['updated_at'] = date('Y-m-d H:i:s');
                     $v['project_id'] = $this->param['id'];
                     $data[] = $v;
                 }
             }
             if(!empty($data)){
-                $languageModel->insert($minor_language);
+                $languageModel->insert($data);
             }
         }
         return $this->success();
--- a/app/Http/Logic/Bside/RankData/RankDataLogic.php
查看文件 @ebdc6ed
+++ b/app/Http/Logic/Bside/RankData/RankDataLogic.php
查看文件 @ebdc6ed
@@ -90,7 +90,7 @@ class RankDataLogic extends BaseLogic
             foreach($languageList as $lang){
                 $remain_day = $lang_data[$lang['language']]['dabiao_day'] ?? 0;
                 $data['langs'][$lang['language'] ?? ''] = [
-                    'lang_text' => Translate::getTls($lang['tl'] ?? ''),
+                    'lang_text' => Translate::getTls($lang['language'] ?? ''),
                     'keyword_num' => $lang['keywords'] ?? 0,
                     'reach_day' => $lang_data[$lang['language']]['dabiao_day'] ?? 0,
                     'home_cnt' => $lang_data[$lang['language']]['home_cnt'] ?? 0,
@@ -488,7 +488,6 @@ class RankDataLogic extends BaseLogic
                 }
             }
         }
-
         $model->project_id = $project_id;
         $model->first_num = $first_num;
         $model->first_page_num = $first_page_num;
--- a/routes/aside.php
查看文件 @ebdc6ed
+++ b/routes/aside.php
查看文件 @ebdc6ed
@@ -193,6 +193,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::prefix('language')->group(function () {
             Route::any('/', [Aside\Project\MinorLanguagesController::class, 'getMinorLanguageList'])->name('admin.getMinorLanguageList');
+            Route::any('/getLanguages', [Aside\Project\MinorLanguagesController::class, 'getLanguages'])->name('admin.getLanguages');
         });
         //更新项目tdk
         Route::any('/updateSeoTdk', [Aside\Com\UpdateController::class, 'updateSeoTdk'])->name('admin.project_updateSeoTdk');