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

Lyh server



查看合并请求 !1446

@@ -27,11 +27,14 @@ class MonthReportController extends BaseController
      * @author :lyh
      * @method :post
      * @time   :2024/2/2 15:14
+     * @param  :is_upgrade；1->升级项目
      */
     public function getMonth(){
         $monthCountModel = new MonthCount();
         $this->map['project_id'] = $this->user['project_id'];
-        $this->map['month'] = ['>=',date('Y-m',strtotime($this->user['uptime']))];
+        if($this->user['is_upgrade'] != 1){
+            $this->map['month'] = ['>=',date('Y-m',strtotime($this->user['uptime']))];
+        }
         $month = $monthCountModel->formatQuery($this->map)->pluck('month')->unique()->toArray();
         $this->response('success',Code::SUCCESS,$month);
     }

@@ -7,12 +7,12 @@
  * @time   :2025/3/12 17:01
  */
 
-namespace App\Http\Controllers\Bside\Product;
+namespace App\Http\Controllers\Bside\SeoSetting;
 
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
-use App\Http\Logic\Bside\Product\KeywordUrlLogic;
-use App\Models\Product\KeywordUrl;
+use App\Http\Logic\Bside\SeoSetting\KeywordUrlLogic;
+use App\Models\SeoSetting\KeywordUrl;
 
 /**
  * @remark :关键词设置

+<?php
+/**
+ * @remark :
+ * @name   :LinkDataController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/3/14 16:30
+ */
+
+namespace App\Http\Controllers\Bside\SeoSetting;
+
+use App\Http\Controllers\Bside\BaseController;
+
+class LinkDataController extends BaseController
+{
+    /**
+     * @remark :获取列表页
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2025/3/14 16:33
+     */
+    public function lists(){
+
+    }
+}

@@ -7,11 +7,11 @@
  * @time   :2025/3/12 15:36
  */
 
-namespace App\Http\Controllers\Bside\Setting;
+namespace App\Http\Controllers\Bside\SeoSetting;
 
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
-use App\Models\WebSetting\WebSettingYoutube;
+use App\Models\SeoSetting\WebSettingYoutube;
 
 class WebSettingYoutubeController extends BaseController
 {

@@ -7,10 +7,10 @@
  * @time   :2025/3/12 17:06
  */
 
-namespace App\Http\Logic\Bside\Product;
+namespace App\Http\Logic\Bside\SeoSetting;
 
 use App\Http\Logic\Bside\BaseLogic;
-use App\Models\Product\KeywordUrl;
+use App\Models\SeoSetting\KeywordUrl;
 
 /**
  * @remark :关键词设置

@@ -107,9 +107,10 @@ class Project extends Base
         return [
             1 => '自建站项目',
             2 => '重点跟进',
-            3 => '推广案例',
-            4 => '全球搜案例',
-            5 => '设计师案例',
+            3 => '经典案例',
+            4 => '全球搜案例库',
+            5 => '设计师精美网站',
+            18 => '多语言案例',
             6 => '可登陆后台',
             7 => 'T项目',
             8 => '特殊前后缀',
@@ -122,6 +123,7 @@ class Project extends Base
             15 => 'AI案例',
             16 => '6.0广告',
             17 => '超哥监控项目',
+            19 => '商城案例',
         ];
     }
 

@@ -7,7 +7,7 @@
  * @time   :2025/3/12 16:59
  */
 
-namespace App\Models\Product;
+namespace App\Models\SeoSetting;
 
 use App\Models\Base;
 

+<?php
+/**
+ * @remark :
+ * @name   :LinkData.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/3/14 16:30
+ */
+
+namespace App\Models\SeoSetting;
+
+use App\Models\Base;
+
+/**
+ * @remark :外链数据
+ * @name   :LinkData
+ * @author :lyh
+ * @method :post
+ * @time   :2025/3/14 16:31
+ */
+class LinkData extends Base
+{
+    protected $table = 'gl_link_data';
+    //连接数据库
+    protected $connection = 'custom_mysql';
+}

@@ -7,7 +7,7 @@
  * @time   :2025/3/11 15:51
  */
 
-namespace App\Models\WebSetting;
+namespace App\Models\SeoSetting;
 
 use App\Models\Base;
 

@@ -670,16 +670,16 @@ Route::middleware(['bloginauth'])->group(function () {
 
     //seo白帽  youtube账号密码设置
     Route::prefix('youtube')->group(function () {
-        Route::any('/info', [\App\Http\Controllers\Bside\Setting\WebSettingYoutubeController::class, 'getYoutubeInfo'])->name('youtube_getYoutubeInfo');
-        Route::any('/save', [\App\Http\Controllers\Bside\Setting\WebSettingYoutubeController::class, 'saveYoutube'])->name('youtube_saveYoutube');
+        Route::any('/info', [\App\Http\Controllers\Bside\SeoSetting\WebSettingYoutubeController::class, 'getYoutubeInfo'])->name('youtube_getYoutubeInfo');
+        Route::any('/save', [\App\Http\Controllers\Bside\SeoSetting\WebSettingYoutubeController::class, 'saveYoutube'])->name('youtube_saveYoutube');
     });
 
     //seo白帽  关键词设置
     Route::prefix('keyword_url')->group(function () {
-        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('/del', [\App\Http\Controllers\Bside\Product\KeywordUrlController::class, 'del'])->name('keyword_url_del');
+        Route::any('/', [\App\Http\Controllers\Bside\SeoSetting\KeywordUrlController::class, 'lists'])->name('keyword_url_lists');
+        Route::any('/info', [\App\Http\Controllers\Bside\SeoSetting\KeywordUrlController::class, 'info'])->name('keyword_url_info');
+        Route::any('/save', [\App\Http\Controllers\Bside\SeoSetting\KeywordUrlController::class, 'save'])->name('keyword_url_save');
+        Route::any('/del', [\App\Http\Controllers\Bside\SeoSetting\KeywordUrlController::class, 'del'])->name('keyword_url_del');
     });
 });
 //无需登录验证的路由组