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

Lyh server



查看合并请求 !1414

@@ -227,7 +227,7 @@ class WeekProject extends Command
             if(!empty($data['daily_average_num'])){
             if(!empty($data['daily_average_num'])){
                 $content2 .= '本周日均访客量：'.$data['daily_average_num'].'+。';
                 $content2 .= '本周日均访客量：'.$data['daily_average_num'].'+。';
             }
             }
-            $content2 .= '全球搜建议用户持续分析、选择、添加企业、产品、服务等相关关键词进行优化和监控，以覆盖更多相关排名和流量；';
+            $content2 .= PHP_EOL.'全球搜建议用户持续分析、选择、添加企业、产品、服务等相关关键词进行优化和监控，以覆盖更多相关排名和流量；';
         }
         }
         if(!empty($content2)){
         if(!empty($content2)){
             $arr[] = $content2;
             $arr[] = $content2;
@@ -252,7 +252,7 @@ class WeekProject extends Command
                     $content3 .= '新闻：'.$data['week_news_num'].'条。';
                     $content3 .= '新闻：'.$data['week_news_num'].'条。';
                 }
                 }
             }
             }
-            $content3 .= '全球搜建议用户保持网站内容的持续更新与完善，可参考谷歌关于创建实用、可靠、以用户为中心的内容的相关建议：https://developers.google.com/search/docs/fundamentals/creating-helpful-content?hl=zh-cn；';
+            $content3 .= PHP_EOL.'全球搜建议用户保持网站内容的持续更新与完善，可参考谷歌关于创建实用、可靠、以用户为中心的内容的相关建议：https://developers.google.com/search/docs/fundamentals/creating-helpful-content?hl=zh-cn；';
         }
         }
         if(!empty($content3)){
         if(!empty($content3)){
             $arr[] = $content3;
             $arr[] = $content3;
@@ -271,7 +271,7 @@ class WeekProject extends Command
             $content4 .= '聚合页小语种站页面'.$data['aggregation_minor_update_num'].'次。';
             $content4 .= '聚合页小语种站页面'.$data['aggregation_minor_update_num'].'次。';
         }
         }
         if(!empty($content4)){
         if(!empty($content4)){
-            $content4 = '本周主要优化工作包括：TDK、H标签、Img标签等优化设置排查与进一步完善，Sitemap更新与网页收录提交，外链新增与排查。'.$content4;
+            $content4 = PHP_EOL.'本周主要优化工作包括：TDK、H标签、Img标签等优化设置排查与进一步完善，Sitemap更新与网页收录提交，外链新增与排查。'.$content4;
         }
         }
         if(!empty($content4)){
         if(!empty($content4)){
             $arr[] = $content4;
             $arr[] = $content4;
@@ -280,7 +280,7 @@ class WeekProject extends Command
             return true;
             return true;
         }
         }
         foreach ($arr as $key => $val){
         foreach ($arr as $key => $val){
-            $content .= ($key+1).','.$val.PHP_EOL;
+            $content .= ($key+1).','.$val.PHP_EOL.PHP_EOL;
         }
         }
         $timestamp = strtotime('tomorrow 9:00 AM');
         $timestamp = strtotime('tomorrow 9:00 AM');
         $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp);
         $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp);

@@ -29,6 +29,7 @@ class KeywordUrlController extends BaseController
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2025/3/12 17:01
      * @time   :2025/3/12 17:01
+     * @param  :keyword->关键字
      */
      */
     public function lists(KeywordUrl $keywordUrl){
     public function lists(KeywordUrl $keywordUrl){
         if(isset($this->map['keyword']) && !empty($this->map['keyword'])){
         if(isset($this->map['keyword']) && !empty($this->map['keyword'])){
@@ -40,11 +41,29 @@ class KeywordUrlController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取数据详情
+     * @name   :info
+     * @author :lyh
+     * @method :post
+     * @time   :2025/3/12 17:25
+     */
+    public function info(KeywordUrl $keywordUrl){
+        $this->request->validate([
+            'id'=>['required'],
+        ],[
+            'id.required' => 'id不能为空',
+        ]);
+        $lists = $keywordUrl->read(['id'=>$this->param['id']]);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
      * @remark :保存数据
      * @remark :保存数据
      * @name   :save
      * @name   :save
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2025/3/12 17:02
      * @time   :2025/3/12 17:02
+     * @param  :keyword->关键词; url->对应路由
      */
      */
     public function save(KeywordUrlLogic $keywordUrlLogic){
     public function save(KeywordUrlLogic $keywordUrlLogic){
         $this->request->validate([
         $this->request->validate([

@@ -677,6 +677,7 @@ Route::middleware(['bloginauth'])->group(function () {
     //seo白帽  关键词设置
     //seo白帽  关键词设置
     Route::prefix('keyword_url')->group(function () {
     Route::prefix('keyword_url')->group(function () {
         Route::any('/', [\App\Http\Controllers\Bside\Product\KeywordUrlController::class, 'lists'])->name('keyword_url_lists');
         Route::any('/', [\App\Http\Controllers\Bside\Product\KeywordUrlController::class, 'lists'])->name('keyword_url_lists');
+        Route::any('/info', [\App\Http\Controllers\Bside\Product\KeywordUrlController::class, 'info'])->name('keyword_url_info');
         Route::any('/save', [\App\Http\Controllers\Bside\Product\KeywordUrlController::class, 'save'])->name('keyword_url_save');
         Route::any('/save', [\App\Http\Controllers\Bside\Product\KeywordUrlController::class, 'save'])->name('keyword_url_save');
         Route::any('/del', [\App\Http\Controllers\Bside\Product\KeywordUrlController::class, 'del'])->name('keyword_url_del');
         Route::any('/del', [\App\Http\Controllers\Bside\Product\KeywordUrlController::class, 'del'])->name('keyword_url_del');
     });
     });