Merge branch 'refs/heads/master' into dev-zenas-20241018

# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/impl/SeoKeywordsRankServiceImpl.java

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/constant/AdwebConstant.java

@@ -1,86 +1,71 @@
 package org.jeecg.modules.adweb.common.constant;
 
 public interface AdwebConstant {
-    /*网站类型（1模板，2站点）*/
-   Integer TEMPLATE = 1;
-   Integer SITE = 2;
-   Integer WPTEMPLATE = 3;
 
-    /*网站状态 当前状态：0：已删除；1：正常; 2:未发布*/
-   Integer SITE_DEL = 0;
-
-   Integer SITE_PUBLISH = 1;
-
-   Integer SITE_UNPUBLISH = 2;
 
-    /*菜单状态*/
-   Integer MENU_DEL  = 1;
-
-    /*模板配置状态*/
-   Integer TEMPLATE_SETTING_DEL  = 1;
+    /*网站状态 当前状态：0：已删除；1：正常; 2:未发布*/
+    Integer SITE_DEL = 0;
 
-    /*模板上架状态*/
-   Integer TEMPLATE_PUTAWAY = 1;
 
     /*产品状态0删除1可用*/
-   Integer STATUS = 1;
+    Integer STATUS = 1;
 
     /*组件编码*/
-   String PRODUCT = "product";
+    String PRODUCT = "product";
 
     /*内容*/
-   String NEWS = "news";
+    String NEWS = "news";
 
     /*平台标识*/
-   String APPKEY = "adweb";
+    String APPKEY = "adweb";
 
     /*内容分类*/
-   String NEWSCATALOG = "newsCatalog";
+    String NEWSCATALOG = "newsCatalog";
 
-   String PRODUCTCTALOG = "productCatalog";
+    String PRODUCTCTALOG = "productCatalog";
 
     /**
      * 缓存前缀
      */
-   String CACHE_PREFIX = "AdWeb3::";
+    String CACHE_PREFIX = "AdWeb3::";
 
     //询盘阶段，字典条目
-   String ENQUIRY_PHASE = "enquiry_phase";
+    String ENQUIRY_PHASE = "enquiry_phase";
     //询盘跟进状态，字典条目
-   String ENQUIRY_TRACK_STATUS = "enquiry_track_status";
+    String ENQUIRY_TRACK_STATUS = "enquiry_track_status";
     //询盘用户有效性，字典条目
     String ENQUIRY_EFFECTIVE = "enquiry_effective";
     //询盘回复状态，字典条目
-   String ENQUIRY_REPLAY_STATUS = "enquiry_replay_status";
+    String ENQUIRY_REPLAY_STATUS = "enquiry_replay_status";
     //ADMP dictService
-   String CUSTOMER_ORDER_CURRENCY = "customer_order_currency";
+    String CUSTOMER_ORDER_CURRENCY = "customer_order_currency";
 
-   String ENQUIRY_PARAM_NAME = "enquiry_param_name";
-   String ENQUIRY_PARAM_EMAIL = "enquiry_param_email";
-   String ENQUIRY_PARAM_PHONE = "enquiry_param_phone";
-   String ENQUIRY_PARAM_MESSAGE = "enquiry_param_message";
-   String ENQUIRY_PARAM_COMPANY = "enquiry_param_company";
-   String ENQUIRY_PARAM_FROM_PAGE = "enquiry_param_from_page";
+    String ENQUIRY_PARAM_NAME = "enquiry_param_name";
+    String ENQUIRY_PARAM_EMAIL = "enquiry_param_email";
+    String ENQUIRY_PARAM_PHONE = "enquiry_param_phone";
+    String ENQUIRY_PARAM_MESSAGE = "enquiry_param_message";
+    String ENQUIRY_PARAM_COMPANY = "enquiry_param_company";
+    String ENQUIRY_PARAM_FROM_PAGE = "enquiry_param_from_page";
 
     /**
      * 页面code
      */
-   String HOME_PAGE_CODE = "home";
-   String ABOUT_US_PAGE_CODE = "aboutUs";
-   String PRODUCTS_PAGE_CODE = "products";
-   String PRODUCT_DETAIL_PAGE_CODE = "productDetail";
-   String NEWS_PAGE_CODE = "news";
-   String NEWS_DETAIL_PAGE_CODE = "newsDetail";
-   String CONTACT_US_PAGE_CODE = "contactUs";
-   String FAQ_PAGE_CODE = "faq";
+    String HOME_PAGE_CODE = "home";
+    String ABOUT_US_PAGE_CODE = "aboutUs";
+    String PRODUCTS_PAGE_CODE = "products";
+    String PRODUCT_DETAIL_PAGE_CODE = "productDetail";
+    String NEWS_PAGE_CODE = "news";
+    String NEWS_DETAIL_PAGE_CODE = "newsDetail";
+    String CONTACT_US_PAGE_CODE = "contactUs";
+    String FAQ_PAGE_CODE = "faq";
 
     /**
      * 模板标签
      */
-   String TEMPLATE_TAGS = "template_tags";
+    String TEMPLATE_TAGS = "template_tags";
 
     /*SEO关键字类型 1 - 指定词 2 - 长尾词 */
-   int KEYWORD_TYPE_APPOINT = 1;
-   int KEYWORD_TYPE_LONG_TAIL = 2;
+    int KEYWORD_TYPE_APPOINT = 1;
+    int KEYWORD_TYPE_LONG_TAIL = 2;
 
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/controller/GTMController.java

@@ -1,9 +1,7 @@
 package org.jeecg.modules.adweb.dmp.controller;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
-
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.lang3.tuple.Pair;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.adweb.dmp.entity.GoogleGTM;
@@ -29,9 +27,11 @@ import java.util.Objects;
 @Slf4j
 public class GTMController {
 
-    @Autowired private IAdwebSiteService adwebSiteService;
+    @Autowired
+    private IAdwebSiteService adwebSiteService;
 
-    @Autowired private GTMAdminService gtmAdminService;
+    @Autowired
+    private GTMAdminService gtmAdminService;
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
@@ -47,4 +47,20 @@ public class GTMController {
                         adwebSite.getCode(), adwebSite.getDomain(), adwebSite.getName());
         return Result.ok(gtmAdminService.getSnippets(googleGTM.getGtmTagId()));
     }
+
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ResponseBody
+    public Result<AdwebSite> getGtmContent(Integer id) {
+        Result<AdwebSite> result = new Result<AdwebSite>();
+        AdwebSite adwebSite = adwebSiteService.getById(id);
+        if (adwebSite != null) {
+            result.setResult(adwebSite);
+            result.setCode(200);
+            result.setMessage("ok");
+        } else {
+            result.setCode(100);
+            result.setMessage("fail");
+        }
+        return result;
+    }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/impl/SeoKeywordsRankServiceImpl.java

@@ -47,21 +47,29 @@ import java.util.stream.Collectors;
 @Slf4j
 public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
 
-    @Autowired private IAdwebSiteService adwebSiteService;
+    @Autowired
+    private IAdwebSiteService adwebSiteService;
 
-    @Autowired private ISysBaseAPI sysBaseAPI;
+    @Autowired
+    private ISysBaseAPI sysBaseAPI;
 
-    @Autowired private ISiteUserPermissionService siteUserPermissionService;
+    @Autowired
+    private ISiteUserPermissionService siteUserPermissionService;
 
-    @Autowired private ISeoPlanSubscriptionService seoPlanSubscriptionService;
+    @Autowired
+    private ISeoPlanSubscriptionService seoPlanSubscriptionService;
 
-    @Autowired private ISeoKeywordsService seoKeywordsService;
+    @Autowired
+    private ISeoKeywordsService seoKeywordsService;
 
-    @Resource private SeoKeywordsMapper seoKeywordsMapper;
+    @Resource
+    private SeoKeywordsMapper seoKeywordsMapper;
 
-    @Autowired private ISeoKeywordsSerpService seoKeywordsSerpService;
+    @Autowired
+    private ISeoKeywordsSerpService seoKeywordsSerpService;
 
-    @Resource private SubscribePlanMapper subscribePlanMapper;
+    @Resource
+    private SubscribePlanMapper subscribePlanMapper;
 
     @Override
     public List<AdwebSite> getAllSites() {
@@ -71,7 +79,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
 
         QueryWrapper<AdwebSite> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("id", "name", "code");
-        queryWrapper.eq("site_type", AdwebConstant.SITE).orderByDesc("create_time");
+        queryWrapper.orderByDesc("create_time");
         queryWrapper.eq("status", AdwebConstant.STATUS).isNull("parent_group_code");
         if (sysBaseAPI.isOem()) {
             List<String> oemGroupUids = sysBaseAPI.getOemGroupUids();
@@ -86,7 +94,9 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
         return siteList;
     }
 
-    /** 放入营销方案名称 */
+    /**
+     * 放入营销方案名称
+     */
     private void setPlanName(List<AdwebSite> siteList) {
         if (CollectionUtils.isEmpty(siteList)) {
             return;
@@ -264,8 +274,8 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
     /**
      * 给列表中的关键字增加排名信息
      * 根据关键词类型
-     * @param keywordList 关键词列表
      *
+     * @param keywordList 关键词列表
      */
     @Override
     public void addRankInfoByIntervalTimeByType(List<SeoKeywords> keywordList, Integer keywordType, String siteCode, String subscriptionId, List<String> dateList) throws Exception {
@@ -274,14 +284,14 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
         }
 
         String datesStr = "";
-        if(CollectionUtils.isEmpty(dateList)){
+        if (CollectionUtils.isEmpty(dateList)) {
             return;
-        }else{
-            for(int i = 0; i < dateList.size(); i++){
-                if(i == dateList.size() - 1){
-                    datesStr +=  "'" + dateList.get(i) + "'";
-                }else{
-                    datesStr +=  "'" + dateList.get(i) + "'" + ",";
+        } else {
+            for (int i = 0; i < dateList.size(); i++) {
+                if (i == dateList.size() - 1) {
+                    datesStr += "'" + dateList.get(i) + "'";
+                } else {
+                    datesStr += "'" + dateList.get(i) + "'" + ",";
                 }
             }
             datesStr = "(" + datesStr + ")";
@@ -292,19 +302,19 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
                 .in(SeoKeywordsSerp::getSeDate, dateList));
         List<SeoKeywordsSerp> noRepeatSerpList = new ArrayList<>();
         Map<String, Integer> serpMap = new HashMap<>();
-        if(CollectionUtils.isNotEmpty(serpList)){
+        if (CollectionUtils.isNotEmpty(serpList)) {
             for (SeoKeywordsSerp seoKeywordsSerp : serpList) {
                 seoKeywordsSerp.setKey(seoKeywordsSerp.getKeywordsId() + "_" + seoKeywordsSerp.getSeDate());
-                if(CollectionUtils.isNotEmpty(noRepeatSerpList)){
+                if (CollectionUtils.isNotEmpty(noRepeatSerpList)) {
                     List<SeoKeywordsSerp> have = noRepeatSerpList.stream().filter(o -> o.getKey().equals(seoKeywordsSerp.getKey())).collect(Collectors.toList());
-                    if(CollectionUtils.isEmpty(have)){
-                        serpMap.put(seoKeywordsSerp.getKey(),seoKeywordsSerp.getRankAbsolute());
+                    if (CollectionUtils.isEmpty(have)) {
+                        serpMap.put(seoKeywordsSerp.getKey(), seoKeywordsSerp.getRankAbsolute());
                         noRepeatSerpList.add(seoKeywordsSerp);
-                    }else{
+                    } else {
                         log.info("重复的数据：" + seoKeywordsSerp.getKey());
                     }
-                }else {
-                    serpMap.put(seoKeywordsSerp.getKey(),seoKeywordsSerp.getRankAbsolute());
+                } else {
+                    serpMap.put(seoKeywordsSerp.getKey(), seoKeywordsSerp.getRankAbsolute());
                     noRepeatSerpList.add(seoKeywordsSerp);
                 }
             }
@@ -317,7 +327,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
                 // 从Map中获取那天的排名信息
                 Integer rankAbsolute = serpMap.get(keyword.getId() + "_" + date);
 
-                if(rankAbsolute == null){
+                if (rankAbsolute == null) {
                     rankAbsolute = 0;
                 }
                 rankInfo.put(date, rankAbsolute + "");
@@ -327,7 +337,7 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
             keyword.setIpAddress("223.112.18.226");
 
             keyword.setDateList(dateList);
-            if(StringUtil.isEmpty(keyword.getSearchUrl())){
+            if (StringUtil.isEmpty(keyword.getSearchUrl())) {
                 keyword.setSearchUrl("https://www.google.com/");
             }
         }
@@ -335,8 +345,9 @@ public class SeoKeywordsRankServiceImpl implements ISeoKeywordsRankService {
 
     /**
      * 自适应宽度(中文支持)
+     *
      * @param sheet
-     * @param size 因为for循环从0开始，size值为 列数-1
+     * @param size  因为for循环从0开始，size值为 列数-1
      */
     @Override
     public void setSizeColumn(Sheet sheet, int size) {

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

@@ -79,7 +79,7 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                   HttpServletRequest req) {
         QueryWrapper<AdwebSite> queryWrapper = QueryGenerator.initQueryWrapper(adwebSite, req.getParameterMap());
-        queryWrapper.eq("site_type", AdwebConstant.SITE);
+
         Page<AdwebSite> page = new Page<AdwebSite>(pageNo, pageSize);
         IPage<AdwebSite> pageList = adwebSiteService.page(page, queryWrapper);
 
@@ -227,7 +227,7 @@ public class AdwebSiteController extends JeecgController<AdwebSite, IAdwebSiteSe
             List<String> codeList = siteUserPermissionService.getSiteCodeList(sysUser.getId());
             queryWrapper.in("code", codeList);
         }
-        queryWrapper.eq("site_type", AdwebConstant.SITE);
+        
         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/controller/wpSiteController.java

@@ -16,14 +16,9 @@ import org.jeecg.modules.adweb.site.service.SelfWebSiteService;
 import org.jeecg.modules.adweb.site.service.SelfWebSiteServiceCommon;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 /**
  * @autor jerry
  * @date: 2022/1/11 20:45
@@ -142,79 +137,6 @@ public class wpSiteController {
 
 
     /**
-     * 手动添加SSL
-     *
-     * @param adwebSite
-     * @return
-     */
-    @RequestMapping(value = "munualAddSSL", method = RequestMethod.POST)
-    @ResponseBody
-    public Result<?> munualAddSSL(AdwebSite adwebSite) {
-        //开始校验证书格式是否正确
-        String cert = adwebSite.getSiteCert();
-        String chain = adwebSite.getSiteChain();
-        String privateKey = adwebSite.getSitePrivkey();
-        if (!cert.startsWith("-----BEGIN CERTIFICATE-----") || !cert.endsWith("-----END CERTIFICATE-----")
-                || !chain.startsWith("-----BEGIN CERTIFICATE-----") || !chain.endsWith("-----END CERTIFICATE-----")
-                || !privateKey.startsWith("-----BEGIN PRIVATE KEY-----") || !privateKey.endsWith("-----END PRIVATE KEY-----")) {
-            return Result.error("ssl证书错误，请检查证书格式！");
-        }
-        String fullchain = cert.concat("\n").concat(chain);
-        String uploadPemUrl = uploadUrl + "keys/";
-        File newFile = new File(uploadPemUrl + adwebSite.getCode());
-        if (!newFile.exists()) {
-            newFile.mkdirs();
-        }
-        File file = new File(uploadPemUrl + adwebSite.getCode() + "/fullchain.pem");
-        File file2 = new File(uploadPemUrl + adwebSite.getCode() + "/privkey.pem");
-        try {
-            FileOutputStream out = new FileOutputStream(file);
-            FileOutputStream out2 = new FileOutputStream(file2);
-            if (!file.exists()) {
-                file.createNewFile();
-            }
-            if (!file2.exists()) {
-                file2.createNewFile();
-            }
-            byte[] content = fullchain.getBytes();
-            byte[] content2 = privateKey.getBytes();
-            out.write(content);
-            out2.write(content2);
-            out.flush();
-            out2.flush();
-            out.close();
-            out2.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        selfWebSiteService.munualAddSSL(adwebSite,
-                pemFileDownLoadUrl + adwebSite.getCode() + "/fullchain.pem",
-                pemFileDownLoadUrl + adwebSite.getCode() + "/privkey.pem");
-        boolean flag = siteService.updateById(adwebSite);
-        if (!flag) {
-            return Result.error("添加失败");
-        }
-        return Result.OK();
-    }
-
-
-    /**
-     * 自动添加SSL(脚本执行)
-     *
-     * @param adwebSite
-     */
-    @RequestMapping(value = "autoAddSsl")
-    @ResponseBody
-    public Result<?> autoAddSsl(AdwebSite adwebSite) {
-        AdwebSite adwebSite1 = selfWebSiteService.autoAddSsl(adwebSite);
-        if (StringUtils.isEmpty(adwebSite1.getSiteCert()) || StringUtils.isEmpty(adwebSite1.getSiteChain()) || StringUtils.isEmpty(adwebSite1.getSitePrivkey())) {
-            return Result.error("证书添加失败！");
-        }
-        adwebSite1.setId(adwebSite.getId());
-        return Result.OK(siteService.updateById(adwebSite1));
-    }
-
-    /**
      * 自动添加SSL
      *
      * @param adwebSite

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

@@ -136,52 +136,29 @@ public class AdwebSite implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "到期时间，默认为ctime+1年")
     private java.util.Date etime;
+
     /**
-     * 站点大小
-     */
-    @Excel(name = "站点大小", width = 15)
-    @Schema(description = "站点大小")
-    private java.lang.String siteSize;
-    /**
-     * 站点更新时间
-     */
-    @Excel(name = "站点更新时间", width = 15)
-    @Schema(description = "站点更新时间")
-    private java.lang.String siteUpdateTime;
-    /**
-     * 公钥
-     */
-    @Excel(name = "公钥", width = 15)
-    @Schema(description = "公钥")
-    private java.lang.String siteCert;
-    /**
-     * 私钥
-     */
-    @Excel(name = "私钥", width = 15)
-    @Schema(description = "私钥")
-    private java.lang.String sitePrivkey;
-    /**
-     * 证书链
+     * Google GTM Head埋点代码
      */
-    @Excel(name = "证书链", width = 15)
-    @Schema(description = "证书链")
-    private java.lang.String siteChain;
+    @Excel(name = "Google GTM Head埋点代码", width = 15)
+    @Schema(description = "Google GTM Head埋点代码")
+    private String gtmHead;
+
     /**
-     * 证书上次修改时间
+     * Google GTM Body埋点代码
      */
-    @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 cretModifyTime;
+    @Excel(name = "Google GTM Body埋点代码", width = 15)
+    @Schema(description = "Google GTM Body埋点代码")
+    private String gtmBody;
+
     /**
-     * 证书上次修改时间
+     * 站点停止时间
      */
-    @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 stopTime;
+    @Excel(name = "站点停止时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Schema(description = "站点停止时间")
+    private Date stopTime;
     /**
      * 站点停止人
      */
@@ -202,20 +179,7 @@ public class AdwebSite implements Serializable {
     @Excel(name = "释放人", width = 15)
     @Schema(description = "释放人")
     private java.lang.String releaseUid;
-    /**
-     * ssl添加方式  1：自动   0：手动
-     */
-    @Excel(name = "ssl添加方式  1：自动   0：手动", width = 15)
-    @Schema(description = "ssl添加方式  1：自动   0：手动")
-    private java.lang.Integer sslOrigin;
-    /**
-     * 证书到期时间
-     */
-    @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 cretExpirationTime;
+
     /**
      * 发布正式环境时间（首次发布）
      */
@@ -238,30 +202,7 @@ public class AdwebSite implements Serializable {
     @Excel(name = "当日询盘条数", width = 15)
     @Schema(description = "当日询盘条数")
     private java.lang.Integer dayEnquiryCount;
-    /**
-     * 站点类型，1：模板，2：站点
-     */
-    @Excel(name = "站点类型，1：模板，2：站点", width = 15)
-    @Schema(description = "站点类型，1：模板，2：站点")
-    private java.lang.Integer siteType;
-    /**
-     * 上架状态：0:未上架；1：已上架；默认0
-     */
-    @Excel(name = "上架状态：0:未上架；1：已上架；默认0", width = 15)
-    @Schema(description = "上架状态：0:未上架；1：已上架；默认0")
-    private java.lang.Integer putaway;
-    /**
-     * 图片路径
-     */
-    @Excel(name = "图片路径", width = 15)
-    @Schema(description = "图片路径")
-    private java.lang.String images;
-    /**
-     * 复制来源
-     */
-    @Excel(name = "复制来源", width = 15)
-    @Schema(description = "复制来源")
-    private java.lang.String source;
+
 
     /**
      * 创建时间
@@ -282,12 +223,7 @@ public class AdwebSite implements Serializable {
     @Excel(name = "languageCode", width = 15)
     @Schema(description = "languageCode")
     private java.lang.String languageCode;
-    /**
-     * tdk
-     */
-    @Excel(name = "tdk", width = 15)
-    @Schema(description = "tdk")
-    private java.lang.String tdk;
+
     /**
      * 排序
      */
@@ -300,36 +236,14 @@ public class AdwebSite implements Serializable {
     @Excel(name = "keywordsNum", width = 15)
     @Schema(description = "keywordsNum")
     private java.lang.Integer keywordsNum;
-    /**
-     * externalTemplate
-     */
-    @Excel(name = "externalTemplate", width = 15)
-    @Schema(description = "externalTemplate")
-    private java.lang.Integer externalTemplate;
+
     /**
      * developmentStatus
      */
     @Excel(name = "developmentStatus", width = 15)
     @Schema(description = "developmentStatus")
     private java.lang.Integer developmentStatus;
-    /**
-     * externalTemplateUrl
-     */
-    @Excel(name = "externalTemplateUrl", width = 15)
-    @Schema(description = "externalTemplateUrl")
-    private java.lang.String externalTemplateUrl;
-    /**
-     * recomPicSize
-     */
-    @Excel(name = "recomPicSize", width = 15)
-    @Schema(description = "recomPicSize")
-    private java.lang.String recomPicSize;
-    /**
-     * 内容管理url
-     */
-    @Excel(name = "内容管理url", width = 15)
-    @Schema(description = "内容管理url")
-    private java.lang.String manageUrl;
+
     /**
      * sys系统创建；manual关联
      */
@@ -401,12 +315,6 @@ public class AdwebSite implements Serializable {
     private java.lang.String companyName;
 
     /**
-     * 购买链接
-     */
-    @Excel(name = "购买链接", width = 15)
-    @Schema(description = "购买链接")
-    private java.lang.String buyLinks;
-    /**
      * WordPress页面内容嵌入配置
      */
     @Excel(name = "WordPress页面内容嵌入配置", width = 15)

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

@@ -476,7 +476,7 @@ public class SelfWebSiteService {
                 // 创建站点完成-操作
                 adwebSite.setDomain(originDomain);
                 adwebSite.setIsDomain(1);
-                adwebSite.setSiteType(2);
+
                 //添加发布时间
                 adwebSite.setIssueTime(new Date());
                 //发布成功后修改状态为发布成功状态 ：1
@@ -665,9 +665,7 @@ public class SelfWebSiteService {
                     log.info("错误：" + line);
                 }
             });
-            adwebSite.setSiteCert(cert.toString());
-            adwebSite.setSiteChain(chain.toString());
-            adwebSite.setSitePrivkey(privekeySb.toString());
+
         } else if (StringUtils.isNotBlank(notExists.toString())) {
             StringBuilder privekeySb = new StringBuilder();
             StringBuilder cert = new StringBuilder();
@@ -725,9 +723,7 @@ public class SelfWebSiteService {
                     log.info("错误：" + line);
                 }
             });
-            adwebSite.setSiteCert(cert.toString());
-            adwebSite.setSiteChain(chain.toString());
-            adwebSite.setSitePrivkey(privekeySb.toString());
+
         }
         return adwebSite;
     }
@@ -832,11 +828,7 @@ public class SelfWebSiteService {
                 log.info("======= 将证书信息保存至站点 =======");
                 AdwebSite adwebSiteSSL = new AdwebSite();
                 adwebSiteSSL.setId(adwebSite.getId());
-                adwebSiteSSL.setSslOrigin(1);
-                adwebSiteSSL.setSitePrivkey(privateKey.toString());
-                adwebSiteSSL.setSiteCert(certStr);
-                adwebSiteSSL.setSiteChain(chain.toString());
-                adwebSiteSSL.setCretModifyTime(new Date());
+
                 adwebSiteSSL.setUtime(new Date());
                 siteService.updateById(adwebSiteSSL);
 

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

@@ -82,9 +82,9 @@ public class SelfWebSiteServiceCommon {
         adwebSite.setCname(tempCname);
         adwebSite.setUid(uid);
         //站点名称改为创建站点时必填字段
-        adwebSite.setSiteType(AdwebConstant.SITE);
+
         adwebSite.setEtime(endTime);
-        adwebSite.setManageUrl("https://" + domain + "/adweb-admin/");
+
         adwebSite.setRunStatus(1);
         adwebSite.setParentCode(adwebTheme.getCode());
         adwebSite.setCreateType("wp");

jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml

@@ -320,6 +320,7 @@
     <logger name="java.sql.Connection" level="DEBUG"/>
     <logger name="java.sql.Statement" level="DEBUG"/>
     <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+    <logger name="java.sql" level="DEBUG"/>
 
 
     <!-- 4. 最终的策略 -->