合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !3146

@@ -23,6 +23,7 @@ use App\Models\Project\Project;
 use App\Models\Project\ProjectAiSetting;
 use App\Models\Project\ProjectAiSetting;
 use App\Models\Project\ProjectWhiteHatAffix;
 use App\Models\Project\ProjectWhiteHatAffix;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
+use App\Models\SeoSetting\LinkData;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\TemplateTypeMain;
 use App\Models\Template\TemplateTypeMain;
 use App\Models\WebSetting\Translate;
 use App\Models\WebSetting\Translate;
@@ -115,13 +116,23 @@ class lyhDemo extends Command
     public function _actionRoute(){
     public function _actionRoute(){
         $projectModel = new Project();
         $projectModel = new Project();
         $lists = $projectModel->list(['type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
         $lists = $projectModel->list(['type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
-        $data = [];
+        $geoLinkModel = new GeoLink();
         foreach ($lists as $item){
         foreach ($lists as $item){
             echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
-            $letters = range('A', 'X'); // 只取前 24 个字母（A ~ X）
-            $randomLetter = $letters[array_rand($letters)];
-            $data['post_id'] = $randomLetter.mt_rand(100000, 999999).$item['id'];
-            $projectModel->edit(['post_id'=>$data['post_id']],['id'=>$item['id']]);
+            ProjectServer::useProject($item['project_id']);
+            $linkDataModel = new LinkData();
+            $linkList = $linkDataModel->list();
+            foreach ($linkList as $link){
+                $geoLinkModel->add([
+                    'project_id'=>$item['id'],
+                    'url'=>$link['url'],
+                    'type'=>2,
+                    'da'=>$link['da_values'],
+                    'send_time'=>$link['send_time'],
+                    'time'=>$link['time'],
+                        ]);
+            }
+            DB::disconnect('custom_mysql');
         }
         }
         return true;
         return true;
     }
     }

@@ -12,6 +12,7 @@ namespace App\Http\Controllers\Bside\SeoSetting;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\SeoSetting\LinkDataLogic;
 use App\Http\Logic\Bside\SeoSetting\LinkDataLogic;
+use App\Models\Geo\GeoLink;
 use App\Models\SeoSetting\LinkData;
 use App\Models\SeoSetting\LinkData;
 
 
 class LinkDataController extends BaseController
 class LinkDataController extends BaseController
@@ -23,7 +24,10 @@ class LinkDataController extends BaseController
      * @method :post
      * @method :post
      * @time   :2025/3/14 16:33
      * @time   :2025/3/14 16:33
      */
      */
-    public function lists(LinkData $linkData){
+    public function lists(GeoLink $linkData){
+        if(!isset($this->map['type']) || empty($this->map['type'])){
+            $this->map['type'] = $linkData::TYPE_LINK;
+        }
         $lists = $linkData->lists($this->map,$this->page,$this->row);
         $lists = $linkData->lists($this->map,$this->page,$this->row);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
@@ -35,7 +39,7 @@ class LinkDataController extends BaseController
      * @method :post
      * @method :post
      * @time   :2025/3/14 17:41
      * @time   :2025/3/14 17:41
      */
      */
-    public function info(LinkData $linkData){
+    public function info(GeoLink $linkData){
         $this->request->validate([
         $this->request->validate([
             'id'=>['required'],
             'id'=>['required'],
         ],[
         ],[
@@ -69,7 +73,7 @@ class LinkDataController extends BaseController
      * @method :post
      * @method :post
      * @time   :2025/3/14 16:45
      * @time   :2025/3/14 16:45
      */
      */
-    public function del(LinkData $linkData){
+    public function del(GeoLink $linkData){
         $this->request->validate([
         $this->request->validate([
             'id'=>'required|array',
             'id'=>'required|array',
         ],[
         ],[

@@ -39,11 +39,13 @@ class GeoLinkLogic extends BaseLogic
      * @time   :2025/7/14 16:47
      * @time   :2025/7/14 16:47
      */
      */
     public function getLinkList($map = [],$page = 1,$row = 20,$order = 'id'){
     public function getLinkList($map = [],$page = 1,$row = 20,$order = 'id'){
-        $filed = ['*'];
         if(isset($map['url']) && !empty($map['url'])){
         if(isset($map['url']) && !empty($map['url'])){
             $map['url'] = ['like','%'.$map['url'].'%'];
             $map['url'] = ['like','%'.$map['url'].'%'];
         }
         }
-        $lists = $this->model->lists($map,$page,$row,$order,$filed);
+        if(!isset($map['type']) || empty($map['type'])){
+            $map['type'] = GeoLink::TYPE_NEWS;
+        }
+        $lists = $this->model->lists($map,$page,$row,$order,['*']);
         return $this->success($lists);
         return $this->success($lists);
     }
     }
 
 

@@ -10,6 +10,7 @@
 namespace App\Http\Logic\Aside\Project;
 namespace App\Http\Logic\Aside\Project;
 
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Geo\GeoLink;
 use App\Models\Project\EnterpriseProduct;
 use App\Models\Project\EnterpriseProduct;
 use App\Models\SeoSetting\LinkData;
 use App\Models\SeoSetting\LinkData;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
@@ -56,8 +57,7 @@ class EnterpriseProductLogic extends BaseLogic
      * @time   :2025/4/2 9:08
      * @time   :2025/4/2 9:08
      */
      */
     public function saveLinkData(){
     public function saveLinkData(){
-        ProjectServer::useProject($this->param['project_id']);
-        $linkModel = new LinkData();
+        $linkModel = new GeoLink();
         $data = [];
         $data = [];
         $count = count($this->param['data']);
         $count = count($this->param['data']);
         $error_num = 0;
         $error_num = 0;
@@ -68,6 +68,7 @@ class EnterpriseProductLogic extends BaseLogic
             }
             }
             $data[] = [
             $data[] = [
                 'url'=>$v['url'],
                 'url'=>$v['url'],
+                'type'=>$linkModel::TYPE_LINK,
                 'da_values'=>$v['da_values'],
                 'da_values'=>$v['da_values'],
                 'send_time'=>$v['send_time'] ?? date('Y-m-d H:i:s')
                 'send_time'=>$v['send_time'] ?? date('Y-m-d H:i:s')
             ];
             ];
@@ -75,7 +76,6 @@ class EnterpriseProductLogic extends BaseLogic
         if(!empty($data)){
         if(!empty($data)){
             $linkModel->insertAll($data);
             $linkModel->insertAll($data);
         }
         }
-        DB::disconnect('custom_mysql');
         return $this->success(['success'=>$count,'error'=>$error_num]);
         return $this->success(['success'=>$count,'error'=>$error_num]);
     }
     }
 }
 }

@@ -11,6 +11,7 @@ namespace App\Http\Logic\Bside\SeoSetting;
 
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Geo\DomainDa;
 use App\Models\Geo\DomainDa;
+use App\Models\Geo\GeoLink;
 use App\Models\SeoSetting\LinkData;
 use App\Models\SeoSetting\LinkData;
 use App\Services\Geo\GeoService;
 use App\Services\Geo\GeoService;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Carbon;
@@ -29,7 +30,7 @@ class LinkDataLogic extends BaseLogic
     {
     {
         parent::__construct();
         parent::__construct();
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
-        $this->model = new LinkData();
+        $this->model = new GeoLink();
     }
     }
 
 
     /**
     /**

@@ -20,5 +20,8 @@ use App\Models\Base;
  */
  */
 class GeoLink extends Base
 class GeoLink extends Base
 {
 {
+    const TYPE_NEWS = 1;//权威新闻
+    const TYPE_LINK = 2;//外链数据
+
     protected $table = 'gl_geo_link';
     protected $table = 'gl_geo_link';
 }
 }