gx

lyh
app/Http/Controllers/Bside/BaseController.php
app/Http/Controllers/Bside/Blog/BlogCategoryController.php
app/Http/Controllers/Bside/Blog/BlogController.php
app/Http/Controllers/Bside/News/NewsCategoryController.php
app/Http/Controllers/Bside/News/NewsController.php
app/Http/Controllers/Bside/Product/KeywordController.php
app/Http/Logic/Aside/Project/ProjectLogic.php
--- a/app/Http/Controllers/Bside/BaseController.php
查看文件 @5dafee0
+++ b/app/Http/Controllers/Bside/BaseController.php
查看文件 @5dafee0
@@ -166,22 +166,4 @@ class BaseController extends Controller
         return \Illuminate\Support\Facades\Request::isMethod('post');
     }
-    /**
-     * @remark :获取域名
-     * @name   :getProjectDomain
-     * @author :lyh
-     * @method :post
-     * @time   :2023/7/20 16:45
-     */
-    public function getProjectDomain(){
-        $project = (new ProjectLogic())->getInfo($this->user['project_id']);
-        if(!empty($project['deploy_optimize']['domain'])){
-            return $project['deploy_optimize']['domain'];
-        }
-        if(!empty($project['deploy_build']['test_domain'])){
-            return $project['deploy_build']['test_domain'];
-        }
-        return '';
-    }
-
 }
--- a/app/Http/Controllers/Bside/Blog/BlogCategoryController.php
查看文件 @5dafee0
+++ b/app/Http/Controllers/Bside/Blog/BlogCategoryController.php
查看文件 @5dafee0
@@ -27,7 +27,7 @@ class BlogCategoryController extends BaseController
             foreach ($lists['list'] as $k => $v){
                 $v['num'] = $blogModel->formatQuery(['category_id'=>['like','%,' . $v['id'] . ',%']])->count();
                 $v['alias'] = RouteMap::getRoute(RouteMap::SOURCE_BLOG_CATE, $v['id'], $this->user['project_id']);
-                $v['url'] = $this->getProjectDomain() . RouteMap::PATH_BLOG_CATE . '/' . $v['alias'];
+                $v['url'] = $this->user['domain'] . RouteMap::PATH_BLOG_CATE . '/' . $v['alias'];
                 $v['hasChildren'] =  (($blogCategoryModel->read(['pid'=>$v['id']])) != false) ? true : false;
                 $lists['list'][$k] = $v;
             }
@@ -59,7 +59,7 @@ class BlogCategoryController extends BaseController
         ]);
         $info = $blogCategoryLogic->info_blog_category();
         $info['alias'] = RouteMap::getRoute(RouteMap::SOURCE_BLOG_CATE, $info['id'], $this->user['project_id']);
-        $info['url'] = $this->getProjectDomain() . RouteMap::PATH_BLOG_CATE . '/' . $info['alias'];
+        $info['url'] = $this->user['domain'] . RouteMap::PATH_BLOG_CATE . '/' . $info['alias'];
         $this->response('success',Code::SUCCESS,$info);
     }
     /**
--- a/app/Http/Controllers/Bside/Blog/BlogController.php
查看文件 @5dafee0
+++ b/app/Http/Controllers/Bside/Blog/BlogController.php
查看文件 @5dafee0
@@ -33,7 +33,7 @@ class BlogController extends BaseController
                 $v = $blogCategoryLogic->get_category_name($v);
                 //获取标签名称
 //                $v = $blogLabelLogic->get_label_name($v);
-                $v['url'] = $this->getProjectDomain() . RouteMap::getRoute(RouteMap::SOURCE_BLOG, $v['id'], $this->user['project_id']);
+                $v['url'] = $this->user['domain'] . RouteMap::getRoute(RouteMap::SOURCE_BLOG, $v['id'], $this->user['project_id']);
                 $v['image_link'] = getImageUrl($v['image']);
                 $v['operator_name'] = (new User())->getName($v['operator_id']);
                 $lists['list'][$k] = $v;
@@ -78,7 +78,7 @@ class BlogController extends BaseController
         ]);
         $info = $blogLogic->blog_info();
         $info['route'] = RouteMap::getRoute(RouteMap::SOURCE_BLOG, $info['id'], $this->user['project_id']);
-        $info['url'] = $this->getProjectDomain() . $info['route'];
+        $info['url'] = $this->user['domain'] . $info['route'];
         $info['image_link'] = getImageUrl($info['image']);
         $this->response('success',Code::SUCCESS,$info);
     }
--- a/app/Http/Controllers/Bside/News/NewsCategoryController.php
查看文件 @5dafee0
+++ b/app/Http/Controllers/Bside/News/NewsCategoryController.php
查看文件 @5dafee0
@@ -27,7 +27,7 @@ class NewsCategoryController extends BaseController
             foreach ($lists['list'] as $k => $v){
                 $v['num'] = $newsModel->formatQuery(['category_id'=>['like','%,' . $v['id'] . ',%']])->count();
                 $v['alias'] = RouteMap::getRoute(RouteMap::SOURCE_NEWS_CATE, $v['id'], $this->user['project_id']);
-                $v['url'] = $this->getProjectDomain() . RouteMap::PATH_NEWS_CATE . '/' . $v['alias'];
+                $v['url'] = $this->user['domain'] . RouteMap::PATH_NEWS_CATE . '/' . $v['alias'];
                 $v['hasChildren'] =  (($newsCategory->read(['pid'=>$v['id']])) != false) ? true : false;
                 $lists['list'][$k] = $v;
             }
@@ -59,7 +59,7 @@ class NewsCategoryController extends BaseController
         ]);
         $info = $newsCategoryLogic->info_news_category();
         $info['alias'] = RouteMap::getRoute(RouteMap::SOURCE_NEWS_CATE, $info['id'], $this->user['project_id']);
-        $info['url'] = $this->getProjectDomain() . RouteMap::PATH_NEWS_CATE . '/' . $info['alias'];
+        $info['url'] = $this->user['domain'] . RouteMap::PATH_NEWS_CATE . '/' . $info['alias'];
         $this->response('success',Code::SUCCESS,$info);
     }
     /**
--- a/app/Http/Controllers/Bside/News/NewsController.php
查看文件 @5dafee0
+++ b/app/Http/Controllers/Bside/News/NewsController.php
查看文件 @5dafee0
@@ -31,7 +31,7 @@ class NewsController extends BaseController
         if(!empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
                 $v = $newsCategoryLogic->get_category_name($v);
-                $v['url'] = $this->getProjectDomain() . RouteMap::getRoute(RouteMap::SOURCE_NEWS, $v['id'], $this->user['project_id']);
+                $v['url'] = $this->user['domain'] . RouteMap::getRoute(RouteMap::SOURCE_NEWS, $v['id'], $this->user['project_id']);
                 $v['image_link'] = getImageUrl($v['image']);
                 $v['operator_name'] = (new User())->getName($v['operator_id']);
                 $lists['list'][$k] = $v;
@@ -75,7 +75,7 @@ class NewsController extends BaseController
         ]);
         $info = $newsLogic->news_info();
         $info['route'] = RouteMap::getRoute(RouteMap::SOURCE_NEWS, $info['id'], $this->user['project_id']);
-        $info['url'] = $this->getProjectDomain() . $info['route'];
+        $info['url'] = $this->user['domain'] . $info['route'];
         $info['image_link'] = getImageUrl($info['image']);
         $this->response('success',Code::SUCCESS,$info);
     }
--- a/app/Http/Controllers/Bside/Product/KeywordController.php
查看文件 @5dafee0
+++ b/app/Http/Controllers/Bside/Product/KeywordController.php
查看文件 @5dafee0
@@ -42,7 +42,7 @@ class KeywordController extends BaseController
             foreach ($data['list'] as &$v){
                 $v['product_num'] = KeywordRelated::where('keyword_id', $v['id'])->distinct()->count('product_id');
                 $v['tdk'] = boolval($v['seo_title']) * boolval($v['seo_keywords']) * boolval($v['seo_description']);
-                $v['url'] = $this->getProjectDomain() . RouteMap::getRoute(RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+                $v['url'] = $this->user['domain'] . RouteMap::getRoute(RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
             }
         }
         return $this->response('success',Code::SUCCESS,$data);
--- a/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @5dafee0
+++ b/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @5dafee0
@@ -16,6 +16,7 @@ use App\Models\Channel\User;
 use App\Models\Channel\Zone;
 use App\Models\Devops\ServerConfig;
 use App\Models\Inquiry\InquirySet;
+use App\Models\Manage\Manage;
 use App\Models\News\News;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
@@ -91,8 +92,6 @@ class ProjectLogic extends BaseLogic
     public function getAutoLoginCode($project_id){
         $encrypt = new EncryptUtils();
         return $encrypt->authcode(json_encode(['project_id' => $project_id]), 'ENCODE', 'autologin', 3600);
-//        $param = http_build_query(['code' => $code]);
-//        return env('B_URL') . '/autologin?' . $param;
     }
     public function getInfo($id)
@@ -111,14 +110,21 @@ class ProjectLogic extends BaseLogic
     public function getProjectInfo($id){
         $info = $this->model->with('payment')->with('deploy_build')
             ->with('deploy_optimize')->with('online_check')->where(['id'=>$id])->first();
-        if(isset($info['online_check']['created_manage_id']) && !empty($info['online_check']['created_manage_id'])){
-            $info['online_check']['name'] = (new ManageLogic)->getCacheName($info['online_check']['created_manage_id']);
-        }
+        $info['online_check']['name'] = (new Manage())->read(['id'=>$info['online_check']['created_manage_id']])['name'] ?? '';
+        $info['deploy_optimize']['minor_keywords'] = json_decode($info['deploy_optimize']['minor_keywords']) ?? '';
         if($info['extend_type'] != 0){
             $info['type'] = $info['extend_type'];
         }
         return $this->success($info);
     }
+
+    /**
+     * @remark :保存项目配置数据
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/17 14:19
+     */
     public function save($param){
         if(!empty($param['deploy_optimize']['domain'])){
             $param['deploy_optimize']['domain'] = checkDomain($param['deploy_optimize']['domain']);
@@ -195,6 +201,7 @@ class ProjectLogic extends BaseLogic
             return true;
         }
         $data = $param['deploy_optimize'];
+        $data['minor_keywords'] = json_encode($data['minor_keywords']) ?? '';
         $data['project_id'] = $param['id'];
         $data['id'] = DeployOptimize::where('project_id', $param['id'])->value('id');
 //        Arr::forget($data, ['api_no']);