Java format

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/constant/WordPressConstants.java

@@ -9,6 +9,6 @@ public class WordPressConstants {
     // dev-ci2
     public static final String DEV_CI2 = "52.83.132.56";
 
-    //prod-server-wp
+    // prod-server-wp
     public static final String PROD_WP_SERVER_IP = "44.227.32.118";
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/controller/AdwebSiteController.java

@@ -6,13 +6,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import io.netty.util.internal.StringUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -53,29 +57,21 @@ import java.util.Map;
 @Slf4j
 public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteService> {
 
-    @Resource
-    private IAdwebSiteService adwebSiteService;
+    @Resource private IAdwebSiteService adwebSiteService;
 
-    @Resource
-    private SysAdwebApi sysAdwebApi;
+    @Resource private SysAdwebApi sysAdwebApi;
 
-    @Resource
-    private ISiteUserPermissionService siteUserPermissionService;
+    @Resource private ISiteUserPermissionService siteUserPermissionService;
 
-    @Resource
-    private ISitePermissionService sitePermissionService;
+    @Resource private ISitePermissionService sitePermissionService;
 
-    @Resource
-    private SeoPlanSubscriptionMapper seoPlanSubscriptionMapper;
+    @Resource private SeoPlanSubscriptionMapper seoPlanSubscriptionMapper;
 
-    @Resource
-    private SelfWebSiteService selfWebSiteService;
+    @Resource private SelfWebSiteService selfWebSiteService;
 
-    @Resource
-    private BaseCommonService baseCommonService;
+    @Resource private BaseCommonService baseCommonService;
 
-    @Resource
-    private Sohoeb2bOrderService sohoeb2bOrderService;
+    @Resource private Sohoeb2bOrderService sohoeb2bOrderService;
 
     /**
      * 分页列表查询
@@ -86,14 +82,16 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
      * @param req
      * @return
      */
-    //@AutoLog(value = "adweb站点配置表单-分页列表查询")
+    // @AutoLog(value = "adweb站点配置表单-分页列表查询")
     @Operation(summary = "adweb站点配置表单-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<AdwebSite>> queryPageList(AdwebSite adwebSite,
-                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                  HttpServletRequest req) {
-        QueryWrapper<AdwebSite> queryWrapper = QueryGenerator.initQueryWrapper(adwebSite, req.getParameterMap());
+    public Result<IPage<AdwebSite>> queryPageList(
+            AdwebSite adwebSite,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<AdwebSite> queryWrapper =
+                QueryGenerator.initQueryWrapper(adwebSite, req.getParameterMap());
 
         Page<AdwebSite> page = new Page<AdwebSite>(pageNo, pageSize);
 
@@ -105,8 +103,11 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
         // 给站点增加营销计划信息
         List<AdwebSite> siteList = pageList.getRecords();
         for (AdwebSite site : siteList) {
-            Map<String, String> marketPlan = seoPlanSubscriptionMapper.getSubscribePlanBySiteId(site.getId());
-            JSONObject object = FastJsonUtil.parseObject(FastJsonUtil.toJSONString(marketPlan), JSONObject.class);
+            Map<String, String> marketPlan =
+                    seoPlanSubscriptionMapper.getSubscribePlanBySiteId(site.getId());
+            JSONObject object =
+                    FastJsonUtil.parseObject(
+                            FastJsonUtil.toJSONString(marketPlan), JSONObject.class);
             site.setSubscribePlan(object);
 
             // 设置建站进度
@@ -127,7 +128,6 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
             if (sohoeb2bOrder != null) {
                 adwebSite.setOrderUrl(sohoeb2bOrder.getOrderUrl());
                 adwebSite.setOrderUrlID(String.valueOf(sohoeb2bOrder.getId()));
-
             }
         }
 
@@ -158,7 +158,9 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
     @AutoLog(value = "adweb站点配置表单-编辑")
     @Operation(summary = "adweb站点配置表单-编辑")
     @PreAuthorize("@jps.requiresPermissions('adweb:adweb_site:edit')")
-    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    @RequestMapping(
+            value = "/edit",
+            method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody AdwebSite adwebSite) {
         adwebSiteService.updateById(adwebSite);
         return Result.OK("编辑成功!");
@@ -178,7 +180,8 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
         AdwebSite adwebSite = adwebSiteService.getById(id);
 
         // 删除站点权限
-        LambdaQueryWrapper<AdwebSitePermission> queryWrapper = new LambdaQueryWrapper<AdwebSitePermission>();
+        LambdaQueryWrapper<AdwebSitePermission> queryWrapper =
+                new LambdaQueryWrapper<AdwebSitePermission>();
         queryWrapper.eq(AdwebSitePermission::getSiteCode, adwebSite.getCode());
         sitePermissionService.remove(queryWrapper);
 
@@ -190,7 +193,10 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
         adwebSiteService.removeById(id);
 
         // 记录删除站点操作日志
-        baseCommonService.addLog("站点" + adwebSite.getDomain() + "资源已被删除，将在服务器自动备份15天，之后将自动清空:", CommonConstant.LOG_TYPE_2, 3);
+        baseCommonService.addLog(
+                "站点" + adwebSite.getDomain() + "资源已被删除，将在服务器自动备份15天，之后将自动清空:",
+                CommonConstant.LOG_TYPE_2,
+                3);
 
         return Result.ok("该站点资源已经不存在, 站点信息将从系统中删除!");
     }
@@ -216,7 +222,7 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
      * @param id
      * @return
      */
-    //@AutoLog(value = "adweb站点配置表单-通过id查询")
+    // @AutoLog(value = "adweb站点配置表单-通过id查询")
     @Operation(summary = "adweb站点配置表单-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<AdwebSite> queryById(@RequestParam(name = "id", required = true) String id) {
@@ -252,18 +258,23 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
         return super.importExcel(request, response, AdwebSite.class);
     }
 
-    /**
-     * 根据uid获取所属一级站点信息
-     * "id", "name", "code", "domain","domain_dev","status"
-     */
+    /** 根据uid获取所属一级站点信息 "id", "name", "code", "domain","domain_dev","status" */
     @GetMapping("/getSiteListByUid")
     public Result<?> getAllSites() {
         LambdaQueryWrapper<AdwebSite> queryWrapper = new LambdaQueryWrapper<>();
         // 处理多租户过滤站点列表
         processTenantFilter(queryWrapper);
 
-        queryWrapper.ne(AdwebSite::getStatus, AdwebConstant.SITE_DEL).isNull(AdwebSite::getParentGroupCode);
-        queryWrapper.select(AdwebSite::getId, AdwebSite::getName, AdwebSite::getCode, AdwebSite::getDomain, AdwebSite::getDomainDev, AdwebSite::getStatus);
+        queryWrapper
+                .ne(AdwebSite::getStatus, AdwebConstant.SITE_DEL)
+                .isNull(AdwebSite::getParentGroupCode);
+        queryWrapper.select(
+                AdwebSite::getId,
+                AdwebSite::getName,
+                AdwebSite::getCode,
+                AdwebSite::getDomain,
+                AdwebSite::getDomainDev,
+                AdwebSite::getStatus);
         List<AdwebSite> siteList = adwebSiteService.list(queryWrapper);
 
         // 处理域名，全部改为绝对路径
@@ -285,20 +296,19 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
     /**
      * 更新site表现阶段
      *
-     * @param siteStepDTO
-     * @Author: 陈培庆
-     * @Date: 2024/11/26
+     * @param siteStepDTO @Author: 陈培庆 @Date: 2024/11/26
      */
     @RequestMapping(value = "/finishOrRollbackStep")
     public Result<?> finishOrRollbackStep(SiteStepDTO siteStepDTO) {
 
-
         // 更新流程步骤和状态
         LambdaUpdateWrapper<AdwebSite> siteUpdateWrapper = new LambdaUpdateWrapper<>();
         siteUpdateWrapper.eq(AdwebSite::getCode, siteStepDTO.getSiteCode());
 
-        //建站流程
-        siteUpdateWrapper.set(AdwebSite::getSiteCurrentStep, siteStepDTO.getCurrentStep()).set(AdwebSite::getSiteFlowStatus, siteStepDTO.getStepFlowId());
+        // 建站流程
+        siteUpdateWrapper
+                .set(AdwebSite::getSiteCurrentStep, siteStepDTO.getCurrentStep())
+                .set(AdwebSite::getSiteFlowStatus, siteStepDTO.getStepFlowId());
 
         adwebSiteService.update(siteUpdateWrapper);
         return Result.OK();
@@ -311,12 +321,12 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
 
         } else if (sysAdwebApi.isChannelAdmin()) {
             List<String> channelGroupUids = sysAdwebApi.getChannelGroupUids();
-            List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(channelGroupUids);
+            List<String> codeList =
+                    siteUserPermissionService.getSiteCodeListByUids(channelGroupUids);
             queryWrapper.in(AdwebSite::getCode, codeList);
         } else {
             List<String> codeList = siteUserPermissionService.getSiteCodeList(sysUser.getId());
             queryWrapper.in(AdwebSite::getCode, codeList);
         }
     }
-
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/controller/AdwebSiteManageController.java

@@ -1,13 +1,17 @@
 package org.jeecg.modules.adweb.site.controller;
 
-
 import cn.hutool.core.bean.BeanUtil;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import jakarta.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -48,27 +52,19 @@ import java.util.stream.Collectors;
 @Slf4j
 public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdwebSiteService> {
 
-    @Lazy
-    @Resource
-    private IAdwebSiteService adwebSiteManageService;
+    @Lazy @Resource private IAdwebSiteService adwebSiteManageService;
 
-    @Resource
-    private CommonMapper commonMapper;
+    @Resource private CommonMapper commonMapper;
 
-    @Resource
-    private SiteManageService siteManageService;
+    @Resource private SiteManageService siteManageService;
 
-    @Resource
-    private SysAdwebApi sysAdwebApi;
+    @Resource private SysAdwebApi sysAdwebApi;
 
-    @Resource
-    private ISysUserTenantService sysUserTenantService;
+    @Resource private ISysUserTenantService sysUserTenantService;
 
-    @Resource
-    private ISiteUserPermissionService siteUserPermissionService;
+    @Resource private ISiteUserPermissionService siteUserPermissionService;
 
-    @Resource
-    private Sohoeb2bOrderService sohoeb2bOrderService;
+    @Resource private Sohoeb2bOrderService sohoeb2bOrderService;
 
     /**
      * 查询wordpress站点配置
@@ -83,7 +79,8 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
             return Result.noauth("您没有权限访问该站点");
         }
 
-        WordPressConfig config = this.adwebSiteManageService.queryWordPressConfig(wordPressConfig.getSiteCode());
+        WordPressConfig config =
+                this.adwebSiteManageService.queryWordPressConfig(wordPressConfig.getSiteCode());
         return Result.OK(config);
     }
 
@@ -101,7 +98,8 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
                 queryWrapper.in(SysUserTenant::getTenantId, user.getRelTenantIds());
 
                 // 查询出和登录用户具有相同租户的userID
-                List<SysUserTenant> sysUserTenants = sysUserTenantService.getBaseMapper().selectList(queryWrapper);
+                List<SysUserTenant> sysUserTenants =
+                        sysUserTenantService.getBaseMapper().selectList(queryWrapper);
                 List<String> userIds;
 
                 if (sysUserTenants != null) {
@@ -112,7 +110,10 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
 
                 // 对查出的adwebVIP 用户进行租户过滤, 并将自己加入到返回结果中
                 List<SysUser> filterUserList = new ArrayList<>();
-                filterUserList = userList.stream().filter(sysUser -> userIds.contains(sysUser.getId())).collect(Collectors.toList());
+                filterUserList =
+                        userList.stream()
+                                .filter(sysUser -> userIds.contains(sysUser.getId()))
+                                .collect(Collectors.toList());
                 SysUser currentUser = new SysUser();
                 BeanUtil.copyProperties(user, currentUser);
                 filterUserList.add(currentUser);
@@ -120,18 +121,17 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
                 return Result.ok(filterUserList);
             } else {
                 // 对查出的 adwebVIP 用户进行租户过滤
-                return Result.ok(userList.stream().filter(sysUser -> sysUser.getId().equals(user.getId())).collect(Collectors.toList()));
+                return Result.ok(
+                        userList.stream()
+                                .filter(sysUser -> sysUser.getId().equals(user.getId()))
+                                .collect(Collectors.toList()));
             }
-
         }
 
-
         return Result.OK(userList);
     }
 
-    /**
-     * 获得综合统计信息
-     */
+    /** 获得综合统计信息 */
     @AutoLog(value = "首页仪表盘综合统计信息")
     @GetMapping(value = "/siteBasicInfo")
     public Result<?> getSiteBasicInfo(String siteCode) {
@@ -144,13 +144,14 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
     }
 
     @PostMapping(value = "/setEnquiryEmailListBySiteCode")
-    public Result<?> setEnquiryEmailListBySiteCode(String siteCode, String companyName, @RequestParam List<String> emailList) {
+    public Result<?> setEnquiryEmailListBySiteCode(
+            String siteCode, String companyName, @RequestParam List<String> emailList) {
 
         if (StringUtils.isBlank(siteCode)) {
             return Result.error("参数错误");
         }
 
-        //判断emailList是否存在重复
+        // 判断emailList是否存在重复
         if (emailList.size() != new HashSet<>(emailList).size()) {
             return Result.error("邮箱列表存在重复");
         }
@@ -158,17 +159,27 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
         // 去除邮箱前后空格
         emailList.replaceAll(String::trim);
 
-        int count = (int) adwebSiteManageService.count(new LambdaQueryWrapper<AdwebSite>().eq(AdwebSite::getCode, siteCode));
+        int count =
+                (int)
+                        adwebSiteManageService.count(
+                                new LambdaQueryWrapper<AdwebSite>()
+                                        .eq(AdwebSite::getCode, siteCode));
         if (count == 0) {
             return Result.error("站点不存在");
         }
 
         log.info("设置站点询盘邮箱列表，站点code：{}，邮箱列表：{}", siteCode, emailList);
 
-        boolean update = adwebSiteManageService.update(new LambdaUpdateWrapper<AdwebSite>()
-                .set(AdwebSite::getCompanyName, companyName)
-                .set(AdwebSite::getEnquiryEmailList, CollectionUtils.isEmpty(emailList) ? null : JSON.toJSONString(emailList))
-                .eq(AdwebSite::getCode, siteCode));
+        boolean update =
+                adwebSiteManageService.update(
+                        new LambdaUpdateWrapper<AdwebSite>()
+                                .set(AdwebSite::getCompanyName, companyName)
+                                .set(
+                                        AdwebSite::getEnquiryEmailList,
+                                        CollectionUtils.isEmpty(emailList)
+                                                ? null
+                                                : JSON.toJSONString(emailList))
+                                .eq(AdwebSite::getCode, siteCode));
 
         return update ? Result.OK("设置成功") : Result.error("设置失败");
     }
@@ -182,11 +193,14 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
     @PostMapping(value = "/set/order/url")
     public Result<?> setOrderUrl(@RequestBody Sohoeb2bOrder sohoeb2bOrder) {
 
-        if (StringUtils.isBlank(sohoeb2bOrder.getOrderUrl()) || StringUtils.isBlank(sohoeb2bOrder.getDomainName()) || StringUtils.isBlank(sohoeb2bOrder.getSiteCode())) {
+        if (StringUtils.isBlank(sohoeb2bOrder.getOrderUrl())
+                || StringUtils.isBlank(sohoeb2bOrder.getDomainName())
+                || StringUtils.isBlank(sohoeb2bOrder.getSiteCode())) {
             return Result.error("参数不完整，请重试！");
         }
 
-        String newDomainName = sohoeb2bOrder.getDomainName().replace("http://", "").replace("https://", "");
+        String newDomainName =
+                sohoeb2bOrder.getDomainName().replace("http://", "").replace("https://", "");
         sohoeb2bOrder.setDomainName(newDomainName);
         if (sohoeb2bOrder.getId() != null) {
             sohoeb2bOrderService.update(sohoeb2bOrder);
@@ -212,7 +226,15 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
         Sohoeb2bOrder siteOrderPost = sohoeb2bOrderService.getBySiteCode(siteCode);
         log.info("siteOrderPost:{}", siteOrderPost);
         if (siteOrderPost != null) {
-            resultMap.put("orderUrl", siteOrderPost.getOrderUrl() + "&master=" + (adwebSiteManageService.hasSub(loginUser) ? 1 : 0) + "&username=" + loginUser.getUsername() + "&time=" + DateUtil.getDate().getTime());
+            resultMap.put(
+                    "orderUrl",
+                    siteOrderPost.getOrderUrl()
+                            + "&master="
+                            + (adwebSiteManageService.hasSub(loginUser) ? 1 : 0)
+                            + "&username="
+                            + loginUser.getUsername()
+                            + "&time="
+                            + DateUtil.getDate().getTime());
             resultMap.put("orderInitUrl", siteOrderPost.getOrderUrl());
             resultMap.put("orderID", siteOrderPost.getId());
             return Result.OK(resultMap);
@@ -236,7 +258,8 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
                 return false;
             }
 
-            List<String> codeList = siteUserPermissionService.getSiteCodeListByUids(channelGroupUids);
+            List<String> codeList =
+                    siteUserPermissionService.getSiteCodeListByUids(channelGroupUids);
             if (codeList == null) {
                 return false;
             }
@@ -250,6 +273,5 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
 
             return codeList.contains(code);
         }
-
     }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/controller/WPSiteController.java

@@ -2,7 +2,9 @@ package org.jeecg.modules.adweb.site.controller;
 
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.shiro.SecurityUtils;
@@ -32,29 +34,24 @@ import java.util.List;
 @RequestMapping("/wpWebSite")
 public class WPSiteController {
 
-    @Resource
-    private SelfWebSiteService selfWebSiteService;
+    @Resource private SelfWebSiteService selfWebSiteService;
 
-    @Resource
-    private AdwebRedisUtil adwebRedisUtil;
+    @Resource private AdwebRedisUtil adwebRedisUtil;
 
-    @Resource
-    private SiteManageService siteManageService;
+    @Resource private SiteManageService siteManageService;
 
-    @Resource
-    private DomainService domainService;
+    @Resource private DomainService domainService;
 
-    @Resource
-    private IResourceQuotaService resourceQuotaService;
+    @Resource private IResourceQuotaService resourceQuotaService;
 
     /**
      * 创建站点
      *
      * @param templateId 模板id
-     * @param planId     域名
-     * @param name       站点名称
-     * @param uid        站点所属用户名称
-     * @param request    请求信息
+     * @param planId 域名
+     * @param name 站点名称
+     * @param uid 站点所属用户名称
+     * @param request 请求信息
      * @return 创建的站点信息
      */
     @RequestMapping("addWebsite")
@@ -106,9 +103,9 @@ public class WPSiteController {
      *
      * <p>该方法通过接收服务器ID、域名和站点代码来申请发布一个网站 用户通过该接口提交发布申请，实际的发布操作由后台异步处理
      *
-     * @param request  HttpServletRequest对象，用于获取请求相关信息
+     * @param request HttpServletRequest对象，用于获取请求相关信息
      * @param serverId 服务器ID，标识要发布的服务器
-     * @param domain   域名，标识要发布的网站域名
+     * @param domain 域名，标识要发布的网站域名
      * @param siteCode 站点代码，用于识别和验证要发布的站点
      * @return 返回一个Result对象，包含发布申请的结果信息
      */
@@ -168,15 +165,14 @@ public class WPSiteController {
 
     /**
      * 检查域名是否有效
-     * <p>
-     * 此方法用于验证提交的域名是否符合特定条件它首先检查域名是否与CNAME或IP地址相同，
-     * 然后检查域名是否已被使用接下来，它验证域名是否以http开头，
+     *
+     * <p>此方法用于验证提交的域名是否符合特定条件它首先检查域名是否与CNAME或IP地址相同， 然后检查域名是否已被使用接下来，它验证域名是否以http开头，
      * 最后检查域名是否指向CNAME或IP地址如果所有条件都满足，则域名被视为有效
      *
      * @param request HttpServletRequest对象，用于获取请求信息
-     * @param cname   用户的CNAME
-     * @param ip      用户的IP地址
-     * @param domain  用户提交的域名
+     * @param cname 用户的CNAME
+     * @param ip 用户的IP地址
+     * @param domain 用户提交的域名
      * @return 返回一个Result对象，包含验证结果和相关信息
      */
     @RequestMapping(value = "/check/domain", method = RequestMethod.POST)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/dto/WordPressConfig.java

@@ -6,65 +6,43 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @Description: wordpress 配置信息
- * @Author:
+ * @Description: wordpress 配置信息 @Author:
+ *
  * @date
  */
 @Data
 public class WordPressConfig implements Serializable {
 
-    /**
-     * 站点code
-     */
+    /** 站点code */
     private String siteCode;
 
-    /**
-     * wp站点域名
-     */
+    /** wp站点域名 */
     private String domain;
 
-    /**
-     * 物料模块是否嵌入WordPress，0：否；1：是
-     */
+    /** 物料模块是否嵌入WordPress，0：否；1：是 */
     private Integer wordpressSwitch;
 
-    /**
-     * WordPress登录账户
-     */
+    /** WordPress登录账户 */
     private String wordpressName;
 
-    /**
-     * WordPress登录token
-     */
+    /** WordPress登录token */
     private String wordpressToken;
 
-    /**
-     * WordPress站点状态
-     */
+    /** WordPress站点状态 */
     private Integer status;
 
-    /**
-     * ssoResKey
-     */
+    /** ssoResKey */
     private String ssoResKey;
 
-    /**
-     * wordpress配置
-     */
+    /** wordpress配置 */
     private String wordpressSetting;
 
-    /**
-     * openSetting
-     */
+    /** openSetting */
     private List<String> openSetting;
 
-    /**
-     * productType   WP中产品类型
-     */
+    /** productType WP中产品类型 */
     private String productType;
 
-    /**
-     * 是否按用户划分
-     */
+    /** 是否按用户划分 */
     private Integer userAccount;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/dto/param/SiteOrderPost.java

@@ -9,11 +9,10 @@ import lombok.Data;
 public class SiteOrderPost {
 
     private String id;
-    
+
     private String siteCode;
 
     private String domainName;
 
     private String orderUrl;
-
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/dto/param/SiteStepDTO.java

@@ -7,7 +7,7 @@ import lombok.Data;
  */
 @Data
 public class SiteStepDTO {
-    //站点code，关联站点表
+    // 站点code，关联站点表
     private String siteCode;
 
     // 当前进度ID
@@ -15,5 +15,4 @@ public class SiteStepDTO {
 
     // 当前进度名称
     private String currentStep;
-
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/dto/result/SiteBasicInfo.java

@@ -1,52 +1,33 @@
 package org.jeecg.modules.adweb.site.dto.result;
 
-
 import lombok.Data;
 
-/**
- * 综合统计类
- */
+/** 综合统计类 */
 @Data
 public class SiteBasicInfo {
 
-    /**
-     * 套餐名称
-     */
+    /** 套餐名称 */
     private String planName;
 
-    /**
-     * 创建时间
-     */
+    /** 创建时间 */
     private String createTime;
 
-    /**
-     * 到期时间
-     */
+    /** 到期时间 */
     private String endTime;
 
-    /**
-     * 运行状态
-     */
+    /** 运行状态 */
     private Integer runStatus;
 
-    /**
-     * 交付状态
-     */
+    /** 交付状态 */
     private String deliveryProgress;
 
-    /**
-     * 运行天数
-     */
+    /** 运行天数 */
     private int runDays;
 
-    /**
-     * 赠送天数
-     */
+    /** 赠送天数 */
     private Integer giveDay;
 
-    /**
-     * 补偿天数
-     */
+    /** 补偿天数 */
     private Integer compensateDay;
 
     private int percentage;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/IAdwebSiteService.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.adweb.site.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.adweb.site.dto.WordPressConfig;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
@@ -15,7 +16,6 @@ import java.util.List;
  */
 public interface IAdwebSiteService extends IService<AdwebSite> {
 
-
     /**
      * 查询wordpress站点配置
      *
@@ -63,9 +63,7 @@ public interface IAdwebSiteService extends IService<AdwebSite> {
      */
     List<Integer> getAllSiteIdByUid(String uid);
 
-    /**
-     * 查询全部有效的站点code
-     */
+    /** 查询全部有效的站点code */
     List<String> getAllActiveSiteCodes();
 
     boolean updateSiteFlow(String siteCode);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/IAdwebUserWpsiteService.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.adweb.site.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import org.jeecg.modules.adweb.site.entity.AdwebUserWpsite;
 
 import java.util.List;
@@ -8,7 +9,7 @@ import java.util.List;
 /**
  * @Description: adweb_user_wpsite
  * @Author: jeecg-boot
- * @Date:   2023-08-18
+ * @Date: 2023-08-18
  * @Version: V1.0
  */
 public interface IAdwebUserWpsiteService extends IService<AdwebUserWpsite> {
@@ -16,6 +17,7 @@ public interface IAdwebUserWpsiteService extends IService<AdwebUserWpsite> {
 
     /**
      * 查找相同数据
+     *
      * @param wpUsername
      * @param siteId
      * @return
@@ -26,6 +28,7 @@ public interface IAdwebUserWpsiteService extends IService<AdwebUserWpsite> {
 
     /**
      * 根据站点id获取wp站点用户信息
+     *
      * @param siteId
      * @return
      */

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SelfWebSiteService.java

@@ -1,7 +1,9 @@
 package org.jeecg.modules.adweb.site.service;
 
 import jakarta.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.SymbolConstant;
@@ -34,64 +36,67 @@ import java.util.Date;
 @EnableAsync
 public class SelfWebSiteService {
 
-    @Resource
-    private IAdwebSiteService siteService;
-
-    /**
-     * 远程脚本执行服务类
-     */
-    @Resource
-    private ShellService shellService;
+    @Resource private IAdwebSiteService siteService;
 
+    /** 远程脚本执行服务类 */
+    @Resource private ShellService shellService;
 
-    @Resource
-    private SelfWebSiteServiceCommon selfWebSiteServiceCommon;
+    @Resource private SelfWebSiteServiceCommon selfWebSiteServiceCommon;
 
-    @Resource
-    private WebSocketService webSocketService;
+    @Resource private WebSocketService webSocketService;
 
-    @Resource
-    private IAdwebServerService serverService;
+    @Resource private IAdwebServerService serverService;
 
     @Value("${AdwebSiteConnect.host}")
     private String host;
+
     @Value("${AdwebSiteConnect.port}")
     private int port;
+
     @Value("${AdwebSiteConnect.username}")
     private String username;
+
     @Value("${AdwebSiteConnect.password}")
     private String password;
 
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
 
-    @Resource
-    private FeishuService openFeishuMsgService;
+    @Resource private FeishuService openFeishuMsgService;
 
-    @Resource
-    private ISysExceptionService sysExceptionService;
+    @Resource private ISysExceptionService sysExceptionService;
 
     private String errorMsg = "";
 
     /**
      * 创建站点的方法
      *
-     * @param user          当前登录用户
-     * @param tempId        模板ID
-     * @param uid           用户ID
-     * @param name          站点名称
-     * @param planId        套餐ID
-     * @param sysUser       系统用户
-     * @param giveDay       赠送天数
+     * @param user 当前登录用户
+     * @param tempId 模板ID
+     * @param uid 用户ID
+     * @param name 站点名称
+     * @param planId 套餐ID
+     * @param sysUser 系统用户
+     * @param giveDay 赠送天数
      * @param compensateDay 补偿天数
      */
     @Async
-    public void createSite(LoginUser user, Long tempId, String uid, String name, String planId, LoginUser sysUser, Integer giveDay, Integer compensateDay) {
+    public void createSite(
+            LoginUser user,
+            Long tempId,
+            String uid,
+            String name,
+            String planId,
+            LoginUser sysUser,
+            Integer giveDay,
+            Integer compensateDay) {
         // 创建站点信息，生成code，拼接域名等，并将站点信息写入数据库
 
         AdwebSite adwebSite = null;
         try {
-            adwebSite = selfWebSiteServiceCommon.saveNewSiteInfo(tempId, uid, name, planId, sysUser, giveDay, compensateDay);
+            adwebSite =
+                    selfWebSiteServiceCommon.saveNewSiteInfo(
+                            tempId, uid, name, planId, sysUser, giveDay, compensateDay);
         } catch (Exception e) {
             log.error("新建站点时保存站点信息失败", e);
         }
@@ -99,38 +104,51 @@ public class SelfWebSiteService {
         try {
 
             // 执行临时服务器shell脚本，生成临时站点
-            String cmd = "sh /opt/adweb3/shell/auto-wpsite " + adwebSite.getCode() + " " + adwebSite.getParentCode();
+            String cmd =
+                    "sh /opt/adweb3/shell/auto-wpsite "
+                            + adwebSite.getCode()
+                            + " "
+                            + adwebSite.getParentCode();
 
             AdwebSite finalAdwebSite = adwebSite;
-            shellService.createShareSiteByPwd(cmd, host, port, username, password, new ShellSSH2Util.StdoutListener() {
-                @Override
-                public void stdout(String line) {
-                    log.info("标准 ：{}", line);
-
-                    if (line.startsWith("执行命令成功")) {
-                        log.info("站点创建成功！更新站点状态");
-
-                        // 更新站点流程状态
-                        siteService.updateSiteFlow(finalAdwebSite.getCode());
-
-                        // 临时站点创建成功
-                        finalAdwebSite.setStatus(2);
-                        siteService.updateById(finalAdwebSite);
-
-                        String[] userIds = {user.getId()};
-                        // 给该站点所属的用户发送消息
-                        log.info("发送创建站点通知");
-                        webSocketService.sendMessage(userIds, "站点创建完成通知", "您的站点已经创建成功，请在站点管理中查看该站点详细信息", WebsocketConst.CMD_MANAGE_SITE);
-                    }
-                }
-
-                @Override
-                public void stderr(String line) {
-                    log.info("错误 ：{}", line);
-                    errorMsg += line;
-                }
-            });
-
+            shellService.createShareSiteByPwd(
+                    cmd,
+                    host,
+                    port,
+                    username,
+                    password,
+                    new ShellSSH2Util.StdoutListener() {
+                        @Override
+                        public void stdout(String line) {
+                            log.info("标准 ：{}", line);
+
+                            if (line.startsWith("执行命令成功")) {
+                                log.info("站点创建成功！更新站点状态");
+
+                                // 更新站点流程状态
+                                siteService.updateSiteFlow(finalAdwebSite.getCode());
+
+                                // 临时站点创建成功
+                                finalAdwebSite.setStatus(2);
+                                siteService.updateById(finalAdwebSite);
+
+                                String[] userIds = {user.getId()};
+                                // 给该站点所属的用户发送消息
+                                log.info("发送创建站点通知");
+                                webSocketService.sendMessage(
+                                        userIds,
+                                        "站点创建完成通知",
+                                        "您的站点已经创建成功，请在站点管理中查看该站点详细信息",
+                                        WebsocketConst.CMD_MANAGE_SITE);
+                            }
+                        }
+
+                        @Override
+                        public void stderr(String line) {
+                            log.info("错误 ：{}", line);
+                            errorMsg += line;
+                        }
+                    });
 
             if (StringUtils.isNotBlank(errorMsg)) {
                 createSiteFailed(adwebSite, errorMsg, 4);
@@ -143,11 +161,10 @@ public class SelfWebSiteService {
 
     /**
      * 删除指定的广告网站
-     * <p>
-     * 此方法通过执行远程服务器上的Shell脚本来删除广告网站资源，并在删除成功后通知用户
-     * 如果删除失败，会记录错误信息并抛出异常
      *
-     * @param user      当前操作的用户，用于发送通知
+     * <p>此方法通过执行远程服务器上的Shell脚本来删除广告网站资源，并在删除成功后通知用户 如果删除失败，会记录错误信息并抛出异常
+     *
+     * @param user 当前操作的用户，用于发送通知
      * @param adwebSite 要删除的广告网站对象，包含网站代码和域名等信息
      */
     @Async
@@ -158,28 +175,37 @@ public class SelfWebSiteService {
             String cmd = "sh /opt/adweb3/shell/remove-and-bak-wpsite.sh " + adwebSite.getCode();
 
             AdwebSite finalAdwebSite = adwebSite;
-            shellService.createShareSiteByPwd(cmd, host, port, username, password, new ShellSSH2Util.StdoutListener() {
-                @Override
-                public void stdout(String line) {
-                    log.info("标准 ：{}", line);
-
-                    if (line.startsWith("执行命令成功")) {
-                        log.info("站点资源删除成功！");
-
-                        String[] userIds = {user.getId()};
-                        // 给该站点所属的用户发送消息
-                        log.info("发送删除站点资源通知");
-                        webSocketService.sendMessage(userIds, "站点删除通知", "站点资源" + finalAdwebSite.getDomain() + "已经从系统删除！", WebsocketConst.CMD_MANAGE_SITE);
-                    }
-                }
-
-                @Override
-                public void stderr(String line) {
-                    log.info("错误 ：{}", line);
-                    errorMsg += line;
-                }
-            });
-
+            shellService.createShareSiteByPwd(
+                    cmd,
+                    host,
+                    port,
+                    username,
+                    password,
+                    new ShellSSH2Util.StdoutListener() {
+                        @Override
+                        public void stdout(String line) {
+                            log.info("标准 ：{}", line);
+
+                            if (line.startsWith("执行命令成功")) {
+                                log.info("站点资源删除成功！");
+
+                                String[] userIds = {user.getId()};
+                                // 给该站点所属的用户发送消息
+                                log.info("发送删除站点资源通知");
+                                webSocketService.sendMessage(
+                                        userIds,
+                                        "站点删除通知",
+                                        "站点资源" + finalAdwebSite.getDomain() + "已经从系统删除！",
+                                        WebsocketConst.CMD_MANAGE_SITE);
+                            }
+                        }
+
+                        @Override
+                        public void stderr(String line) {
+                            log.info("错误 ：{}", line);
+                            errorMsg += line;
+                        }
+                    });
 
             if (StringUtils.isNotBlank(errorMsg)) {
                 exceShellFailed("删除站点资源", adwebSite, errorMsg);
@@ -193,27 +219,29 @@ public class SelfWebSiteService {
     /**
      * 当执行Shell命令失败时调用此方法记录错误信息
      *
-     * @param cmd       执行的Shell命令，用于标识操作
+     * @param cmd 执行的Shell命令，用于标识操作
      * @param adwebSite 发生错误的广告网站实例，包含站点信息
-     * @param errorMsg  错误信息描述，详细说明执行失败的原因
+     * @param errorMsg 错误信息描述，详细说明执行失败的原因
      */
     private void exceShellFailed(String cmd, AdwebSite adwebSite, String errorMsg) {
         SysException sysException = new SysException();
 
         sysException.setType(1);
         sysException.setFunctionModule(cmd);
-        sysException.setExceptionDetail(String.format("站点code:%s, 站点名称：%s，临时连接：%s", adwebSite.getCode(), adwebSite.getName(), adwebSite.getDomain()));
+        sysException.setExceptionDetail(
+                String.format(
+                        "站点code:%s, 站点名称：%s，临时连接：%s",
+                        adwebSite.getCode(), adwebSite.getName(), adwebSite.getDomain()));
         sysException.setExceptionDescription(errorMsg);
 
         sysExceptionService.save(sysException);
     }
 
     /**
-     * 处理临时站点创建失败的逻辑
-     * 当临时站点创建失败时，此方法会被调用，更新站点状态并记录错误信息
+     * 处理临时站点创建失败的逻辑 当临时站点创建失败时，此方法会被调用，更新站点状态并记录错误信息
      *
      * @param adwebSite 代表临时站点的对象，包含站点的相关信息
-     * @param errorMsg  描述创建失败的错误信息
+     * @param errorMsg 描述创建失败的错误信息
      */
     private void createSiteFailed(AdwebSite adwebSite, String errorMsg, int status) {
         adwebSite.setStatus(status); // 临时站点创建失败 或者正式站点创建失败
@@ -223,19 +251,21 @@ public class SelfWebSiteService {
 
         sysException.setType(1); // 业务错误
         sysException.setFunctionModule("拉取站点错误");
-        sysException.setExceptionDetail(String.format("站点code:%s, 站点名称：%s，临时连接：%s", adwebSite.getCode(), adwebSite.getName(), adwebSite.getDomain()));
+        sysException.setExceptionDetail(
+                String.format(
+                        "站点code:%s, 站点名称：%s，临时连接：%s",
+                        adwebSite.getCode(), adwebSite.getName(), adwebSite.getDomain()));
         sysException.setExceptionDescription(errorMsg);
 
         sysExceptionService.save(sysException);
     }
 
-
     /**
      * 发布站点到生产环境
      *
-     * @param user     当前登录用户
+     * @param user 当前登录用户
      * @param serverId 服务器ID，未在方法体内使用
-     * @param domain   域名，用于站点发布
+     * @param domain 域名，用于站点发布
      * @param siteCode 站点代码，标识特定的站点
      */
     @Async
@@ -253,30 +283,53 @@ public class SelfWebSiteService {
 
         String serverShellPath = "/opt/adweb3/shell";
 
-        //原始域名
+        // 原始域名
         String originDomain = domain;
-        //检验域名是否以www开头
+        // 检验域名是否以www开头
         if (domain.startsWith("www.")) {
             domain = domain.replace("www.", "");
         }
         String dbName = domain.replaceAll("[^a-zA-Z0-9]", "") + "_" + adwebSite.getCode();
 
-        log.info("===== releaseSite domain:{}, siteCode:{},originDomain:{},domain:{},dbName:{} ====", domain, siteCode, originDomain, domain, dbName);
-
-        String cmd = "sudo sh " + serverShellPath + "/publish_wp_site.sh " + adwebSite.getCode() + " " + domain + " " + dbName;
-
-        log.info("===== releaseSite originDomain:{},domain:{},siteCode:{},cmd:{} ====", originDomain, domain, siteCode, cmd);
+        log.info(
+                "===== releaseSite domain:{}, siteCode:{},originDomain:{},domain:{},dbName:{} ====",
+                domain,
+                siteCode,
+                originDomain,
+                domain,
+                dbName);
+
+        String cmd =
+                "sudo sh "
+                        + serverShellPath
+                        + "/publish_wp_site.sh "
+                        + adwebSite.getCode()
+                        + " "
+                        + domain
+                        + " "
+                        + dbName;
+
+        log.info(
+                "===== releaseSite originDomain:{},domain:{},siteCode:{},cmd:{} ====",
+                originDomain,
+                domain,
+                siteCode,
+                cmd);
 
         try {
             if (StringUtils.isBlank(adwebServer.getServerPem())) {
                 String[] userIds = {user.getId()};
                 // 给该站点所属的用户发送消息
                 log.info("生产服务器：{}，未配置连接秘钥", adwebServer.getServerName());
-                webSocketService.sendMessage(userIds, "站点发布失败通知", "该站点发布失败，请联系管理员配置服务器连接秘钥", WebsocketConst.CMD_MANAGE_SITE);
+                webSocketService.sendMessage(
+                        userIds,
+                        "站点发布失败通知",
+                        "该站点发布失败，请联系管理员配置服务器连接秘钥",
+                        WebsocketConst.CMD_MANAGE_SITE);
                 return;
             }
 
-            adwebSite.setStatus(5); //正式站点正在创建
+            adwebSite.setStatus(5); // 正式站点正在创建
             siteService.updateById(adwebSite);
 
             String pemPath = adwebServer.getServerPem().replace("..", "").replace("../", "");
@@ -287,28 +340,40 @@ public class SelfWebSiteService {
             String filePath = uploadpath + File.separator + pemPath;
             adwebServer.setServerPem(filePath); // 设置秘钥绝对路径
 
-            shellService.exceShell(cmd, new ShellSSH2Util.StdoutListener() {
-                @Override
-                public void stdout(String line) {
-                    log.info("标准 ：{}", line);
-
-                    if ("[Creation completed]".equals(line)) {
-                        log.info("======网站上线成功======");
-                        statusSuccess.append("ok");
-                    }
-                }
-
-                @Override
-                public void stderr(String line) {
-                    log.info("错误 ：{}", line);
-                    statusFail.append(line);
-                }
-            }, adwebServer);
-
-
-            //正式域名
-            log.info("===== releaseSite originDomain:{},domain:{},siteCode:{},statusSuccess:{} ====", originDomain, domain, siteCode, statusSuccess);
-            log.info("===== releaseSite originDomain:{},domain:{},siteCode:{},statusFail:{} ====", originDomain, domain, siteCode, statusFail);
+            shellService.exceShell(
+                    cmd,
+                    new ShellSSH2Util.StdoutListener() {
+                        @Override
+                        public void stdout(String line) {
+                            log.info("标准 ：{}", line);
+
+                            if ("[Creation completed]".equals(line)) {
+                                log.info("======网站上线成功======");
+                                statusSuccess.append("ok");
+                            }
+                        }
+
+                        @Override
+                        public void stderr(String line) {
+                            log.info("错误 ：{}", line);
+                            statusFail.append(line);
+                        }
+                    },
+                    adwebServer);
+
+            // 正式域名
+            log.info(
+                    "===== releaseSite originDomain:{},domain:{},siteCode:{},statusSuccess:{} ====",
+                    originDomain,
+                    domain,
+                    siteCode,
+                    statusSuccess);
+            log.info(
+                    "===== releaseSite originDomain:{},domain:{},siteCode:{},statusFail:{} ====",
+                    originDomain,
+                    domain,
+                    siteCode,
+                    statusFail);
             if (StringUtils.isNotEmpty(statusFail.toString())) {
                 String title = "网站域名：" + originDomain + " 站点发布失败";
                 String message = "**站点CODE:** " + siteCode + "\n";
@@ -330,23 +395,25 @@ public class SelfWebSiteService {
                 String[] userIds = {user.getId()};
                 // 给该站点所属的用户发送消息
                 log.info("发布站点成功通知");
-                webSocketService.sendMessage(userIds, "站点发布完成通知", "您的站点已经发布成功，请在站点管理中查看该站点详细信息", WebsocketConst.CMD_MANAGE_SITE);
+                webSocketService.sendMessage(
+                        userIds,
+                        "站点发布完成通知",
+                        "您的站点已经发布成功，请在站点管理中查看该站点详细信息",
+                        WebsocketConst.CMD_MANAGE_SITE);
 
                 // 创建站点完成-操作
                 adwebSite.setDomain(originDomain);
                 adwebSite.setIsDomain(1);
-                //添加发布时间
+                // 添加发布时间
                 adwebSite.setIssueTime(new Date());
-                //发布成功后修改状态为发布成功状态 ：1
+                // 发布成功后修改状态为发布成功状态 ：1
                 adwebSite.setStatus(1);
                 adwebSite.setProdServerIp(adwebServer.getServerIp());
                 siteService.updateById(adwebSite);
-
             }
         } catch (Exception e) {
             log.error("站点发布失败，退出执行；{}", e.getMessage(), e);
             createSiteFailed(adwebSite, e.getMessage(), 6);
-
         }
     }
 
@@ -362,57 +429,69 @@ public class SelfWebSiteService {
         StringBuilder delFail = new StringBuilder();
         AdwebSite adwebSite = siteService.getById(siteId);
         String usWest118ServerShellPath = "/home/ci-user/shell";
-        //检验域名是否以www开头
+        // 检验域名是否以www开头
         if (domain.startsWith("www.")) {
             domain = domain.replace("www.", "");
         }
         // 删除已发布的站点，重新发布
         if (adwebSite.getStatus() == 5) {
-            String cmd = "sudo sh " + usWest118ServerShellPath + "/adweb-remove_prod_site.sh " + domain;
-            log.info("===== delReleaseWebsite domain:{},siteId:{},cmd:{} ====", domain, siteId, cmd);
+            String cmd =
+                    "sudo sh " + usWest118ServerShellPath + "/adweb-remove_prod_site.sh " + domain;
+            log.info(
+                    "===== delReleaseWebsite domain:{},siteId:{},cmd:{} ====", domain, siteId, cmd);
             try {
                 String finalDomain = domain;
-//                shellService.exceShellByUsWest118(cmd, new ShellSSH2Util.StdoutListener() {
-//                    @Override
-//                    public void stdout(String line) {
-//                        log.info("标准 ：" + line);
-//                        if ("remove site success".equals(line) || "remove site nginx success".equals(line)) {
-//                            log.info("======执行删除旧站点，成功通知======");
-//                            String title = "网站域名：" + finalDomain + " 删除发布失败的旧站点成功";
-//                            String message = "**站点ID:** " + siteId + "\n";
-//                            message += "**临时域名:** " + adwebSite.getDomainDev() + "\n";
-//                            message += "**服务器IP:** " + adwebSite.getDevServerIp() + "\n";
-//                            sendAdWebV3FeiShuMsg(title, message);
-//
-//                            delSuccess.append(line);
-//                        }
-//
-//                        if ("remove site failed".equals(line) || "remove site nginx failed".equals(line)) {
-//                            log.info("======执行删除旧站点，失败通知======");
-//                            String title = "网站域名：" + finalDomain + " 删除发布失败的旧站点失败";
-//                            String message = "**站点ID:** " + siteId + "\n";
-//                            message += "**临时域名:** " + adwebSite.getDomainDev() + "\n";
-//                            message += "**服务器IP:** " + adwebSite.getDevServerIp() + "\n";
-//                            message += "**错误信息:** " + line + "\n";
-//                            sendAdWebV3FeiShuMsg(title, message);
-//
-//                            delFail.append(line);
-//                        }
-//                    }
-//
-//                    @Override
-//                    public void stderr(String line) {
-//                        log.info("错误 ：" + line);
-//                        String title = "网站域名：" + finalDomain + " 删除发布失败的旧站点失败";
-//                        String message = "**站点ID:** " + siteId + "\n";
-//                        message += "**临时域名:** " + adwebSite.getDomainDev() + "\n";
-//                        message += "**服务器IP:** " + adwebSite.getDevServerIp() + "\n";
-//                        message += "**错误信息:** " + line + "\n";
-//                        sendAdWebV3FeiShuMsg(title, message);
-//
-//                        delFail.append(line);
-//                    }
-//                });
+                //                shellService.exceShellByUsWest118(cmd, new
+                // ShellSSH2Util.StdoutListener() {
+                //                    @Override
+                //                    public void stdout(String line) {
+                //                        log.info("标准 ：" + line);
+                //                        if ("remove site success".equals(line) || "remove site
+                // nginx success".equals(line)) {
+                //                            log.info("======执行删除旧站点，成功通知======");
+                //                            String title = "网站域名：" + finalDomain + "
+                // 删除发布失败的旧站点成功";
+                //                            String message = "**站点ID:** " + siteId + "\n";
+                //                            message += "**临时域名:** " + adwebSite.getDomainDev() +
+                // "\n";
+                //                            message += "**服务器IP:** " + adwebSite.getDevServerIp()
+                // + "\n";
+                //                            sendAdWebV3FeiShuMsg(title, message);
+                //
+                //                            delSuccess.append(line);
+                //                        }
+                //
+                //                        if ("remove site failed".equals(line) || "remove site
+                // nginx failed".equals(line)) {
+                //                            log.info("======执行删除旧站点，失败通知======");
+                //                            String title = "网站域名：" + finalDomain + "
+                // 删除发布失败的旧站点失败";
+                //                            String message = "**站点ID:** " + siteId + "\n";
+                //                            message += "**临时域名:** " + adwebSite.getDomainDev() +
+                // "\n";
+                //                            message += "**服务器IP:** " + adwebSite.getDevServerIp()
+                // + "\n";
+                //                            message += "**错误信息:** " + line + "\n";
+                //                            sendAdWebV3FeiShuMsg(title, message);
+                //
+                //                            delFail.append(line);
+                //                        }
+                //                    }
+                //
+                //                    @Override
+                //                    public void stderr(String line) {
+                //                        log.info("错误 ：" + line);
+                //                        String title = "网站域名：" + finalDomain + " 删除发布失败的旧站点失败";
+                //                        String message = "**站点ID:** " + siteId + "\n";
+                //                        message += "**临时域名:** " + adwebSite.getDomainDev() + "\n";
+                //                        message += "**服务器IP:** " + adwebSite.getDevServerIp() +
+                // "\n";
+                //                        message += "**错误信息:** " + line + "\n";
+                //                        sendAdWebV3FeiShuMsg(title, message);
+                //
+                //                        delFail.append(line);
+                //                    }
+                //                });
             } catch (Exception e) {
                 log.error("删除发布失败的旧站点失败，退出执行；" + e.getMessage(), e);
                 delFail.append(e.getMessage());
@@ -428,7 +507,6 @@ public class SelfWebSiteService {
         }
     }
 
-
     /**
      * 站点启动/停止
      *
@@ -468,23 +546,29 @@ public class SelfWebSiteService {
      * @return
      */
     private boolean startSiteLocal(LoginUser sysUser, AdwebSite adwebSite) {
-        //站点启动
+        // 站点启动
         String cmd = "/home/ci-user/shell/start_site " + adwebSite.getCode() + " ";
-        shellService.exceShellByPwd(cmd, host, port, username, password, new ShellSSH2Util.StdoutListener() {
-            @Override
-            public void stdout(String line) {
-                log.info("标准 ：" + line);
-                if ("ERROR:FILE_NAME IS EXISTS".equals(line)) {
-                    // TODO ----
-                    log.error("恢复测试站点异常：" + line);
-                }
-            }
+        shellService.exceShellByPwd(
+                cmd,
+                host,
+                port,
+                username,
+                password,
+                new ShellSSH2Util.StdoutListener() {
+                    @Override
+                    public void stdout(String line) {
+                        log.info("标准 ：" + line);
+                        if ("ERROR:FILE_NAME IS EXISTS".equals(line)) {
+                            // TODO ----
+                            log.error("恢复测试站点异常：" + line);
+                        }
+                    }
 
-            @Override
-            public void stderr(String line) {
-                log.info("错误 ：" + line);
-            }
-        });
+                    @Override
+                    public void stderr(String line) {
+                        log.info("错误 ：" + line);
+                    }
+                });
         return siteStatusUpdate(sysUser, adwebSite, 0);
     }
 
@@ -497,21 +581,27 @@ public class SelfWebSiteService {
      */
     private boolean stopSiteLocal(LoginUser sysUser, AdwebSite adwebSite) {
         String cmd = "/home/ci-user/shell/stop_site " + adwebSite.getCode() + " ";
-        shellService.exceShellByPwd(cmd, host, port, username, password, new ShellSSH2Util.StdoutListener() {
-            @Override
-            public void stdout(String line) {
-                log.info("标准 ：" + line);
-                if ("ERROR:FILE_NAME IS EXISTS".equals(line)) {
-                    // TODO ----
-                    log.error("停止测试站点异常：" + line);
-                }
-            }
+        shellService.exceShellByPwd(
+                cmd,
+                host,
+                port,
+                username,
+                password,
+                new ShellSSH2Util.StdoutListener() {
+                    @Override
+                    public void stdout(String line) {
+                        log.info("标准 ：" + line);
+                        if ("ERROR:FILE_NAME IS EXISTS".equals(line)) {
+                            // TODO ----
+                            log.error("停止测试站点异常：" + line);
+                        }
+                    }
 
-            @Override
-            public void stderr(String line) {
-                log.info("错误 ：" + line);
-            }
-        });
+                    @Override
+                    public void stderr(String line) {
+                        log.info("错误 ：" + line);
+                    }
+                });
         return siteStatusUpdate(sysUser, adwebSite, 3);
     }
 
@@ -523,23 +613,27 @@ public class SelfWebSiteService {
      * @return
      */
     private boolean startSite(LoginUser sysUser, AdwebSite adwebSite, AdwebServer serverInfo) {
-        //站点启动
-        String cmd = "./shell/start_site " + serverInfo.getServerIp() + " " + adwebSite.getCode() + " ";
-        shellService.exceShell(cmd, new ShellSSH2Util.StdoutListener() {
-            @Override
-            public void stdout(String line) {
-                log.info("MJJ控制台 ：" + line);
-                if ("ERROR:FILE_NAME IS EXISTS".equals(line)) {
-                    // TODO ----
-                    log.error("恢复站点异常：" + line);
-                }
-            }
+        // 站点启动
+        String cmd =
+                "./shell/start_site " + serverInfo.getServerIp() + " " + adwebSite.getCode() + " ";
+        shellService.exceShell(
+                cmd,
+                new ShellSSH2Util.StdoutListener() {
+                    @Override
+                    public void stdout(String line) {
+                        log.info("MJJ控制台 ：" + line);
+                        if ("ERROR:FILE_NAME IS EXISTS".equals(line)) {
+                            // TODO ----
+                            log.error("恢复站点异常：" + line);
+                        }
+                    }
 
-            @Override
-            public void stderr(String line) {
-                log.info("错误 ：" + line);
-            }
-        }, serverInfo);
+                    @Override
+                    public void stderr(String line) {
+                        log.info("错误 ：" + line);
+                    }
+                },
+                serverInfo);
         return siteStatusUpdate(sysUser, adwebSite, 0);
     }
 
@@ -551,26 +645,29 @@ public class SelfWebSiteService {
      * @return
      */
     private boolean stopSite(LoginUser sysUser, AdwebSite adwebSite, AdwebServer serverInfo) {
-        String cmd = "./shell/stop_site " + serverInfo.getServerIp() + " " + adwebSite.getCode() + " ";
-        shellService.exceShell(cmd, new ShellSSH2Util.StdoutListener() {
-            @Override
-            public void stdout(String line) {
-                log.info("MJJ控制台 ：" + line);
-                if ("ERROR:FILE_NAME IS EXISTS".equals(line)) {
-                    // TODO ----
-                    log.error("停止站点异常：" + line);
-                }
-            }
+        String cmd =
+                "./shell/stop_site " + serverInfo.getServerIp() + " " + adwebSite.getCode() + " ";
+        shellService.exceShell(
+                cmd,
+                new ShellSSH2Util.StdoutListener() {
+                    @Override
+                    public void stdout(String line) {
+                        log.info("MJJ控制台 ：" + line);
+                        if ("ERROR:FILE_NAME IS EXISTS".equals(line)) {
+                            // TODO ----
+                            log.error("停止站点异常：" + line);
+                        }
+                    }
 
-            @Override
-            public void stderr(String line) {
-                log.info("错误 ：" + line);
-            }
-        }, serverInfo);
+                    @Override
+                    public void stderr(String line) {
+                        log.info("错误 ：" + line);
+                    }
+                },
+                serverInfo);
         return siteStatusUpdate(sysUser, adwebSite, 3);
     }
 
-
     /**
      * 站点状态更改
      *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SelfWebSiteServiceCommon.java

@@ -34,37 +34,34 @@ public class SelfWebSiteServiceCommon {
     @Value("${AdwebSiteConnect.tempDomain}")
     private String tempDomain;
 
-
     @Value("${serverIp.test}")
     private String newServerIp;
 
-    @Resource
-    private ISiteUserPermissionService siteUserPermissionService;
-
+    @Resource private ISiteUserPermissionService siteUserPermissionService;
 
-    @Resource
-    private IAdwebSiteService adwebSiteService;
+    @Resource private IAdwebSiteService adwebSiteService;
 
-    @Resource
-    private SiteManageService siteManageService;
+    @Resource private SiteManageService siteManageService;
 
-    @Resource
-    private IAdwebSiteService siteService;
+    @Resource private IAdwebSiteService siteService;
 
-    @Resource
-    private IAdwebThemeService adwebThemeService;
+    @Resource private IAdwebThemeService adwebThemeService;
 
-    @Resource
-    private ISeoPlanSubscriptionService seoPlanSubscriptionService;
+    @Resource private ISeoPlanSubscriptionService seoPlanSubscriptionService;
 
-    @Resource
-    private ISubscribePlanService subscribePlanService;
+    @Resource private ISubscribePlanService subscribePlanService;
 
-    @Resource
-    private ISysUserTenantService relationService;
+    @Resource private ISysUserTenantService relationService;
 
     @Transactional
-    public AdwebSite saveNewSiteInfo(Long tempId, String uid, String name, String planId, LoginUser sysUser, Integer giveDay, Integer compensateDay) {
+    public AdwebSite saveNewSiteInfo(
+            Long tempId,
+            String uid,
+            String name,
+            String planId,
+            LoginUser sysUser,
+            Integer giveDay,
+            Integer compensateDay) {
         AdwebTheme adwebTheme = adwebThemeService.getById(tempId);
         if (adwebTheme == null) {
             log.error("未查询到模板数据退出执行，模板ID={}", tempId);
@@ -73,13 +70,13 @@ public class SelfWebSiteServiceCommon {
         // 站点CODE
         String siteCode = siteManageService.getSiteCode(null); // 自动生成临时站点code
         String domain = siteCode + "." + tempDomain;
-        //站点对象
+        // 站点对象
         AdwebSite adwebSite = new AdwebSite();
         // 有效期  默认当前时间加1年
         Date endTime = DateUtil.addYear(DateUtil.getDate(), 1);
 
         adwebSite.setUid(uid);
-        //站点名称改为创建站点时必填字段
+        // 站点名称改为创建站点时必填字段
 
         adwebSite.setEtime(endTime);
 
@@ -88,10 +85,10 @@ public class SelfWebSiteServiceCommon {
         adwebSite.setTemplateDomain(adwebTheme.getDomain());
         adwebSite.setCreateType("wp");
         adwebSite.setName(name);
-        //域名
+        // 域名
         adwebSite.setDomain("https://" + domain);
         adwebSite.setDomainDev(domain);
-        //站点code，此处保存
+        // 站点code，此处保存
         adwebSite.setCode(siteCode);
         adwebSite.setInCode(adwebTheme.getCode());
         adwebSite.setIsDomain(0);
@@ -101,20 +98,22 @@ public class SelfWebSiteServiceCommon {
         adwebSite.setDevServerIp(newServerIp);
         adwebSite.setEnquirySendEmailType("ALL");
 
-        //wordpress 嵌入站默认配置
-        adwebSite.setWordpressSetting("{\"userAccount\":2,\"open\":\"\",\"productType\":\"adwebpro\",\"setting\":\"all\"}");
+        // wordpress 嵌入站默认配置
+        adwebSite.setWordpressSetting(
+                "{\"userAccount\":2,\"open\":\"\",\"productType\":\"adwebpro\",\"setting\":\"all\"}");
         adwebSite.setWordpressName("adweb-user");
 
-        //设置seo_job_status默认值为1（可见）
+        // 设置seo_job_status默认值为1（可见）
         adwebSite.setSeoJobStatus(1);
 
-        //租户状态，用户id,租户用户关系状态
-        //查询用户的租户ids
+        // 租户状态，用户id,租户用户关系状态
+        // 查询用户的租户ids
         List<String> tenantStatus = new ArrayList<>();
         tenantStatus.add("1");
 
         try {
-            List<SysUserTenantVo> sysTenant = relationService.getTenantListByUserId(uid, tenantStatus);
+            List<SysUserTenantVo> sysTenant =
+                    relationService.getTenantListByUserId(uid, tenantStatus);
             if (sysTenant != null && !sysTenant.isEmpty()) {
                 // 渠道商信息入库
                 SysUserTenantVo firstTenant = sysTenant.get(0);
@@ -165,13 +164,12 @@ public class SelfWebSiteServiceCommon {
         List<AdwebSite> list = adwebSiteService.list(queryWrapper);
         if (CollectionUtils.isNotEmpty(list)) {
             siteName = list.get(0).getName();
-            siteUserPermissionService.insertSiteUserPermission(adwebSite.getUid(), adwebSite.getCode(), siteName);
+            siteUserPermissionService.insertSiteUserPermission(
+                    adwebSite.getUid(), adwebSite.getCode(), siteName);
         } else {
             log.error("更新站点权限失败，该站点不存在，站点code为 {}", siteCode);
         }
 
-
         return adwebSite;
     }
-
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SiteManageService.java

@@ -1,9 +1,13 @@
 package org.jeecg.modules.adweb.site.service;
 
 import cn.hutool.core.util.RandomUtil;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
 import jakarta.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.adweb.common.util.DateUtil;
 import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
@@ -20,27 +24,20 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-/**
- * 站点管理服务类
- */
+/** 站点管理服务类 */
 @Slf4j
 @Service
 public class SiteManageService {
 
     protected Logger logger = LoggerFactory.getLogger(SiteManageService.class);
 
-    @Resource
-    private AdwebSiteMapper adwebSiteMapper;
+    @Resource private AdwebSiteMapper adwebSiteMapper;
 
-    @Resource
-    private IAdwebSiteService adwebSiteService;
+    @Resource private IAdwebSiteService adwebSiteService;
 
-    @Resource
-    private ISeoPlanSubscriptionService seoPlanSubscriptionService;
-
-    @Resource
-    private SysDictMapper sysDictMapper;
+    @Resource private ISeoPlanSubscriptionService seoPlanSubscriptionService;
 
+    @Resource private SysDictMapper sysDictMapper;
 
     public String getSiteCode(String siteCode) {
         if (StringUtils.isEmpty(siteCode)) {
@@ -66,7 +63,9 @@ public class SiteManageService {
     public SiteBasicInfo getSiteBasicInfo(String userFlag) {
         SiteBasicInfo siteBasicInfo = new SiteBasicInfo();
 
-        AdwebSite adwebSite = adwebSiteService.getOne(new LambdaQueryWrapper<AdwebSite>().eq(AdwebSite::getCode, userFlag));
+        AdwebSite adwebSite =
+                adwebSiteService.getOne(
+                        new LambdaQueryWrapper<AdwebSite>().eq(AdwebSite::getCode, userFlag));
         if (adwebSite == null) {
             return siteBasicInfo;
         }
@@ -93,18 +92,20 @@ public class SiteManageService {
             siteStatus++;
         }
 
-
         siteBasicInfo.setSiteStatus(siteStatus);
         siteBasicInfo.setPercentage(siteStatus * 100 / 6);
 
         // 获取绑定的套餐信息
-        SeoPlanSubscription history = seoPlanSubscriptionService.getCurrentSeoAndSiteSubscription(adwebSite.getId());
+        SeoPlanSubscription history =
+                seoPlanSubscriptionService.getCurrentSeoAndSiteSubscription(adwebSite.getId());
         String defaultPlanName = sysDictMapper.getDefaultPlanName();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
         // 绑定时间(提单时间)
         // 如果没有绑定套餐或绑定的为默认建站套餐
-        if (history == null || (StringUtils.isNotEmpty(defaultPlanName) && defaultPlanName.equals(history.getPlanName()))) {
+        if (history == null
+                || (StringUtils.isNotEmpty(defaultPlanName)
+                        && defaultPlanName.equals(history.getPlanName()))) {
             siteBasicInfo.setCreateTime(dateFormat.format(adwebSite.getCreateTime()));
         } else {
             siteBasicInfo.setCreateTime(dateFormat.format(history.getCreateTime()));
@@ -130,11 +131,21 @@ public class SiteManageService {
                 int giveDay = history.getGiveDay();
                 int compensateDay = history.getCompensateDay();
                 int totalGiveAndCompensateDay = giveDay + compensateDay;
-                log.info("getSiteBasicInfo -- historyId:{},giveDay:{},compensateDay:{},totalGiveAndCompensateDay:{}", history.getId(), giveDay, compensateDay, totalGiveAndCompensateDay);
+                log.info(
+                        "getSiteBasicInfo -- historyId:{},giveDay:{},compensateDay:{},totalGiveAndCompensateDay:{}",
+                        history.getId(),
+                        giveDay,
+                        compensateDay,
+                        totalGiveAndCompensateDay);
                 Date serveEndTime = DateUtil.addDays(now, remainServerDays);
-                log.info("getSiteBasicInfo -- 原来的serverEndTime:{}", DateUtil.formatDate(serveEndTime, DateUtil.DATE_FORMAT));
+                log.info(
+                        "getSiteBasicInfo -- 原来的serverEndTime:{}",
+                        DateUtil.formatDate(serveEndTime, DateUtil.DATE_FORMAT));
                 serveEndTime = DateUtil.addDays(serveEndTime, totalGiveAndCompensateDay);
-                log.info("getSiteBasicInfo -- 增加赠、补天数:{},增加赠送天数、补偿天数后的serverEndTime:{}", totalGiveAndCompensateDay, DateUtil.formatDate(serveEndTime, DateUtil.DATE_FORMAT));
+                log.info(
+                        "getSiteBasicInfo -- 增加赠、补天数:{},增加赠送天数、补偿天数后的serverEndTime:{}",
+                        totalGiveAndCompensateDay,
+                        DateUtil.formatDate(serveEndTime, DateUtil.DATE_FORMAT));
                 siteBasicInfo.setEndTime(dateFormat.format(serveEndTime));
             } else {
                 siteBasicInfo.setEndTime("服务已到期");
@@ -144,10 +155,20 @@ public class SiteManageService {
             int giveDay = history.getGiveDay();
             int compensateDay = history.getCompensateDay();
             int totalGiveAndCompensateDay = giveDay + compensateDay;
-            log.info("getSiteBasicInfo -- historyId:{},giveDay:{},compensateDay:{},totalGiveAndCompensateDay:{}", history.getId(), giveDay, compensateDay, totalGiveAndCompensateDay);
-            log.info("getSiteBasicInfo -- 原来的serverEndTime:{}", DateUtil.formatDate(serveEndTime, DateUtil.DATE_FORMAT));
+            log.info(
+                    "getSiteBasicInfo -- historyId:{},giveDay:{},compensateDay:{},totalGiveAndCompensateDay:{}",
+                    history.getId(),
+                    giveDay,
+                    compensateDay,
+                    totalGiveAndCompensateDay);
+            log.info(
+                    "getSiteBasicInfo -- 原来的serverEndTime:{}",
+                    DateUtil.formatDate(serveEndTime, DateUtil.DATE_FORMAT));
             serveEndTime = DateUtil.addDays(serveEndTime, totalGiveAndCompensateDay);
-            log.info("getSiteBasicInfo -- 增加赠、补天数:{},赠送天数、补偿天数后的serverEndTime:{}", totalGiveAndCompensateDay, DateUtil.formatDate(serveEndTime, DateUtil.DATE_FORMAT));
+            log.info(
+                    "getSiteBasicInfo -- 增加赠、补天数:{},赠送天数、补偿天数后的serverEndTime:{}",
+                    totalGiveAndCompensateDay,
+                    DateUtil.formatDate(serveEndTime, DateUtil.DATE_FORMAT));
             boolean isExpire = serveEndTime.compareTo(new Date()) <= 0;
             if (isExpire) {
                 siteBasicInfo.setEndTime("服务已到期");
@@ -163,10 +184,9 @@ public class SiteManageService {
      * 获取站点剩下的服务天数
      *
      * @param serverMonth 套餐的服务天数
-     * @param siteCode    站点的code
+     * @param siteCode 站点的code
      * @return
      */
-
     public int getRemainServerDays(int serverMonth, String siteCode, String historyId) {
         int serverDay = (serverMonth * 30) + (serverMonth / 2);
         int reachStandardDays = this.getReachStandardDays(siteCode, historyId);
@@ -176,30 +196,34 @@ public class SiteManageService {
     /**
      * 查询关键词达标天数
      *
-     * @param siteCode  站点code
+     * @param siteCode 站点code
      * @param historyId 绑定的套餐
      * @return 关键词达标天数
      */
     public int getReachStandardDays(String siteCode, String historyId) {
         // 查询关键词达标天数
-//        int specifyKeywordNum = 0;
-//        int longTailKeywordNum = 0;
-//        QueryWrapper<SeoKpiStatistics> statisticsQueryWrapper = new QueryWrapper<>();
-//        statisticsQueryWrapper.eq("host_code", siteCode);
-//        statisticsQueryWrapper.eq("history_id", historyId);
-//        statisticsQueryWrapper.eq("del_flag", 0);
-//        statisticsQueryWrapper.eq("type", 1);
-//        List<SeoKpiStatistics> seoKpiStatisticsList = seoKpiStatisticsService.list(statisticsQueryWrapper);
-//        if (ListUtil.notEmpty(seoKpiStatisticsList)) {
-//            for (SeoKpiStatistics kpiStatistics : seoKpiStatisticsList) {
-//                if ("APPOINT_KEYWORDS".equals(kpiStatistics.getKpiCode())) {
-//                    specifyKeywordNum = kpiStatistics.getKpiTarget() != null ? kpiStatistics.getKpiTarget() : 0;
-//                } else if ("LONG_TAIL_KEYWORDS".equals(kpiStatistics.getKpiCode())) {
-//                    longTailKeywordNum = kpiStatistics.getKpiTarget() != null ? kpiStatistics.getKpiTarget() : 0;
-//                }
-//            }
-//        }
-//        return commonMapper.getReachStandardDayNum(historyId, commonMapper.getKeywordStandard(siteCode), specifyKeywordNum, longTailKeywordNum);
+        //        int specifyKeywordNum = 0;
+        //        int longTailKeywordNum = 0;
+        //        QueryWrapper<SeoKpiStatistics> statisticsQueryWrapper = new QueryWrapper<>();
+        //        statisticsQueryWrapper.eq("host_code", siteCode);
+        //        statisticsQueryWrapper.eq("history_id", historyId);
+        //        statisticsQueryWrapper.eq("del_flag", 0);
+        //        statisticsQueryWrapper.eq("type", 1);
+        //        List<SeoKpiStatistics> seoKpiStatisticsList =
+        // seoKpiStatisticsService.list(statisticsQueryWrapper);
+        //        if (ListUtil.notEmpty(seoKpiStatisticsList)) {
+        //            for (SeoKpiStatistics kpiStatistics : seoKpiStatisticsList) {
+        //                if ("APPOINT_KEYWORDS".equals(kpiStatistics.getKpiCode())) {
+        //                    specifyKeywordNum = kpiStatistics.getKpiTarget() != null ?
+        // kpiStatistics.getKpiTarget() : 0;
+        //                } else if ("LONG_TAIL_KEYWORDS".equals(kpiStatistics.getKpiCode())) {
+        //                    longTailKeywordNum = kpiStatistics.getKpiTarget() != null ?
+        // kpiStatistics.getKpiTarget() : 0;
+        //                }
+        //            }
+        //        }
+        //        return commonMapper.getReachStandardDayNum(historyId,
+        // commonMapper.getKeywordStandard(siteCode), specifyKeywordNum, longTailKeywordNum);
         return 0;
     }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/Sohoeb2bOrderService.java

@@ -1,8 +1,9 @@
 package org.jeecg.modules.adweb.site.service;
 
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
 import jakarta.annotation.Resource;
+
 import org.jeecg.modules.adweb.site.entity.Sohoeb2bOrder;
 import org.jeecg.modules.adweb.site.mapper.Sohoeb2bOrderMapper;
 import org.springframework.stereotype.Service;
@@ -13,8 +14,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class Sohoeb2bOrderService {
 
-    @Resource
-    private Sohoeb2bOrderMapper sohoeb2bOrderMapper;
+    @Resource private Sohoeb2bOrderMapper sohoeb2bOrderMapper;
 
     /**
      * @param sohoeb2bOrder

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/impl/AdwebSiteServiceImpl.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xkcoding.http.util.StringUtil;
+
 import jakarta.annotation.Resource;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -40,24 +42,18 @@ import java.util.Map;
  * @Version: V1.0
  */
 @Service
-public class AdwebSiteServiceImpl extends ServiceImpl<AdwebSiteMapper, AdwebSite> implements IAdwebSiteService {
-
+public class AdwebSiteServiceImpl extends ServiceImpl<AdwebSiteMapper, AdwebSite>
+        implements IAdwebSiteService {
 
-    @Resource
-    private SysUserRoleMapper sysUserRoleMapper;
+    @Resource private SysUserRoleMapper sysUserRoleMapper;
 
-    @Autowired
-    private IAdwebUserWpsiteService adwebUserWpsiteService;
+    @Autowired private IAdwebUserWpsiteService adwebUserWpsiteService;
 
-    @Autowired
-    private ISiteUserPermissionService siteUserPermissionService;
+    @Autowired private ISiteUserPermissionService siteUserPermissionService;
 
-    @Lazy
-    @Resource
-    private IMasterSubAccountRelationService masterSubAccountRelationService;
+    @Lazy @Resource private IMasterSubAccountRelationService masterSubAccountRelationService;
 
-    @Resource
-    private ISysBaseAPI sysBaseAPI;
+    @Resource private ISysBaseAPI sysBaseAPI;
 
     private final RedisUtil redisUtil;
 
@@ -78,8 +74,8 @@ public class AdwebSiteServiceImpl extends ServiceImpl<AdwebSiteMapper, AdwebSite
             return config;
         }
         try {
-            List<AdwebSite> list = this.list(new LambdaQueryWrapper<AdwebSite>()
-                    .eq(AdwebSite::getCode, siteCode));
+            List<AdwebSite> list =
+                    this.list(new LambdaQueryWrapper<AdwebSite>().eq(AdwebSite::getCode, siteCode));
             if (!list.isEmpty()) {
                 AdwebSite adwebSite = list.get(0);
                 BeanUtils.copyProperties(adwebSite, config);
@@ -98,21 +94,33 @@ public class AdwebSiteServiceImpl extends ServiceImpl<AdwebSiteMapper, AdwebSite
                 }
 
                 config.setWordpressName("adweb-user");
-                //处理WordPress配置数据
+                // 处理WordPress配置数据
                 if (StringUtils.isNotBlank(adwebSite.getWordpressSetting())) {
-                    Map<String, Object> wordpressSettingMap = FastJsonUtil.parseObject(adwebSite.getWordpressSetting(), Map.class);
+                    Map<String, Object> wordpressSettingMap =
+                            FastJsonUtil.parseObject(adwebSite.getWordpressSetting(), Map.class);
                     int userAccount = 2;
 
                     if (wordpressSettingMap.get("userAccount") != null) {
-                        userAccount = Integer.parseInt(wordpressSettingMap.get("userAccount").toString());
+                        userAccount =
+                                Integer.parseInt(wordpressSettingMap.get("userAccount").toString());
                         if (userAccount == 1) {
                             if (loginUser != null) {
-                                List<String> role = sysUserRoleMapper.getRoleByUserName(loginUser.getUsername());
-                                if (role.toString().contains("adweb_sub_vip") || role.toString().contains("adweb_vip")) {
-                                    List<AdwebUserWpsite> adwebUserWpsites = adwebUserWpsiteService.getSitesByUid(loginUser.getId());
-                                    config.setWordpressName(adwebUserWpsites.get(0).getWpUsername());
-                                } else if (role.toString().contains("admin") || role.toString().contains("adweb_seo_manager") || role.toString().contains("adweb_site_manager") || role.toString().contains("adweb_oem")) {
-                                    List<AdwebUserWpsite> sites = adwebUserWpsiteService.getSitesByUid(adwebSite.getUid());
+                                List<String> role =
+                                        sysUserRoleMapper.getRoleByUserName(
+                                                loginUser.getUsername());
+                                if (role.toString().contains("adweb_sub_vip")
+                                        || role.toString().contains("adweb_vip")) {
+                                    List<AdwebUserWpsite> adwebUserWpsites =
+                                            adwebUserWpsiteService.getSitesByUid(loginUser.getId());
+                                    config.setWordpressName(
+                                            adwebUserWpsites.get(0).getWpUsername());
+                                } else if (role.toString().contains("admin")
+                                        || role.toString().contains("adweb_seo_manager")
+                                        || role.toString().contains("adweb_site_manager")
+                                        || role.toString().contains("adweb_oem")) {
+                                    List<AdwebUserWpsite> sites =
+                                            adwebUserWpsiteService.getSitesByUid(
+                                                    adwebSite.getUid());
                                     config.setWordpressName(sites.get(0).getWpUsername());
                                 }
                             }
@@ -123,17 +131,18 @@ public class AdwebSiteServiceImpl extends ServiceImpl<AdwebSiteMapper, AdwebSite
                         config.setProductType(wordpressSettingMap.get("productType").toString());
                     } else {
                         config.setWordpressSetting(wordpressSettingMap.get("setting").toString());
-                        List<String> open = FastJsonUtil.parseList(wordpressSettingMap.get("open").toString(), String.class);
+                        List<String> open =
+                                FastJsonUtil.parseList(
+                                        wordpressSettingMap.get("open").toString(), String.class);
                         if (CollectionUtils.isNotEmpty(open)) {
                             config.setOpenSetting(open);
                         }
                         if (wordpressSettingMap.size() > 2) {
-                            config.setProductType(wordpressSettingMap.get("productType").toString());
+                            config.setProductType(
+                                    wordpressSettingMap.get("productType").toString());
                         }
                     }
-
                 }
-
             }
         } catch (Exception e) {
             log.error("查询wordpress站点配置失败", e);
@@ -206,9 +215,11 @@ public class AdwebSiteServiceImpl extends ServiceImpl<AdwebSiteMapper, AdwebSite
     @Override
     public AdwebSite getSiteByCode(String siteCode) {
         try {
-            List<AdwebSite> adwebSites = this.list(new LambdaQueryWrapper<AdwebSite>()
-                    .eq(AdwebSite::getCode, siteCode)
-                    .ne(AdwebSite::getStatus, 0));
+            List<AdwebSite> adwebSites =
+                    this.list(
+                            new LambdaQueryWrapper<AdwebSite>()
+                                    .eq(AdwebSite::getCode, siteCode)
+                                    .ne(AdwebSite::getStatus, 0));
             if (!adwebSites.isEmpty()) {
                 return adwebSites.get(0);
             }
@@ -229,8 +240,11 @@ public class AdwebSiteServiceImpl extends ServiceImpl<AdwebSiteMapper, AdwebSite
         List<AdwebSite> siteList = null;
         try {
             List<String> codeList = siteUserPermissionService.getSiteCodeList(uid);
-            siteList = this.list(new LambdaQueryWrapper<AdwebSite>()
-                    .ne(AdwebSite::getStatus, 0).in(AdwebSite::getCode, codeList));
+            siteList =
+                    this.list(
+                            new LambdaQueryWrapper<AdwebSite>()
+                                    .ne(AdwebSite::getStatus, 0)
+                                    .in(AdwebSite::getCode, codeList));
         } catch (Exception e) {
             log.error("查询用户站点失败");
         }
@@ -242,9 +256,7 @@ public class AdwebSiteServiceImpl extends ServiceImpl<AdwebSiteMapper, AdwebSite
         return siteIds;
     }
 
-    /**
-     * 查询全部有效的站点code
-     */
+    /** 查询全部有效的站点code */
     @Override
     public List<String> getAllActiveSiteCodes() {
         return this.list(
@@ -256,18 +268,16 @@ public class AdwebSiteServiceImpl extends ServiceImpl<AdwebSiteMapper, AdwebSite
                 .toList();
     }
 
-    /**
-     * 给站点创建建站流程
-     *
-     * @Author: chenpeiqing
-     * @Date: 2024/11/25
-     */
+    /** 给站点创建建站流程 @Author: chenpeiqing @Date: 2024/11/25 */
     @Override
     public boolean updateSiteFlow(String siteCode) {
         List<DictModel> dictModels = sysBaseAPI.getDictItems("build_website_status");
 
-        DictModel currentDictModel = dictModels.stream().filter(dictModel -> dictModel.getValue().equals("1")).toList().get(0);
-
+        DictModel currentDictModel =
+                dictModels.stream()
+                        .filter(dictModel -> dictModel.getValue().equals("1"))
+                        .toList()
+                        .get(0);
 
         LambdaUpdateWrapper<AdwebSite> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(AdwebSite::getCode, siteCode);
@@ -283,7 +293,8 @@ public class AdwebSiteServiceImpl extends ServiceImpl<AdwebSiteMapper, AdwebSite
      */
     @Override
     public boolean hasSub(LoginUser loginUser) {
-        List<String> idList = masterSubAccountRelationService.getSubAccountIdByMaster(loginUser.getId());
+        List<String> idList =
+                masterSubAccountRelationService.getSubAccountIdByMaster(loginUser.getId());
         return CollectionUtils.isNotEmpty(idList);
     }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/impl/AdwebUserWpsiteServiceImpl.java

@@ -1,46 +1,52 @@
 package org.jeecg.modules.adweb.site.service.impl;
 
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 import jakarta.annotation.Resource;
+
+import org.jeecg.modules.adweb.common.constant.NumConstant;
 import org.jeecg.modules.adweb.site.entity.AdwebUserWpsite;
 import org.jeecg.modules.adweb.site.mapper.AdwebUserWpsiteMapper;
 import org.jeecg.modules.adweb.site.service.IAdwebUserWpsiteService;
 import org.springframework.stereotype.Service;
-import org.jeecg.modules.adweb.common.constant.NumConstant;
 
 import java.util.List;
 
 /**
  * @Description: adweb_user_wpsite
  * @Author: jeecg-boot
- * @Date:   2023-08-18
+ * @Date: 2023-08-18
  * @Version: V1.0
  */
 @Service
-public class AdwebUserWpsiteServiceImpl extends ServiceImpl<AdwebUserWpsiteMapper, AdwebUserWpsite> implements IAdwebUserWpsiteService {
+public class AdwebUserWpsiteServiceImpl extends ServiceImpl<AdwebUserWpsiteMapper, AdwebUserWpsite>
+        implements IAdwebUserWpsiteService {
+
+    @Resource private AdwebUserWpsiteMapper adwebUserWpsiteMapper;
 
-    @Resource
-    private AdwebUserWpsiteMapper adwebUserWpsiteMapper;
     @Override
     public List<AdwebUserWpsite> getSitesByUid(String uid) {
-        List<AdwebUserWpsite> adwebUserWpsites = adwebUserWpsiteMapper.selectList(new LambdaQueryWrapper<AdwebUserWpsite>()
-                .eq(AdwebUserWpsite::getUid,uid));
+        List<AdwebUserWpsite> adwebUserWpsites =
+                adwebUserWpsiteMapper.selectList(
+                        new LambdaQueryWrapper<AdwebUserWpsite>().eq(AdwebUserWpsite::getUid, uid));
         return adwebUserWpsites;
     }
 
     @Override
     public List<AdwebUserWpsite> getByWpUsername(String wpUsername, Integer siteId) {
-        List<AdwebUserWpsite> adwebUserWpsites = adwebUserWpsiteMapper.selectList(new LambdaQueryWrapper<AdwebUserWpsite>()
-                .eq(AdwebUserWpsite::getWpUsername, wpUsername)
-                .eq(AdwebUserWpsite::getSiteId, siteId));
+        List<AdwebUserWpsite> adwebUserWpsites =
+                adwebUserWpsiteMapper.selectList(
+                        new LambdaQueryWrapper<AdwebUserWpsite>()
+                                .eq(AdwebUserWpsite::getWpUsername, wpUsername)
+                                .eq(AdwebUserWpsite::getSiteId, siteId));
         return adwebUserWpsites;
     }
 
     @Override
     public List<AdwebUserWpsite> getByUserID(String userId) {
-        LambdaQueryWrapper<AdwebUserWpsite> adwebUserWpsiteQueryWrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<AdwebUserWpsite> adwebUserWpsiteQueryWrapper =
+                new LambdaQueryWrapper<>();
         adwebUserWpsiteQueryWrapper.eq(AdwebUserWpsite::getUid, userId);
         adwebUserWpsiteQueryWrapper.eq(AdwebUserWpsite::getStatus, NumConstant.ONE);
         List<AdwebUserWpsite> adwebUserWpsites = this.list(adwebUserWpsiteQueryWrapper);
@@ -49,12 +55,14 @@ public class AdwebUserWpsiteServiceImpl extends ServiceImpl<AdwebUserWpsiteMappe
 
     /**
      * 根据站点id获取wp站点用户信息
+     *
      * @param siteId
      * @return
      */
     @Override
     public List<AdwebUserWpsite> getUserBySiteId(Integer siteId) {
-        LambdaQueryWrapper<AdwebUserWpsite> adwebUserWpsiteQueryWrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<AdwebUserWpsite> adwebUserWpsiteQueryWrapper =
+                new LambdaQueryWrapper<>();
         adwebUserWpsiteQueryWrapper.eq(AdwebUserWpsite::getSiteId, siteId);
         adwebUserWpsiteQueryWrapper.eq(AdwebUserWpsite::getStatus, NumConstant.ONE);
         return this.list(adwebUserWpsiteQueryWrapper);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/impl/SiteUserPermissionServiceImpl.java

@@ -1,10 +1,12 @@
 package org.jeecg.modules.adweb.site.service.impl;
 
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 import jakarta.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.jeecg.modules.adweb.common.util.SnowflakeIdUtil;
 import org.jeecg.modules.adweb.site.entity.AdwebSitePermission;
@@ -27,23 +29,24 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-public class SiteUserPermissionServiceImpl extends ServiceImpl<SiteUserPermissionMapper, AdwebSiteUserPermission> implements ISiteUserPermissionService {
+public class SiteUserPermissionServiceImpl
+        extends ServiceImpl<SiteUserPermissionMapper, AdwebSiteUserPermission>
+        implements ISiteUserPermissionService {
 
-    @Resource
-    private ISitePermissionService sitePermissionService;
+    @Resource private ISitePermissionService sitePermissionService;
 
-
-    @Resource
-    private SnowflakeIdUtil snowflakeIdUtil;
+    @Resource private SnowflakeIdUtil snowflakeIdUtil;
 
     @Override
     public List<String> getSiteCodeList(String uid) {
         List<String> codeList = new ArrayList<>();
         List<AdwebSiteUserPermission> AdwebSiteUserPermissionList = null;
         try {
-            AdwebSiteUserPermissionList = this.list(new LambdaQueryWrapper<AdwebSiteUserPermission>()
-                    .eq(AdwebSiteUserPermission::getUid, uid)
-                    .eq(AdwebSiteUserPermission::getStatus, 1));
+            AdwebSiteUserPermissionList =
+                    this.list(
+                            new LambdaQueryWrapper<AdwebSiteUserPermission>()
+                                    .eq(AdwebSiteUserPermission::getUid, uid)
+                                    .eq(AdwebSiteUserPermission::getStatus, 1));
         } catch (Exception e) {
             log.error("通过uid获取站点权限失败", e);
         }
@@ -51,13 +54,23 @@ public class SiteUserPermissionServiceImpl extends ServiceImpl<SiteUserPermissio
             codeList.add("-1");
             return codeList;
         }
-        List<String> permissionsList = AdwebSiteUserPermissionList.stream().map(AdwebSiteUserPermission::getPermissionCode).collect(Collectors.toList());
+        List<String> permissionsList =
+                AdwebSiteUserPermissionList.stream()
+                        .map(AdwebSiteUserPermission::getPermissionCode)
+                        .collect(Collectors.toList());
 
         try {
-            codeList = sitePermissionService.list(new LambdaQueryWrapper<AdwebSitePermission>()
-                            .in(AdwebSitePermission::getPermissionCode, permissionsList)
-                            .eq(AdwebSitePermission::getStatus, 1))
-                    .stream().map(AdwebSitePermission::getSiteCode).collect(Collectors.toList());
+            codeList =
+                    sitePermissionService
+                            .list(
+                                    new LambdaQueryWrapper<AdwebSitePermission>()
+                                            .in(
+                                                    AdwebSitePermission::getPermissionCode,
+                                                    permissionsList)
+                                            .eq(AdwebSitePermission::getStatus, 1))
+                            .stream()
+                            .map(AdwebSitePermission::getSiteCode)
+                            .collect(Collectors.toList());
         } catch (Exception e) {
             log.error("通过站点权限获取站点code失败", e);
         }
@@ -73,9 +86,11 @@ public class SiteUserPermissionServiceImpl extends ServiceImpl<SiteUserPermissio
         List<String> codeList = new ArrayList<>();
         List<AdwebSiteUserPermission> AdwebSiteUserPermissionList = null;
         try {
-            AdwebSiteUserPermissionList = this.list(new LambdaQueryWrapper<AdwebSiteUserPermission>()
-                    .in(AdwebSiteUserPermission::getUid, list)
-                    .eq(AdwebSiteUserPermission::getStatus, 1));
+            AdwebSiteUserPermissionList =
+                    this.list(
+                            new LambdaQueryWrapper<AdwebSiteUserPermission>()
+                                    .in(AdwebSiteUserPermission::getUid, list)
+                                    .eq(AdwebSiteUserPermission::getStatus, 1));
         } catch (Exception e) {
             log.error("通过uid获取站点权限失败", e);
         }
@@ -83,12 +98,22 @@ public class SiteUserPermissionServiceImpl extends ServiceImpl<SiteUserPermissio
             codeList.add("-1");
             return codeList;
         }
-        List<String> permissionsList = AdwebSiteUserPermissionList.stream().map(AdwebSiteUserPermission::getPermissionCode).collect(Collectors.toList());
+        List<String> permissionsList =
+                AdwebSiteUserPermissionList.stream()
+                        .map(AdwebSiteUserPermission::getPermissionCode)
+                        .collect(Collectors.toList());
         try {
-            codeList = sitePermissionService.list(new LambdaQueryWrapper<AdwebSitePermission>()
-                            .in(AdwebSitePermission::getPermissionCode, permissionsList)
-                            .eq(AdwebSitePermission::getStatus, 1))
-                    .stream().map(AdwebSitePermission::getSiteCode).collect(Collectors.toList());
+            codeList =
+                    sitePermissionService
+                            .list(
+                                    new LambdaQueryWrapper<AdwebSitePermission>()
+                                            .in(
+                                                    AdwebSitePermission::getPermissionCode,
+                                                    permissionsList)
+                                            .eq(AdwebSitePermission::getStatus, 1))
+                            .stream()
+                            .map(AdwebSitePermission::getSiteCode)
+                            .collect(Collectors.toList());
         } catch (Exception e) {
             log.error("通过站点权限获取站点code失败", e);
         }
@@ -102,9 +127,7 @@ public class SiteUserPermissionServiceImpl extends ServiceImpl<SiteUserPermissio
     /**
      * 根据uid和siteCode向site_user_permission表中插入一条记录
      *
-     * @return:
-     * @Author: luxiaoxiao
-     * @Date: 2021/4/22
+     * @return: @Author: luxiaoxiao @Date: 2021/4/22
      */
     @Override
     public void insertSiteUserPermission(String uid, String siteCode, String siteName) {
@@ -113,7 +136,8 @@ public class SiteUserPermissionServiceImpl extends ServiceImpl<SiteUserPermissio
         try {
             LambdaQueryWrapper<AdwebSiteUserPermission> queryWrapper = new LambdaQueryWrapper<>();
 
-            queryWrapper.eq(AdwebSiteUserPermission::getUid, uid)
+            queryWrapper
+                    .eq(AdwebSiteUserPermission::getUid, uid)
                     .eq(AdwebSiteUserPermission::getStatus, 1);
 
             siteUserPermissionList = this.list(queryWrapper);