Merge branch 'cpq-dev' of wangfan/adweb3-server into master

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

@@ -274,11 +274,11 @@ public class ShellSSH2Util {
                 listener.stdout(result);
                 // 如果为得到标准输出为空，说明脚本执行出错了
                 if (StringUtils.isBlank(result)) {
-                    listener.stderr("得到标准输出为空,链接conn:" + connection + ",执行的命令：" + cmd);
+                    listener.stderr("得到标准输出为空, 链接conn:" + connection + ",执行的命令：" + cmd);
                     result = processStdout(session.getStderr(), DEFAULT_CHART, listener);
-                    listener.stderr("得到标准输出为空,链接conn:" + connection + ",执行的命令：" + cmd + "; 错误信息：" + result);
+                    listener.stderr("得到标准输出为空, 链接conn:" + connection + ",执行的命令：" + cmd + "; 错误信息：" + result);
                 } else {
-                    listener.stdout("执行命令成功,链接conn:" + connection + ",执行的命令：" + cmd);
+                    listener.stdout("执行命令成功, 链接conn:" + connection + ",执行的命令：" + cmd);
                 }
                 session.close();
                 connection.close();

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/entity/AdwebEnquiry.java

@@ -141,18 +141,7 @@ public class AdwebEnquiry implements Serializable {
     @Excel(name = "国家/地区（根据ip获取）", width = 15)
     @Schema(description = "国家/地区（根据ip获取）")
     private String country;
-    /**
-     * 通过ip解析获得国家码
-     */
-    @Excel(name = "通过ip解析获得国家码", width = 15)
-    @Schema(description = "通过ip解析获得国家码")
-    private String countryIsoCode;
-    /**
-     * 通过ip解析获得区域码
-     */
-    @Excel(name = "通过ip解析获得区域码", width = 15)
-    @Schema(description = "通过ip解析获得区域码")
-    private String areaIsoCode;
+    
     /**
      * 询盘插件名称，名称小写，如：wpforms
      */

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

@@ -148,8 +148,10 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
     @PreAuthorize("@jps.requiresPermissions('adweb:adweb_site:delete')")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        adwebSiteService.removeById(id);
-        return Result.OK("删除成功!");
+//        adwebSiteService.removeById(id);
+
+        AdwebSite adwebSite = adwebSiteService.getById(id);
+        return Result.error("该站点资源已经不存在, 站点信息将从系统中删除!");
     }
 
     /**
@@ -227,7 +229,7 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
             List<String> codeList = siteUserPermissionService.getSiteCodeList(sysUser.getId());
             queryWrapper.in("code", codeList);
         }
-        
+
         queryWrapper.ne("status", AdwebConstant.SITE_DEL).isNull("parent_group_code");
         queryWrapper.select("id", "name", "code", "domain", "domain_dev", "status");
         List<AdwebSite> siteList = adwebSiteService.list(queryWrapper);

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

@@ -139,6 +139,52 @@ public class SelfWebSiteService {
         }
     }
 
+    public void removeSite(AdwebSite adwebSite) {
+        try {
+
+            // 执行临时服务器shell脚本，生成临时站点
+            String cmd = "sh /opt/adweb3/shell/remove-and-bak-wpsite " + 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("站点创建成功！更新站点状态");
+
+                        // 更新站点流程状态
+                        siteService.updateSiteFlow(finalAdwebSite.getCode());
+
+                        // 临时站点创建成功
+                        finalAdwebSite.setStatus(2);
+                        siteService.updateById(finalAdwebSite);
+
+//                        String[] userIds = {user.getId()};
+//                        // 给该站点所属的用户发送消息
+//                        log.info("发送创建站点通知");
+//                        webSocketService.sendMessage(userIds, "您的站点已经创建成功，请在站点管理中查看该站点详细信息", WebsocketConst.CMD_CREATE_SITE);
+                    }
+                }
+
+                @Override
+                public void stderr(String line) {
+                    log.info("错误 ：{}", line);
+                    errorMsg += line;
+                }
+            });
+
+
+            if (StringUtils.isNotBlank(errorMsg)) {
+                createSiteFailed(adwebSite, errorMsg);
+            }
+        } catch (Exception e) {
+            log.error("在wp服务器上生成站点文件失败");
+            createSiteFailed(adwebSite, e.getMessage());
+        }
+    }
+
     private void createSiteFailed(AdwebSite adwebSite, String errorMsg) {
         adwebSite.setStatus(4); // 临时站点创建失败
         siteService.updateById(adwebSite);