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

@@ -24,6 +24,9 @@ class ATemplateModuleController extends BaseController
      * @time   :2023/6/28 16:54
      * @time   :2023/6/28 16:54
      */
      */
     public function lists(ATemplateModuleLogic $ATemplateModuleLogic){
     public function lists(ATemplateModuleLogic $ATemplateModuleLogic){
+        if(!isset($this->map['test_model'])){
+            $this->map['test_model'] = 0;
+        }
         $lists = $ATemplateModuleLogic->aTemplateModuleLists($this->map,$this->page,$this->row,$this->order);
         $lists = $ATemplateModuleLogic->aTemplateModuleLists($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }

@@ -9,6 +9,7 @@ use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\User\UserLogic;
 use App\Http\Logic\Bside\User\UserLogic;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use App\Models\RouteMap\RouteMap;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\User;
 use App\Models\User\User;
@@ -207,4 +208,36 @@ class ComController extends BaseController
         $str = $common->encrypt($data);
         $str = $common->encrypt($data);
         $this->response('success',Code::SUCCESS,['str'=>$str]);
         $this->response('success',Code::SUCCESS,['str'=>$str]);
     }
     }
+
+    /**
+     * @remark :获取访问链接
+     * @name   :getLink
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/10 15:18
+     */
+    public function getLink(){
+        $this->request->validate([
+            'type' => 'required',
+        ], [
+            'type.required' => '类型不能为空',
+        ]);
+        switch ($this->param['type']){
+            case 'news':
+                $url_link = $this->user['domain'].RouteMap::SOURCE_NEWS.'/';
+                break;
+            case 'news_category':
+                $url_link = $this->user['domain'].RouteMap::PATH_NEWS_CATE.'/';
+                break;
+            case 'blog':
+                $url_link = $this->user['domain'].RouteMap::SOURCE_BLOG.'/';
+                break;
+            case 'blog_category':
+                $url_link = $this->user['domain'].RouteMap::PATH_BLOG_CATE.'/';
+                break;
+            default:
+                $url_link = $this->user['domain'];
+        }
+        $this->response('success',Code::SUCCESS,['url'=>$url_link]);
+    }
 }
 }

@@ -16,6 +16,7 @@ Route::middleware(['bloginauth'])->group(function () {
     //获取当前登录用户项目详情
     //获取当前登录用户项目详情
     Route::any('/get_project', [\App\Http\Controllers\Bside\BCom\ComController::class, 'get_project'])->name('get_project');
     Route::any('/get_project', [\App\Http\Controllers\Bside\BCom\ComController::class, 'get_project'])->name('get_project');
     Route::any('/generateToken', [\App\Http\Controllers\Bside\BCom\ComController::class, 'generateToken'])->name('generateToken');
     Route::any('/generateToken', [\App\Http\Controllers\Bside\BCom\ComController::class, 'generateToken'])->name('generateToken');
+    Route::any('/getLink', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getLink'])->name('getLink');
     //用户相关路由
     //用户相关路由
     Route::prefix('user')->group(function () {
     Route::prefix('user')->group(function () {
         Route::any('/', [\App\Http\Controllers\Bside\User\UserController::class, 'lists'])->name('user_lists');
         Route::any('/', [\App\Http\Controllers\Bside\User\UserController::class, 'lists'])->name('user_lists');