seo管理 关键词管理重构

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

@@ -13,7 +13,7 @@ import org.jeecg.modules.adweb.common.dto.CountryAreaApiDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,7 +27,7 @@ import java.util.TimeZone;
  * @author: Cyan
  * @time: 2019/12/16 10:33
  */
-@Service
+@Component
 public class GeoIpUtil {
 
     private static final Logger log = LoggerFactory.getLogger(GeoIpUtil.class);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/AdwebEnquiryServiceImpl.java

@@ -8,14 +8,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xkcoding.http.util.StringUtil;
+
 import jakarta.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.constant.CacheConstant;
-import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictPropertyModel;
 import org.jeecg.common.util.FastJsonUtil;
-
 import org.jeecg.modules.adweb.common.constant.NumConstant;
 import org.jeecg.modules.adweb.common.dto.CountryAreaApiDto;
 import org.jeecg.modules.adweb.common.service.FeishuService;
@@ -48,7 +49,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.*;
-import java.util.function.BiConsumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -77,9 +77,6 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
     private IAdwebPublicEnquiryRuleService AdwebPublicEnquiryRuleService;
 
     @Resource
-    private GeoIpUtil geoIpService;
-
-    @Resource
     private ISysDictService dictService;
 
     @Resource
@@ -634,7 +631,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
         adwebEnquiry.setFromEmail(enquiryDto.getFromEmail());
         adwebEnquiry.setPluginName(enquiryDto.getPluginName());
         adwebEnquiry.setRecordId(enquiryDto.getRecordId());
-        adwebEnquiry.setModifyRecordCtime(geoIpService.getLocalhostTime(enquiryDto.getFromIp(), enquiryDto.getRecordCtime()));
+        adwebEnquiry.setModifyRecordCtime(geoIpUtil.getLocalhostTime(enquiryDto.getFromIp(), enquiryDto.getRecordCtime()));
         adwebEnquiry.setRecordCtime(enquiryDto.getRecordCtime());
         adwebEnquiry.setSiteCode(adwebSite.getCode());
         adwebEnquiry.setModular(enquiryDto.getPluginName());