发布站点

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/dto/ServerDTO.java

@@ -1,12 +0,0 @@
-package org.jeecg.modules.adweb.common.dto;
-
-import lombok.Data;
-
-@Data
-public class ServerDTO {
-    private String ip;
-    private String port;
-    private String username;
-    private String password;
-    private String pemPath;
-}

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.xkcoding.http.util.StringUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.adweb.common.constant.RobotMsgTemplate;
 import org.jeecg.modules.adweb.common.dto.RobotDto;
@@ -15,6 +16,9 @@ import org.jeecg.modules.system.service.ISysDictService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
@@ -48,8 +52,8 @@ public class FeishuService {
     @Value("${robot.keyword-preOrSuffix-url}")
     private String keywordPreOrSuffixUrl;
 
-    @Value("${robot.gtm-url}")
-    private String gtmUrl;
+    @Value("${robot.site-url}")
+    private String siteUrl;
 
 
     /**
@@ -62,6 +66,17 @@ public class FeishuService {
         PROFILES_ACTIVE = customName;
     }
 
+    // 飞书签名校验
+    private static String genSign(String secret, int timestamp) throws NoSuchAlgorithmException, InvalidKeyException {
+        //把timestamp+"\n"+密钥当做签名字符串
+        String stringToSign = timestamp + "\n" + secret;
+        //使用HmacSHA256算法计算签名
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(new SecretKeySpec(stringToSign.getBytes(StandardCharsets.UTF_8), "HmacSHA256"));
+        byte[] signData = mac.doFinal(new byte[]{});
+        return new String(Base64.encodeBase64(signData));
+    }
+
     /**
      * 异常栈发送机器人消息
      *
@@ -124,12 +139,11 @@ public class FeishuService {
     /**
      * @return
      */
-    public void sendAdWebV2FeiShuMsg(String msgTitle, String message) throws NoSuchAlgorithmException, InvalidKeyException {
-//        String secretSign = "Irf26L7VJCbXPH0HOLJEkf";
-//        int timestamp = Integer.parseInt((System.currentTimeMillis() / 1000) + "");
-//        int timestamp=Integer.parseInt(String.valueOf(System.currentTimeMillis()).substring(0,10));
-//        log.info("timestamp:{}", timestamp);
+    public void sendAdWebV3FeiShuMsg(String msgTitle, String message) throws NoSuchAlgorithmException, InvalidKeyException {
 
+//        String secretSign = "HHfe6aeaWskgFthPGFlYhe";
+//        int timestamp = Integer.parseInt(String.valueOf(System.currentTimeMillis()).substring(0, 10));
+//        log.info("timestamp:{}", timestamp);
         String param = "{\"msg_type\":\"interactive\",\"card\":{\"header\":{\"title\":{\"tag\":\"plain_text\",\"content\":\"msgTitle\"},\"template\":\"blue\"},\"elements\":[{\"tag\":\"div\",\"text\":{\"tag\":\"lark_md\",\"content\":\"message\"}}]}}";
         if (StringUtils.isNotBlank(message)) {
             param = param.replace("message", message);
@@ -141,7 +155,7 @@ public class FeishuService {
         JSONObject object = JSONObject.parseObject(param);
 //        object.replace("timestamp", timestamp);
 //        object.replace("sign", genSign(secretSign, timestamp));
-        HttpRequest.post(gtmUrl).body(object.toJSONString()).execute(true);
+        HttpRequest.post(siteUrl).body(object.toJSONString()).execute(true);
     }
 
 }

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

@@ -1,11 +1,10 @@
 package org.jeecg.modules.adweb.common.service;
 
 
-import org.jeecg.modules.adweb.common.dto.ServerDTO;
 import org.jeecg.modules.adweb.common.util.ShellSSH2Util;
+import org.jeecg.modules.adweb.server.entity.AdwebServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
@@ -22,9 +21,6 @@ public class ShellService {
      */
     private static Logger logger = LoggerFactory.getLogger(ShellService.class);
 
-    @Value("${v3.projectPath}")
-    private String projectPath;
-
     /**
      * 创建共享站点  命令
      *
@@ -74,10 +70,10 @@ public class ShellService {
      * @param cmd            命令
      * @param stdoutListener 控制台输出监听器
      */
-    public void exceShell(String cmd, ShellSSH2Util.StdoutListener stdoutListener, ServerDTO serverInfo) {
+    public void exceShell(String cmd, ShellSSH2Util.StdoutListener stdoutListener, AdwebServer serverInfo) {
         long currentTimeMillis = System.currentTimeMillis();
-        File pemFile = new File(serverInfo.getPemPath());
-        ShellSSH2Util.execmd(serverInfo.getIp(), serverInfo.getUsername(), pemFile, cmd, stdoutListener);
+        File pemFile = new File(serverInfo.getServerPem());
+        ShellSSH2Util.execmd(serverInfo.getServerIp(), serverInfo.getUserName(), pemFile, cmd, stdoutListener);
         long currentTimeMillis1 = System.currentTimeMillis();
         System.out.println("花费时间：" + (currentTimeMillis1 - currentTimeMillis));
     }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/util/ShellSSH2Util.java

@@ -146,15 +146,11 @@ public class ShellSSH2Util {
                 listener.stdout(username + "@" + host + "； 登录成功");
             } else {
                 listener.stderr(username + "@" + host + "； 登录失败");
-                if (connection != null) {
-                    connection.close();
-                }
-            }
-        } catch (IOException e) {
-            listener.stderr(username + "@" + host + "； 登录失败");
-            if (connection != null) {
                 connection.close();
             }
+        } catch (IOException e) {
+            listener.stderr(username + "@" + host + "； 登录失败：" + e.getMessage());
+            connection.close();
         }
         return connection;
     }

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

@@ -2,9 +2,7 @@ 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;
@@ -34,24 +32,29 @@ 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")
@@ -103,9 +106,9 @@ public class WPSiteController {
      *
      * <p>该方法通过接收服务器ID、域名和站点代码来申请发布一个网站 用户通过该接口提交发布申请，实际的发布操作由后台异步处理
      *
-     * @param request HttpServletRequest对象，用于获取请求相关信息
+     * @param request  HttpServletRequest对象，用于获取请求相关信息
      * @param serverId 服务器ID，标识要发布的服务器
-     * @param domain 域名，标识要发布的网站域名
+     * @param domain   域名，标识要发布的网站域名
      * @param siteCode 站点代码，用于识别和验证要发布的站点
      * @return 返回一个Result对象，包含发布申请的结果信息
      */
@@ -113,8 +116,10 @@ public class WPSiteController {
     public Result<?> releaseWebsite(
             HttpServletRequest request, String serverId, String domain, String siteCode) {
 
+        LoginUser user = SecureUtil.currentUser();
+
         // 站点发布
-        selfWebSiteService.releaseSite(request, serverId, domain, siteCode);
+        selfWebSiteService.releaseSite(user, serverId, domain, siteCode);
 
         return Result.OK("申请发布站点成功，请等待发布通知，或者去站点管理查看结果！");
     }
@@ -161,6 +166,19 @@ public class WPSiteController {
         return Result.OK(result);
     }
 
+    /**
+     * 检查域名是否有效
+     * <p>
+     * 此方法用于验证提交的域名是否符合特定条件它首先检查域名是否与CNAME或IP地址相同，
+     * 然后检查域名是否已被使用接下来，它验证域名是否以http开头，
+     * 最后检查域名是否指向CNAME或IP地址如果所有条件都满足，则域名被视为有效
+     *
+     * @param request HttpServletRequest对象，用于获取请求信息
+     * @param cname   用户的CNAME
+     * @param ip      用户的IP地址
+     * @param domain  用户提交的域名
+     * @return 返回一个Result对象，包含验证结果和相关信息
+     */
     @RequestMapping(value = "/check/domain", method = RequestMethod.POST)
     @ResponseBody
     public Result<?> checkDomain(

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

@@ -1,21 +1,18 @@
 package org.jeecg.modules.adweb.site.service;
 
 import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpSession;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.SymbolConstant;
 import org.jeecg.common.constant.WebsocketConst;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.adweb.common.dto.ServerDTO;
 import org.jeecg.modules.adweb.common.service.FeishuService;
 import org.jeecg.modules.adweb.common.service.ShellService;
 import org.jeecg.modules.adweb.common.service.WebSocketService;
 import org.jeecg.modules.adweb.common.util.ShellSSH2Util;
 import org.jeecg.modules.adweb.server.entity.AdwebServer;
 import org.jeecg.modules.adweb.server.service.IAdwebServerService;
-import org.jeecg.modules.adweb.site.constant.WordPressConstants;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.system.entity.SysException;
 import org.jeecg.modules.adweb.system.service.ISysExceptionService;
@@ -24,6 +21,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.Date;
@@ -64,6 +62,9 @@ public class SelfWebSiteService {
     @Value("${AdwebSiteConnect.password}")
     private String password;
 
+    @Value(value = "${jeecg.path.upload}")
+    private String uploadpath;
+
     @Resource
     private FeishuService openFeishuMsgService;
 
@@ -132,11 +133,11 @@ public class SelfWebSiteService {
 
 
             if (StringUtils.isNotBlank(errorMsg)) {
-                createSiteFailed(adwebSite, errorMsg);
+                createSiteFailed(adwebSite, errorMsg, 4);
             }
         } catch (Exception e) {
             log.error("在wp服务器上生成站点文件失败");
-            createSiteFailed(adwebSite, e.getMessage());
+            createSiteFailed(adwebSite, e.getMessage(), 4);
         }
     }
 
@@ -214,14 +215,14 @@ public class SelfWebSiteService {
      * @param adwebSite 代表临时站点的对象，包含站点的相关信息
      * @param errorMsg  描述创建失败的错误信息
      */
-    private void createSiteFailed(AdwebSite adwebSite, String errorMsg) {
-        adwebSite.setStatus(4); // 临时站点创建失败
+    private void createSiteFailed(AdwebSite adwebSite, String errorMsg, int status) {
+        adwebSite.setStatus(status); // 临时站点创建失败 或者正式站点创建失败
         siteService.updateById(adwebSite);
 
         SysException sysException = new SysException();
 
-        sysException.setType(1);
-        sysException.setFunctionModule("拉取临时站点错误");
+        sysException.setType(1); // 业务错误
+        sysException.setFunctionModule("拉取站点错误");
         sysException.setExceptionDetail(String.format("站点code:%s, 站点名称：%s，临时连接：%s", adwebSite.getCode(), adwebSite.getName(), adwebSite.getDomain()));
         sysException.setExceptionDescription(errorMsg);
 
@@ -232,18 +233,17 @@ public class SelfWebSiteService {
     /**
      * 发布站点到生产环境
      *
-     * @param request  HTTP请求对象，用于获取会话信息
+     * @param user     当前登录用户
      * @param serverId 服务器ID，未在方法体内使用
      * @param domain   域名，用于站点发布
      * @param siteCode 站点代码，标识特定的站点
      */
     @Async
-    public void releaseSite(HttpServletRequest request, String serverId, String domain, String siteCode) {
+    public void releaseSite(LoginUser user, String serverId, String domain, String siteCode) {
         log.info("===== releaseSite domain:{},siteCode:{} ====", domain, siteCode);
         StringBuilder statusSuccess = new StringBuilder();
         StringBuilder statusFail = new StringBuilder();
         AdwebSite adwebSite = siteService.getSiteByCode(siteCode);
-        HttpSession session = request.getSession();
         AdwebServer adwebServer = serverService.getById(serverId);
 
         if (adwebServer == null) {
@@ -251,7 +251,7 @@ public class SelfWebSiteService {
             return;
         }
 
-        String usWest118ServerShellPath = "/home/ci-user/shell";
+        String serverShellPath = "/opt/adweb3/shell";
 
         //原始域名
         String originDomain = domain;
@@ -260,123 +260,94 @@ public class SelfWebSiteService {
             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 = "";
-        if (WordPressConstants.DEV_CI1.equals(adwebSite.getDevServerIp())) {
-            cmd = "sudo sh " + usWest118ServerShellPath + "/adweb-publish_http.sh " + adwebSite.getCode() + " " + domain + " " + dbName;
-        }
-        if (WordPressConstants.DEV_CI2.equals(adwebSite.getDevServerIp())) {
-            cmd = "sudo sh " + usWest118ServerShellPath + "/adweb-publish-devci2_http.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);
 
-        if (StringUtils.isEmpty(cmd)) {
-            String errorMsg = "网站上线脚本命令获取失败！";
-            String title = "网站域名：" + originDomain + " 站点发布失败";
-            String message = "**站点ID:** " + siteCode + "\n";
-            message += "**临时域名:** " + adwebSite.getDomainDev() + "\n";
-            message += "**服务器IP:** " + adwebSite.getDevServerIp() + "\n";
-            message += "**错误原因:** " + errorMsg + "\n";
-            sendAdWebV2FeiShuMsg(title, message);
-            Result.error("该站点的发布上线命令执行失败，请重试！");
-            return;
-        }
+        String cmd = "sudo sh " + serverShellPath + "/publish_wp_site.sh " + adwebSite.getCode() + " " + domain + " " + dbName;
+
+        log.info("===== releaseSite originDomain:{},domain:{},siteCode:{},cmd:{} ====", originDomain, domain, siteCode, cmd);
 
-//        return false;
         try {
-//            modifyMaterialImgToUs(adwebSite.getCode());
-//            shellService.exceShellByUsWest118(cmd, new ShellSSH2Util.StdoutListener() {
-//                @Override
-//                public void stdout(String line) {
-//                    log.info("标准 ：" + line);
-//                    msgSetInSessionProd(request, line);
-//                    if ("ERROR:FILE_NAME IS EXISTS".equals(line)) {
-//                        // TODO ----
-//                    }
-//                    if ("[Creationcompleted]".equals(line)) {
-//                        log.info("======网站上线成功======");
-//                        statusSuccess.append("ok");
-//                    }
-//                }
-//
-//                @Override
-//                public void stderr(String line) {
-//                    log.info("错误 ：" + line);
-//                    statusFail.append(line);
-//                }
-//            });
-//            //发布完成后，调用脚本，停止测试站点的访问
-//            try {
-//                String delCmd = "/home/ci-user/shell/deldns " + adwebSite.getCode();
-//                log.info("/***************开始停止测试站点*****************/");
-//                shellService.createShareSiteByPwd(delCmd, host, port, username, password, new ShellSSH2Util.StdoutListener() {
-//                    @Override
-//                    public void stdout(String line) {
-//                        log.info("停止测试站,标准 ：" + line);
-//                        //信息存入session
-//                        if ("ERROR:FILE_NAME IS EXISTS".equals(line)) {
-//                            // TODO ----
-//                        }
-//                    }
-//
-//                    @Override
-//                    public void stderr(String line) {
-//                        log.info(line);
-//                    }
-//                });
-//                log.info("/***************停止测试站点结束，成功*****************/");
-//            } catch (Exception e) {
-//                log.info("停止测试站异常", e);
-//                e.printStackTrace();
-//            }
-            //正式域名
+            if (StringUtils.isBlank(adwebServer.getServerPem())) {
+                String[] userIds = {user.getId()};
+                // 给该站点所属的用户发送消息
+                log.info("生产服务器：{}，未配置连接秘钥", adwebServer.getServerName());
+                webSocketService.sendMessage(userIds, "站点发布失败通知", "该站点发布失败，请联系管理员配置服务器连接秘钥", WebsocketConst.CMD_MANAGE_SITE);
+                return;
+            }
+
+            adwebSite.setStatus(5); //正式站点正在创建
+            siteService.updateById(adwebSite);
+            sendAdWebV3FeiShuMsg("tets", "teste");
+
+            String pemPath = adwebServer.getServerPem().replace("..", "").replace("../", "");
+            if (pemPath.endsWith(SymbolConstant.COMMA)) {
+                pemPath = pemPath.substring(0, pemPath.length() - 1);
+            }
+
+            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 ("ERROR:FILE_NAME IS EXISTS".equals(line)) {
+                        // TODO ----
+                    }
+
+
+                    if ("[Creationcompleted]".equals(line)) {
+                        log.info("======网站上线成功======");
+                        statusSuccess.append("ok");
+                    }
+                }
 
-            log.info("===== releaseSite originDomain:{},domain:{},siteId:{},statusSuccess:{} ====", originDomain, domain, siteCode, statusSuccess);
-            log.info("===== releaseSite originDomain:{},domain:{},siteId:{},statusFail:{} ====", originDomain, domain, siteCode, statusFail);
+                @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 = "**站点ID:** " + siteCode + "\n";
+                String message = "**站点CODE:** " + siteCode + "\n";
                 message += "**临时域名:** " + adwebSite.getDomainDev() + "\n";
                 message += "**服务器IP:** " + adwebSite.getDevServerIp() + "\n";
                 message += "**错误信息:** " + statusFail.toString() + "\n";
-                sendAdWebV2FeiShuMsg(title, message);
+                sendAdWebV3FeiShuMsg(title, message);
 
                 // 站点发布失败
-                adwebSite.setStatus(6);
-                siteService.updateById(adwebSite);
-                Result.error("网站发布上线失败！");
+                createSiteFailed(adwebSite, statusFail.toString(), 6);
+
             } else {
                 String title = "网站域名：" + originDomain + " 站点发布成功";
-                String message = "**站点ID:** " + siteCode + "\n";
+                String message = "**站点CODE:** " + siteCode + "\n";
                 message += "**临时域名:** " + adwebSite.getDomainDev() + "\n";
                 message += "**服务器IP:** " + adwebSite.getDevServerIp() + "\n";
-                sendAdWebV2FeiShuMsg(title, message);
+                sendAdWebV3FeiShuMsg(title, message);
 
                 // 创建站点完成-操作
                 adwebSite.setDomain(originDomain);
                 adwebSite.setIsDomain(1);
-
                 //添加发布时间
                 adwebSite.setIssueTime(new Date());
                 //发布成功后修改状态为发布成功状态 ：1
                 adwebSite.setStatus(1);
-                adwebSite.setProdServerIp(WordPressConstants.PROD_WP_SERVER_IP);
+                adwebSite.setProdServerIp(adwebServer.getServerIp());
                 siteService.updateById(adwebSite);
-                // 将数据库中关键词的域名修改一致
-                // UpdateWrapper<SeoKeywords> updateWrapper = new UpdateWrapper<>();
-                // updateWrapper.eq("user_flag", adwebSite.getCode());
-                // updateWrapper.set("domain", domain);
-                // seoKeywordsService.update(updateWrapper);
-                session.setAttribute("shellLineModular", "");
-                Result.OK("网站发布上线成功！");
+
             }
         } catch (Exception e) {
-            log.error("站点发布失败，退出执行；" + e.getMessage(), e);
-            // 站点发布失败
-            adwebSite.setStatus(6);
-            siteService.updateById(adwebSite);
-            Result.error("网站发布上线失败！");
+            log.error("站点发布失败，退出执行；{}", e.getMessage(), e);
+            createSiteFailed(adwebSite, e.getMessage(), 6);
+
         }
     }
 
@@ -412,7 +383,7 @@ public class SelfWebSiteService {
 //                            String message = "**站点ID:** " + siteId + "\n";
 //                            message += "**临时域名:** " + adwebSite.getDomainDev() + "\n";
 //                            message += "**服务器IP:** " + adwebSite.getDevServerIp() + "\n";
-//                            sendAdWebV2FeiShuMsg(title, message);
+//                            sendAdWebV3FeiShuMsg(title, message);
 //
 //                            delSuccess.append(line);
 //                        }
@@ -424,7 +395,7 @@ public class SelfWebSiteService {
 //                            message += "**临时域名:** " + adwebSite.getDomainDev() + "\n";
 //                            message += "**服务器IP:** " + adwebSite.getDevServerIp() + "\n";
 //                            message += "**错误信息:** " + line + "\n";
-//                            sendAdWebV2FeiShuMsg(title, message);
+//                            sendAdWebV3FeiShuMsg(title, message);
 //
 //                            delFail.append(line);
 //                        }
@@ -438,7 +409,7 @@ public class SelfWebSiteService {
 //                        message += "**临时域名:** " + adwebSite.getDomainDev() + "\n";
 //                        message += "**服务器IP:** " + adwebSite.getDevServerIp() + "\n";
 //                        message += "**错误信息:** " + line + "\n";
-//                        sendAdWebV2FeiShuMsg(title, message);
+//                        sendAdWebV3FeiShuMsg(title, message);
 //
 //                        delFail.append(line);
 //                    }
@@ -471,7 +442,7 @@ public class SelfWebSiteService {
         AdwebSite adwebSite = siteService.getById(siteId);
 
         // 获取站点所在生产服务器信息
-        ServerDTO serverInfo = new ServerDTO();
+        AdwebServer serverInfo = new AdwebServer();
         boolean flag = false;
         switch (status) {
             case 1:
@@ -552,9 +523,9 @@ public class SelfWebSiteService {
      * @param adwebSite
      * @return
      */
-    private boolean startSite(LoginUser sysUser, AdwebSite adwebSite, ServerDTO serverInfo) {
+    private boolean startSite(LoginUser sysUser, AdwebSite adwebSite, AdwebServer serverInfo) {
         //站点启动
-        String cmd = "./shell/start_site " + serverInfo.getIp() + " " + adwebSite.getCode() + " ";
+        String cmd = "./shell/start_site " + serverInfo.getServerIp() + " " + adwebSite.getCode() + " ";
         shellService.exceShell(cmd, new ShellSSH2Util.StdoutListener() {
             @Override
             public void stdout(String line) {
@@ -580,8 +551,8 @@ public class SelfWebSiteService {
      * @param adwebSite
      * @return
      */
-    private boolean stopSite(LoginUser sysUser, AdwebSite adwebSite, ServerDTO serverInfo) {
-        String cmd = "./shell/stop_site " + serverInfo.getIp() + " " + adwebSite.getCode() + " ";
+    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) {
@@ -622,9 +593,9 @@ public class SelfWebSiteService {
      * @param msgTitle
      * @param message
      */
-    public void sendAdWebV2FeiShuMsg(String msgTitle, String message) {
+    public void sendAdWebV3FeiShuMsg(String msgTitle, String message) {
         try {
-            openFeishuMsgService.sendAdWebV2FeiShuMsg(msgTitle, message);
+            openFeishuMsgService.sendAdWebV3FeiShuMsg(msgTitle, message);
         } catch (NoSuchAlgorithmException | InvalidKeyException e) {
             throw new RuntimeException(e);
         }

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -369,7 +369,6 @@ security:
 ### 自定义
 ### v3系统配置
 v3:
-  projectPath: D:/Advich/pem
   dmp:
     # DMP模块实时报表开关，true-从DataBridge实时读取 false-从DB离线读取
     realtimeReport: false
@@ -397,7 +396,7 @@ robot:
   flow-abnormal-url: https://open.feishu.cn/open-apis/bot/v2/hook/81ec5829-ba64-43d7-9662-2054e80a4ebe  #流量异常通知
   keyword-preOrSuffix-url: https://open.feishu.cn/open-apis/bot/v2/hook/325b4b0a-df54-4c7f-adaf-c5da61bb12b3  #关键词前后缀通知
   localize-product-fail-url: https://open.feishu.cn/open-apis/bot/v2/hook/46e780fc-6ed9-45ec-b39f-1e332a236386 #产品图片本地化失败通知
-  gtm-url: https://open.feishu.cn/open-apis/bot/v2/hook/e29a515d-7331-428e-b890-5b5549ffcab5 #跟踪gtm通知
+  site-url: https://open.feishu.cn/open-apis/bot/v2/hook/c5f2a9a5-b0e9-4b58-8622-7e39f66e00b0 #站点管理通知消息
 
 ### 垃圾询盘判断规则
 judge_waste_enquiry:

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -371,7 +371,6 @@ security:
 ### 自定义
 ### v3系统配置
 v3:
-  projectPath: /opt/adweb3/pem
   dmp:
     # DMP模块实时报表开关，true-从DataBridge实时读取 false-从DB离线读取
     realtimeReport: false
@@ -399,7 +398,7 @@ robot:
   flow-abnormal-url: https://open.feishu.cn/open-apis/bot/v2/hook/81ec5829-ba64-43d7-9662-2054e80a4ebe  #流量异常通知
   keyword-preOrSuffix-url: https://open.feishu.cn/open-apis/bot/v2/hook/325b4b0a-df54-4c7f-adaf-c5da61bb12b3
   localize-product-fail-url: https://open.feishu.cn/open-apis/bot/v2/hook/46e780fc-6ed9-45ec-b39f-1e332a236386
-  gtm-url: https://open.feishu.cn/open-apis/bot/v2/hook/e29a515d-7331-428e-b890-5b5549ffcab5
+  site-url: https://open.feishu.cn/open-apis/bot/v2/hook/c5f2a9a5-b0e9-4b58-8622-7e39f66e00b0 #站点管理通知消息
 
 ### 垃圾询盘判断规则
 judge_waste_enquiry:

jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml

@@ -368,7 +368,6 @@ security:
 ### 自定义
 ### v3系统配置
 v3:
-  projectPath: /opt/adweb3/pem
   dmp:
     # DMP模块实时报表开关，true-从DataBridge实时读取 false-从DB离线读取
     realtimeReport: true
@@ -396,7 +395,7 @@ robot:
   flow-abnormal-url: https://open.feishu.cn/open-apis/bot/v2/hook/81ec5829-ba64-43d7-9662-2054e80a4ebe  #流量异常通知
   keyword-preOrSuffix-url: https://open.feishu.cn/open-apis/bot/v2/hook/325b4b0a-df54-4c7f-adaf-c5da61bb12b3  #关键词前后缀通知
   localize-product-fail-url: https://open.feishu.cn/open-apis/bot/v2/hook/46e780fc-6ed9-45ec-b39f-1e332a236386 #产品图片本地化失败通知
-  gtm-url: https://open.feishu.cn/open-apis/bot/v2/hook/e29a515d-7331-428e-b890-5b5549ffcab5 #跟踪gtm通知
+  site-url: https://open.feishu.cn/open-apis/bot/v2/hook/c5f2a9a5-b0e9-4b58-8622-7e39f66e00b0 #站点管理通知消息
 
 ### 垃圾询盘判断规则
 judge_waste_enquiry: