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

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>264]);
+        $list = $projectModel->list(['id'=>917]);
         $data = [];
         $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;

@@ -525,4 +525,21 @@ class ProductController extends BaseController
         }
         }
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
+
+    /**
+     * @remark :Ai发布新闻
+     * @name   :sendAiNews
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/26 15:33
+     */
+    public function sendAiProduct(){
+        $this->request->validate([
+            'keyword'=>'required',
+        ],[
+            'keyword.required' => 'keyword不能为空',
+        ]);
+        $data = http_get('http://title.globalso.com/ajax_data_for_web.php?keyword='.$this->param['keyword'],['charset=utf-8']);
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -12,6 +12,7 @@ use App\Models\Com\NoticeLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
 use App\Models\Project\InquiryFilterConfig;
 use App\Models\Project\InquiryFilterConfig;
+use App\Models\Project\MinorLanguages;
 use App\Models\Project\ProjectRenew;
 use App\Models\Project\ProjectRenew;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
 use App\Models\User\ProjectMenu;
 use App\Models\User\ProjectMenu;
@@ -150,6 +151,8 @@ class ProjectLogic extends BaseLogic
                 $this->saveProjectDeployOptimize($this->param['deploy_optimize']);
                 $this->saveProjectDeployOptimize($this->param['deploy_optimize']);
                 //保存售后信息
                 //保存售后信息
                 $this->saveProjectAfter($this->param['project_after']);
                 $this->saveProjectAfter($this->param['project_after']);
+
+                $this->saveMinorLanguages($this->param['minor_language'] ?? []);
                 //保存询盘过滤配置
                 //保存询盘过滤配置
 //                $this->param['inquiry_filter_config']['project_id'] = $this->param['id'];
 //                $this->param['inquiry_filter_config']['project_id'] = $this->param['id'];
 //                $this->saveInquiryFilterConfig($this->param['inquiry_filter_config']);
 //                $this->saveInquiryFilterConfig($this->param['inquiry_filter_config']);
@@ -305,6 +308,23 @@ class ProjectLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :保存小语种配置
+     * @name   :saveMinorLanguages
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/30 13:57
+     */
+    protected function saveMinorLanguages($minor_language){
+        //查询数据是否存在
+        $languageModel = new MinorLanguages();
+        $languageModel->del(['project_id'=>$this->param['project_id']]);
+        if(!empty($minor_language)){
+            $languageModel->insert($minor_language);
+        }
+        return $this->success();
+    }
+
+    /**
      * @remark :创建初始数据
      * @remark :创建初始数据
      * @name   :createProjectData
      * @name   :createProjectData
      * @author :lyh
      * @author :lyh

@@ -471,7 +471,7 @@ class RankDataLogic extends BaseLogic
 
 
         //关键词达标天数
         //关键词达标天数
         $model->is_compliance = 0;
         $model->is_compliance = 0;
-        if($model->updated_date != date('Y-m-d') && !$lang){
+        if($model->updated_date != date('Y-m-d')){
             //保证关键词数
             //保证关键词数
             $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
             $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
             $type = Project::where('id', $project_id)->value('type');
             $type = Project::where('id', $project_id)->value('type');
@@ -479,8 +479,10 @@ class RankDataLogic extends BaseLogic
                 $model->compliance_day = $model->compliance_day + 1;
                 $model->compliance_day = $model->compliance_day + 1;
                 $model->is_compliance = 1;
                 $model->is_compliance = 1;
                 //项目表更新
                 //项目表更新
-                $compliance_day  = Project::where(['id' => $project_id])->value('finish_remain_day') ?: 0;
-                Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day+1]);
+                if(!$lang){
+                    $compliance_day  = Project::where(['id' => $project_id])->value('finish_remain_day') ?: 0;
+                    Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day+1]);
+                }
             }
             }
         }
         }
 
 

@@ -55,7 +55,8 @@ class RouteMap extends Base
     public static function generateRoute($title, $source, $source_id, $project_id){
     public static function generateRoute($title, $source, $source_id, $project_id){
         if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
         if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
             $title = Translate::tran($title, 'en');
             $title = Translate::tran($title, 'en');
-        }elseif (preg_match('/[а-яА-Я]/u', $title)) {
+        }
+        if (preg_match('/[а-яА-Я]/u', $title) || mb_ereg('[а-яА-Я]', $title)) {
             $title = Translate::tran($title, 'en');
             $title = Translate::tran($title, 'en');
         }
         }
         $i=1;
         $i=1;

@@ -193,8 +193,6 @@ Route::middleware(['aloginauth'])->group(function () {
 
 
         Route::prefix('language')->group(function () {
         Route::prefix('language')->group(function () {
             Route::any('/', [Aside\Project\MinorLanguagesController::class, 'getMinorLanguageList'])->name('admin.getMinorLanguageList');
             Route::any('/', [Aside\Project\MinorLanguagesController::class, 'getMinorLanguageList'])->name('admin.getMinorLanguageList');
-            Route::any('/save', [Aside\Project\KeywordPrefixController::class, 'save'])->name('admin.keyword_save');
-            Route::any('/del', [Aside\Project\KeywordPrefixController::class, 'del'])->name('admin.keyword_del');
         });
         });
         //更新项目tdk
         //更新项目tdk
         Route::any('/updateSeoTdk', [Aside\Com\UpdateController::class, 'updateSeoTdk'])->name('admin.project_updateSeoTdk');
         Route::any('/updateSeoTdk', [Aside\Com\UpdateController::class, 'updateSeoTdk'])->name('admin.project_updateSeoTdk');

@@ -230,6 +230,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/statusNum', [\App\Http\Controllers\Bside\Product\ProductController::class, 'getStatusNumber'])->name('product_statusNum');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\Product\ProductController::class, 'getStatusNumber'])->name('product_statusNum');
         Route::any('/copyProduct', [\App\Http\Controllers\Bside\Product\ProductController::class, 'copyProduct'])->name('product_copyProduct');
         Route::any('/copyProduct', [\App\Http\Controllers\Bside\Product\ProductController::class, 'copyProduct'])->name('product_copyProduct');
         Route::any('/batchSetCategory', [\App\Http\Controllers\Bside\Product\ProductController::class, 'batchSetCategory'])->name('product_batchSetCategory');
         Route::any('/batchSetCategory', [\App\Http\Controllers\Bside\Product\ProductController::class, 'batchSetCategory'])->name('product_batchSetCategory');
+        Route::any('/sendAiProduct', [\App\Http\Controllers\Bside\Product\ProductController::class, 'sendAiProduct'])->name('product_sendAiProduct');
         //产品分类
         //产品分类
         Route::get('category', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'index'])->name('product_category');
         Route::get('category', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'index'])->name('product_category');
         Route::get('category/info', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'info'])->name('product_category_info');
         Route::get('category/info', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'info'])->name('product_category_info');