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

刘锟
app/Console/Commands/RankData/RankWeek.php
app/Console/Commands/UpgradeKeyword/UpdateKeyword.php
app/Console/Kernel.php
app/Http/Controllers/Aside/Com/CNoticeController.php
app/Http/Controllers/Aside/Project/ProjectController.php
app/Http/Logic/Bside/Product/ProductLogic.php
routes/aside.php
--- a/app/Console/Commands/RankData/RankWeek.php
查看文件 @5eb340e
+++ b/app/Console/Commands/RankData/RankWeek.php
查看文件 @5eb340e
@@ -39,7 +39,7 @@ class RankWeek extends BaseCommands
         LogUtils::info('start rank_data_week:' . count($list));
         foreach ($list as $project_id => $api_no) {
             $rankDataLogic = new RankDataLogic();
-            $rankDataLogic->syncRankWeek($api_no);
+            $rankDataLogic->syncRankWeek($api_no, true);
         }
         return true;
--- a/app/Console/Commands/UpgradeKeyword/UpdateKeyword.php
查看文件 @5eb340e
+++ b/app/Console/Commands/UpgradeKeyword/UpdateKeyword.php
查看文件 @5eb340e
@@ -9,16 +9,9 @@
 namespace App\Console\Commands\UpgradeKeyword;
-use App\Helper\Arr;
-use App\Helper\Translate;
-use App\Models\CustomModule\CustomModuleCategory;
-use App\Models\CustomModule\CustomModuleContent;
-use App\Models\Product\CategoryRelated;
 use App\Models\Product\Keyword;
-use App\Models\Product\Product;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
-use App\Models\Template\BTemplate;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
@@ -56,7 +49,6 @@ class UpdateKeyword extends Command
     public function handle(){
         $projectModel = new Project();
         $list = $projectModel->list(['is_upgrade'=>1,'delete_status'=>0]);
-
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
@@ -64,6 +56,7 @@ class UpdateKeyword extends Command
             DB::disconnect('custom_mysql');
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
+        return true;
     }
--- a/app/Console/Kernel.php
查看文件 @5eb340e
+++ b/app/Console/Kernel.php
查看文件 @5eb340e
@@ -24,7 +24,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('rank_data_external_links')->dailyAt('18:00')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
         $schedule->command('rank_data_indexed_pages')->dailyAt('07:30')->withoutOverlapping(1); // 排名数据-页面收录，每周一凌晨执行一次
         $schedule->command('rank_data_recomm_domain')->dailyAt('07:40')->withoutOverlapping(1); // 排名数据-引荐域名，每周一凌晨执行一次
-        $schedule->command('rank_data_week')->dailyAt('08:30')->withoutOverlapping(1); // 排名数据，每周一凌晨执行一次
+        $schedule->command('rank_data_week')->weeklyOn([1,2], '08:300')->withoutOverlapping(1); // 排名数据，每周一、二早上执行一次
 //        $schedule->command('share_user')->dailyAt('01:00')->withoutOverlapping(1); // 清除用户ayr_share数据，每天凌晨1点执行一次
 //        $schedule->command('count')->dailyAt('00:30')->withoutOverlapping(1); //每天凌晨1点执行一次
         $schedule->command('service_count')->dailyAt('01:00')->withoutOverlapping(1); //服务器使用情况，每天凌晨1点执行一次
@@ -47,7 +47,7 @@ class Kernel extends ConsoleKernel
 //        $schedule->command('website_data')->dailyAt('01:00')->withoutOverlapping(1); // 向AICC推送数据
 //        $schedule->command('project_file_pdf')->dailyAt('00:00')->withoutOverlapping(1); // 网站项目数据，生成PDF文件
         $schedule->command('sync_manager')->dailyAt('01:00')->withoutOverlapping(1); //TODO::手机号码同步  每天执行一次
-
+        $schedule->command('update_keyword_route')->dailyAt('01:00')->withoutOverlapping(1); //升级项目--清除路由相同的关键字
         $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
         // 每日推送视频任务
         $schedule->command('video_task')->dailyAt('02:30')->withoutOverlapping(1);
--- a/app/Http/Controllers/Aside/Com/CNoticeController.php 0 → 100644
查看文件 @5eb340e
+++ b/app/Http/Controllers/Aside/Com/CNoticeController.php 0 → 100644
查看文件 @5eb340e
+<?php
+/**
+ * @remark :
+ * @name   :CNoticeController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2023/9/12 10:04
+ */
+
+namespace App\Http\Controllers\Aside\Com;
+
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Models\Domain\DomainInfo;
+use App\Models\Project\Country as CountryModel;
+use App\Models\Project\DeployBuild;
+use App\Models\WebSetting\WebLanguage;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+
+/**
+ * @remark :通知C端
+ * @name   :CNoticeController
+ * @author :lyh
+ * @method :post
+ * @time   :2023/9/12 10:38
+ */
+class CNoticeController extends BaseController
+{
+    /**
+     * 更新通知C端
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function sendNotify(Request $request)
+    {
+        //获取当前项目的域名
+        $domainModel = new DomainInfo();
+        $domainInfo = $domainModel->read(['project_id'=>$this->param['project_id']]);
+        if($domainInfo === false){
+            //获取测试域名
+            $deployBuildModel = new DeployBuild();
+            $buildInfo = $deployBuildModel->read(['project_id'=>$this->param['project_id']]);
+            $this->param['domain'] = $buildInfo['test_domain'];
+        }else{
+            $this->param['domain'] = 'https://'.$domainInfo['domain'].'/';
+        }
+        $url = $this->param['domain'].'api/update_page/';
+        $param = [
+            'project_id' => $this->param['project_id'],
+            'type' => intval($request->input('type', 1)),
+            'route' => intval($request->input('page', 1)),
+            'url' => $request->input('url', []),
+            'language'=> $request->input('language', []),
+        ];
+        http_post($url, json_encode($param));
+        $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果！');
+    }
+
+    /**
+     * @remark :获取当前项目选中的语种
+     * @name   :getCountry
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/12 15:20
+     */
+    public function getCountry(){
+        $countryModel = new CountryModel();
+        $info = $countryModel->read(['project_id'=>$this->param['project_id']],['id','country_lists']);
+        $ids = [];
+        if($info !== false){
+            $ids = explode(',',$info['country_lists']);
+        }
+        $languageModel = new WebLanguage();
+        //根据排序查询选中的小语种
+        $lists = $languageModel->whereIn('id', $ids)->orderByRaw(DB::raw("FIND_IN_SET(id,'" . implode(',', $ids) . "'" . ')'))->get()->toArray();
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+}
--- a/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @5eb340e
+++ b/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @5eb340e
@@ -284,7 +284,7 @@ class ProjectController extends BaseController
             $info = $managerHr->read(['manage_id'=>$this->manage['id']]);
             //获取当前用户自己的项目
             $query->where(function ($subQuery) use ($info) {
-                $subQuery->whereIn('gl_project.id',[1,3])//项目1+项目3默认显示
+                $subQuery->whereIn('gl_project.id',[1])//项目1+项目3默认显示
                     ->orWhere('gl_project_deploy_build.leader_mid', $this->manage['id'])
                     ->orWhere('gl_project_deploy_build.manager_mid', $this->manage['id'])
                     ->orWhere('gl_project_deploy_build.designer_mid', $this->manage['id'])
--- a/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @5eb340e
+++ b/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @5eb340e
@@ -47,16 +47,12 @@ class ProductLogic extends  BaseLogic
         $this->param = $this->handleSaveParam($this->param);
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $seo_mate = (array)$this->model->read(['id'=>$this->param['id']],['seo_mate'])['seo_mate'];
+
                 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
                 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
                 if($is_upgrade == 0 || $six_read == 1){
                     $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
                 }
-                if(!empty($seo_mate)){
-                    $seo_mate['title'] = $this->param['title'] ?? '';
-                    $this->param['seo_mate'] = json_encode($seo_mate,true);
-                }
                 $route = $this->param['route'];
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
                 $id = $this->param['id'];
--- a/routes/aside.php
查看文件 @5eb340e
+++ b/routes/aside.php
查看文件 @5eb340e
@@ -14,6 +14,8 @@ Route::middleware(['aloginauth'])->group(function () {
     Route::any('/editPassword', [Aside\Com\IndexController::class, 'editPassword'])->name('admin.editPassword.white');
     Route::get('/logout', [Aside\LoginController::class, 'logout'])->name('admin.logout.white');
     Route::any('/getAccessAddress', [Aside\LoginController::class, 'getAccessAddress'])->name('admin.getAccessAddress');//获取B端地址
+    Route::get('/sendNotify', [Aside\Com\CNoticeController::class, 'sendNotify'])->name('admin.sendNotify');
+    Route::get('/getCountry', [Aside\Com\CNoticeController::class, 'getCountry'])->name('admin.getCountry');
     //会员相关
     Route::prefix('user')->group(function () {