删除adwebsite 无用字段

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/service/DomainService.java

@@ -13,8 +13,8 @@ import java.util.List;
 
 /**
  * @Author: 汤星鹏
- * @Description: 物料收集数据service
- * @Date: 2020/4/2 9:13
+ * @Description: 域名检测service
+ * @Date: 2025/1/6 9:13
  */
 @Service
 @Slf4j

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/entity/AdwebSite.java

@@ -63,12 +63,6 @@ public class AdwebSite implements Serializable {
     @Schema(description = "站点域名")
     private java.lang.String domain;
     /**
-     * 站点备注
-     */
-    @Excel(name = "站点备注", width = 15)
-    @Schema(description = "站点备注")
-    private java.lang.String descirbe;
-    /**
      * 测试站点域名
      */
     @Excel(name = "测试站点域名", width = 15)
@@ -165,7 +159,6 @@ public class AdwebSite implements Serializable {
     @Excel(name = "释放人", width = 15)
     @Schema(description = "释放人")
     private java.lang.String releaseUid;
-
     /**
      * 发布正式环境时间（首次发布）
      */
@@ -175,21 +168,11 @@ public class AdwebSite implements Serializable {
     @Schema(description = "发布正式环境时间（首次发布）")
     private java.util.Date issueTime;
     /**
-     * 售后到期时间
-     */
-    @Excel(name = "售后到期时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Schema(description = "售后到期时间")
-    private java.util.Date aftersaleTime;
-    /**
      * 当日询盘条数
      */
     @Excel(name = "当日询盘条数", width = 15)
     @Schema(description = "当日询盘条数")
     private java.lang.Integer dayEnquiryCount;
-
-
     /**
      * 创建时间
      */
@@ -210,25 +193,6 @@ public class AdwebSite implements Serializable {
     @Schema(description = "languageCode")
     private java.lang.String languageCode;
 
-    /**
-     * 排序
-     */
-    @Excel(name = "排序", width = 15)
-    @Schema(description = "排序")
-    private java.lang.Integer sort;
-    /**
-     * keywordsNum
-     */
-    @Excel(name = "keywordsNum", width = 15)
-    @Schema(description = "keywordsNum")
-    private java.lang.Integer keywordsNum;
-
-    /**
-     * developmentStatus
-     */
-    @Excel(name = "developmentStatus", width = 15)
-    @Schema(description = "developmentStatus")
-    private java.lang.Integer developmentStatus;
 
     /**
      * sys系统创建；manual关联

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

@@ -8,7 +8,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.WebsocketConst;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.modules.adweb.common.dto.ServerDTO;
 import org.jeecg.modules.adweb.common.service.FeishuService;
 import org.jeecg.modules.adweb.common.service.ShellService;
@@ -75,13 +74,17 @@ public class SelfWebSiteService {
 
     private String errorMsg = "";
 
-
     /**
-     * @param tempId 模板ID
-     * @param uid    系统用户信息
-     * @param name   站点名称
-     * @param planId 新建站点绑定的套餐
-     * @return
+     * 创建站点的方法
+     *
+     * @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) {
@@ -139,6 +142,15 @@ public class SelfWebSiteService {
         }
     }
 
+    /**
+     * 删除指定的广告网站
+     * <p>
+     * 此方法通过执行远程服务器上的Shell脚本来删除广告网站资源，并在删除成功后通知用户
+     * 如果删除失败，会记录错误信息并抛出异常
+     *
+     * @param user      当前操作的用户，用于发送通知
+     * @param adwebSite 要删除的广告网站对象，包含网站代码和域名等信息
+     */
     @Async
     public void removeSite(LoginUser user, AdwebSite adwebSite) {
         try {
@@ -179,6 +191,13 @@ public class SelfWebSiteService {
         }
     }
 
+    /**
+     * 当执行Shell命令失败时调用此方法记录错误信息
+     *
+     * @param cmd       执行的Shell命令，用于标识操作
+     * @param adwebSite 发生错误的广告网站实例，包含站点信息
+     * @param errorMsg  错误信息描述，详细说明执行失败的原因
+     */
     private void exceShellFailed(String cmd, AdwebSite adwebSite, String errorMsg) {
         SysException sysException = new SysException();
 
@@ -190,6 +209,13 @@ public class SelfWebSiteService {
         sysExceptionService.save(sysException);
     }
 
+    /**
+     * 处理临时站点创建失败的逻辑
+     * 当临时站点创建失败时，此方法会被调用，更新站点状态并记录错误信息
+     *
+     * @param adwebSite 代表临时站点的对象，包含站点的相关信息
+     * @param errorMsg  描述创建失败的错误信息
+     */
     private void createSiteFailed(AdwebSite adwebSite, String errorMsg) {
         adwebSite.setStatus(4); // 临时站点创建失败
         siteService.updateById(adwebSite);
@@ -205,202 +231,6 @@ public class SelfWebSiteService {
     }
 
 
-    private void msgSetInSession(HttpServletRequest request, String line) {
-        HttpSession session = request.getSession();
-        if ("CP_TAR_GZ_START".equals(line)) {
-            session.setAttribute("testSiteProcess", "CP_TAR_GZ");
-        }
-        if ("SQL_DUMP_IMPORT_START".equals(line)) {
-            session.setAttribute("testSiteProcess", "SQL_DUMP_IMPORT");
-        }
-        if ("WP_UDONM_START".equals(line)) {
-            session.setAttribute("testSiteProcess", "WP_UDONM");
-        }
-        if ("WP_UDONM_END".equals(line)) {
-            session.setAttribute("testSiteProcess", "SUCCESS");
-        }
-    }
-
-    private void msgSetInSessionProd(HttpServletRequest request, String line) {
-        HttpSession session = request.getSession();
-        if ("wget_tar_start".equals(line)) {
-            session.setAttribute("prodSiteProcess", "wget_tar_start");
-        }
-        if ("wget_sql_start".equals(line)) {
-            session.setAttribute("prodSiteProcess", "wget_sql_start");
-        }
-        if ("start tar zxf".equals(line)) {
-            session.setAttribute("prodSiteProcess", "start tar zxf");
-        }
-        if ("wp_udomain_start".equals(line)) {
-            session.setAttribute("prodSiteProcess", "wp_udomain_start");
-        }
-        if ("wp_udomain_end".equals(line)) {
-            session.setAttribute("prodSiteProcess", "success");
-        }
-    }
-
-
-    /**
-     * 站点启动/停止
-     *
-     * @param sysUser
-     * @param siteId
-     * @param status
-     * @return
-     */
-    public boolean siteStartOrStop(LoginUser sysUser, Integer siteId, Integer status) {
-        AdwebSite adwebSite = siteService.getById(siteId);
-
-        // 获取站点所在生产服务器信息
-        ServerDTO serverInfo = new ServerDTO();
-        boolean flag = false;
-        switch (status) {
-            case 1:
-                flag = startSiteLocal(sysUser, adwebSite);
-                break;
-            case 2:
-                flag = stopSiteLocal(sysUser, adwebSite);
-                break;
-            case 3:
-                flag = startSite(sysUser, adwebSite, serverInfo);
-                break;
-            case 4:
-                flag = stopSite(sysUser, adwebSite, serverInfo);
-                break;
-        }
-        return flag;
-    }
-
-    /**
-     * 站点启动脚本调用(未发布)
-     *
-     * @param sysUser
-     * @param adwebSite
-     * @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);
-                }
-            }
-
-            @Override
-            public void stderr(String line) {
-                log.info("错误 ：" + line);
-            }
-        });
-        return siteStatusUpdate(sysUser, adwebSite, 0);
-    }
-
-    /**
-     * 站点停止脚本调用（未发布）
-     *
-     * @param sysUser
-     * @param adwebSite
-     * @return
-     */
-    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);
-                }
-            }
-
-            @Override
-            public void stderr(String line) {
-                log.info("错误 ：" + line);
-            }
-        });
-        return siteStatusUpdate(sysUser, adwebSite, 3);
-    }
-
-    /**
-     * 站点启动脚本调用(生产环境)
-     *
-     * @param sysUser
-     * @param adwebSite
-     * @return
-     */
-    private boolean startSite(LoginUser sysUser, AdwebSite adwebSite, ServerDTO serverInfo) {
-        //站点启动
-        String cmd = "./shell/start_site " + serverInfo.getIp() + " " + 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);
-        return siteStatusUpdate(sysUser, adwebSite, 0);
-    }
-
-    /**
-     * 站点停止脚本调用（生产环境）
-     *
-     * @param sysUser
-     * @param adwebSite
-     * @return
-     */
-    private boolean stopSite(LoginUser sysUser, AdwebSite adwebSite, ServerDTO serverInfo) {
-        String cmd = "./shell/stop_site " + serverInfo.getIp() + " " + 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);
-        return siteStatusUpdate(sysUser, adwebSite, 3);
-    }
-
-
-    /**
-     * 站点状态更改
-     *
-     * @param sysUser
-     * @param adwebSite
-     * @param runStatus
-     * @return
-     */
-    private boolean siteStatusUpdate(LoginUser sysUser, AdwebSite adwebSite, Integer runStatus) {
-        if (runStatus.equals(3)) {
-            adwebSite.setStopTime(new Date());
-            adwebSite.setStopUid(sysUser.getId());
-        }
-        adwebSite.setRunStatus(runStatus);
-        return siteService.updateById(adwebSite);
-    }
-
-
     /**
      * 发布站点(生产环境)
      *
@@ -412,9 +242,8 @@ public class SelfWebSiteService {
         StringBuilder statusSuccess = new StringBuilder();
         StringBuilder statusFail = new StringBuilder();
         AdwebSite adwebSite = siteService.getById(siteId);
-        String siteToken = UUIDGenerator.generate().toUpperCase();
         HttpSession session = request.getSession();
-//        String cmd = " ./shell/auto_website " + serverInfo.getIp() + " " + adwebSite.getCode() + " " + adwebSite.getInCode() + " " + domain + " " + siteToken + " " + tempDomain;
+
         if (StringUtils.isEmpty(adwebSite.getDevServerIp())) {
             return Result.error("该站点的服务器IP没有设置，请设置后在发布上线！");
         }
@@ -629,6 +458,166 @@ public class SelfWebSiteService {
         }
     }
 
+
+    /**
+     * 站点启动/停止
+     *
+     * @param sysUser
+     * @param siteId
+     * @param status
+     * @return
+     */
+    public boolean siteStartOrStop(LoginUser sysUser, Integer siteId, Integer status) {
+        AdwebSite adwebSite = siteService.getById(siteId);
+
+        // 获取站点所在生产服务器信息
+        ServerDTO serverInfo = new ServerDTO();
+        boolean flag = false;
+        switch (status) {
+            case 1:
+                flag = startSiteLocal(sysUser, adwebSite);
+                break;
+            case 2:
+                flag = stopSiteLocal(sysUser, adwebSite);
+                break;
+            case 3:
+                flag = startSite(sysUser, adwebSite, serverInfo);
+                break;
+            case 4:
+                flag = stopSite(sysUser, adwebSite, serverInfo);
+                break;
+        }
+        return flag;
+    }
+
+    /**
+     * 站点启动脚本调用(未发布)
+     *
+     * @param sysUser
+     * @param adwebSite
+     * @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);
+                }
+            }
+
+            @Override
+            public void stderr(String line) {
+                log.info("错误 ：" + line);
+            }
+        });
+        return siteStatusUpdate(sysUser, adwebSite, 0);
+    }
+
+    /**
+     * 站点停止脚本调用（未发布）
+     *
+     * @param sysUser
+     * @param adwebSite
+     * @return
+     */
+    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);
+                }
+            }
+
+            @Override
+            public void stderr(String line) {
+                log.info("错误 ：" + line);
+            }
+        });
+        return siteStatusUpdate(sysUser, adwebSite, 3);
+    }
+
+    /**
+     * 站点启动脚本调用(生产环境)
+     *
+     * @param sysUser
+     * @param adwebSite
+     * @return
+     */
+    private boolean startSite(LoginUser sysUser, AdwebSite adwebSite, ServerDTO serverInfo) {
+        //站点启动
+        String cmd = "./shell/start_site " + serverInfo.getIp() + " " + 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);
+        return siteStatusUpdate(sysUser, adwebSite, 0);
+    }
+
+    /**
+     * 站点停止脚本调用（生产环境）
+     *
+     * @param sysUser
+     * @param adwebSite
+     * @return
+     */
+    private boolean stopSite(LoginUser sysUser, AdwebSite adwebSite, ServerDTO serverInfo) {
+        String cmd = "./shell/stop_site " + serverInfo.getIp() + " " + 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);
+        return siteStatusUpdate(sysUser, adwebSite, 3);
+    }
+
+
+    /**
+     * 站点状态更改
+     *
+     * @param sysUser
+     * @param adwebSite
+     * @param runStatus
+     * @return
+     */
+    private boolean siteStatusUpdate(LoginUser sysUser, AdwebSite adwebSite, Integer runStatus) {
+        if (runStatus.equals(3)) {
+            adwebSite.setStopTime(new Date());
+            adwebSite.setStopUid(sysUser.getId());
+        }
+        adwebSite.setRunStatus(runStatus);
+        return siteService.updateById(adwebSite);
+    }
+
     /**
      * @param msgTitle
      * @param message

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

@@ -91,6 +91,7 @@ public class SelfWebSiteServiceCommon {
 
         adwebSite.setRunStatus(1);
         adwebSite.setParentCode(adwebTheme.getCode());
+        adwebSite.setTemplateDomain(adwebTheme.getDomain());
         adwebSite.setCreateType("wp");
         adwebSite.setName(name);
         //域名