优化：域名授权方式

src/main/java/com/gxwebsoft/cms/controller/CmsDomainController.java

@@ -2,17 +2,12 @@ package com.gxwebsoft.cms.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.gxwebsoft.cms.mapper.CmsDomainMapper;
 import com.gxwebsoft.common.core.utils.RedisUtil;
-import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.*;
 import com.gxwebsoft.cms.service.CmsDomainService;
 import com.gxwebsoft.cms.entity.CmsDomain;
 import com.gxwebsoft.cms.param.CmsDomainParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.system.entity.User;
 import io.swagger.annotations.Api;
@@ -50,11 +45,8 @@ public class CmsDomainController extends BaseController {
     @ApiOperation("查询全部网站域名记录表")
     @GetMapping()
     public ApiResult<List<CmsDomain>> list(CmsDomainParam param) {
-        PageParam<CmsDomain, CmsDomainParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(cmsDomainService.list(page.getOrderWrapper()));
         // 使用关联查询
-        //return success(cmsDomainService.listRel(param));
+        return success(cmsDomainService.listRel(param));
     }
 
     @PreAuthorize("hasAuthority('cms:cmsDomain:list')")
@@ -62,9 +54,8 @@ public class CmsDomainController extends BaseController {
     @ApiOperation("根据id查询网站域名记录表")
     @GetMapping("/{id}")
     public ApiResult<CmsDomain> get(@PathVariable("id") Integer id) {
-        return success(cmsDomainService.getById(id));
         // 使用关联查询
-        //return success(cmsDomainService.getByIdRel(id));
+        return success(cmsDomainService.getByIdRel(id));
     }
 
     @ApiOperation("添加网站域名记录表")
@@ -164,4 +155,24 @@ public class CmsDomainController extends BaseController {
       return fail("授权失败");
     }
 
+    @ApiOperation("查询授权主域名")
+    @GetMapping("/getAuthorizedDomain/{id}")
+    public ApiResult<?> getAuthorizedDomain(@PathVariable("id") Integer id) {
+      final List<CmsDomain> list = cmsDomainService.list(new LambdaQueryWrapper<CmsDomain>()
+        .eq(CmsDomain::getWebsiteId, id)
+        .eq(CmsDomain::getStatus, 1)
+        .eq(CmsDomain::getDeleted, 0)
+        .orderByAsc(CmsDomain::getSortNumber));
+      return success(list.get(0));
+    }
+
+    @ApiOperation("检查域名是否已存在")
+    @GetMapping("/existence")
+    public ApiResult<?> existence(ExistenceParam<CmsDomain> param) {
+      if (param.isExistence(cmsDomainService, CmsDomain::getDomain)) {
+        return success(param.getValue() + "已存在");
+      }
+      return fail(param.getValue() + "不存在");
+    }
+
 }

src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java

@@ -200,6 +200,7 @@ public class CmsWebsiteController extends BaseController {
     final List<CmsDomain> domains = domainService.list(new LambdaQueryWrapper<CmsDomain>()
       .eq(CmsDomain::getDeleted,0)
       .eq(CmsDomain::getStatus, 1)
+      .eq(CmsDomain::getUserId,website.getUserId())
       .eq(CmsDomain::getTenantId, getTenantId())
       .orderByAsc(CmsDomain::getSortNumber)
     );

src/main/java/com/gxwebsoft/cms/service/impl/CmsDomainServiceImpl.java

@@ -23,7 +23,7 @@ public class CmsDomainServiceImpl extends ServiceImpl<CmsDomainMapper, CmsDomain
     @Override
     public PageResult<CmsDomain> pageRel(CmsDomainParam param) {
         PageParam<CmsDomain, CmsDomainParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sortNumber asc,create_time desc");
         List<CmsDomain> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class CmsDomainServiceImpl extends ServiceImpl<CmsDomainMapper, CmsDomain
         List<CmsDomain> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<CmsDomain, CmsDomainParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sortNumber asc,create_time desc");
         return page.sortRecords(list);
     }
 

src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java

@@ -78,9 +78,9 @@ public class MybatisPlusConfig {
           "sys_website_field",
 //          "sys_company",
           "sys_domain",
-          "sys_white_domain"
+          "sys_white_domain",
+          "cms_domain"
 //          "cms_website",
-//          "cms_domain",
 //          "cms_website_field",
 //          "cms_navigation",
 //          "cms_design",