little opts

Author: admin

console/src/main/resources/application.properties

@@ -1,15 +1,9 @@
 spring.application.name=fuled_dns_server
 ns.domain.servers=114.114.114.114,8.8.8.8
-spring.redis.host=127.0.0.1
+spring.redis.host=192.168.10.201
 spring.redis.port=6379
 dns.server.ip=127.0.0.1
 dns.server.name=fuled.public.dns
 dns.query.cache.fixed.ttl=3600
 spring.data.elasticsearch.repositories.enabled=true
-spring.elasticsearch.rest.uris=http://192.168.10.201:9200
-logging.pattern.dateformat=yyyy-MM-dd HH:mm:ss
-logging.file.name=dns-server-query.log
-logging.level.com.fxz=debug
-logging.file.path=./log
-logging.logback.rollingpolicy.max-history=10
-logging.logback.rollingpolicy.max-file-size=10MB
+spring.elasticsearch.rest.uris=http://192.168.10.201:9200

…er/src/main/resources/logback-spring.xml …le/src/main/resources/logback-spring.xmlstarter/src/main/resources/logback-spring.xml renamed to console/src/main/resources/logback-spring.xml starter/src/main/resources/logback-spring.xml renamed to console/src/main/resources/logback-spring.xml

@@ -15,7 +15,7 @@
         <Prudent>true</Prudent>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>
-                %d{yyyy-MM-dd}/%d{yyyy-MM-dd}.log
+                logs/dns_server.%d{yyyyMMdd}.log
             </FileNamePattern>
             <maxHistory>7</maxHistory>
         </rollingPolicy>

exporter/src/main/java/com/fxz/exporter/elastic/objects/SourceRecord.java

@@ -15,5 +15,6 @@ public class SourceRecord implements Serializable {
     private String result;
     private String queryType;
     private Integer counter;
-    private long lastAccess;
+    private Long lastAccess;
+    private Integer answerCnt;
 }

starter/src/main/java/com/fxz/starter/config/AutoConfig.java

@@ -27,7 +27,6 @@
 import com.fxz.queerer.resolver.impl.ParentResolver;
 import com.fxz.starter.exporter.EsExporter;
 import com.fxz.starter.queerer.EsQuery;
-import com.fxz.starter.repository.SourceRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -113,7 +112,7 @@ public CacheOperate injectCache(@Autowired(required = false) RedisTemplate redis
     }
 
     @Bean("queryList")
-    public List<Query> injectQueryList(@Autowired CacheOperate cacheOperate, @Autowired(required = false) SourceRepository sourceRepository) {
+    public List<Query> injectQueryList(@Autowired CacheOperate cacheOperate, @Autowired(required = false) BaseSourceRepository sourceRepository) {
         List<Query> queryList = new ArrayList<>();
         queryList.add(new CacheQuery(cacheOperate));
         //net query process other side

starter/src/main/java/com/fxz/starter/exporter/EsExporter.java

@@ -15,8 +15,8 @@
 import io.netty.handler.codec.dns.DatagramDnsResponse;
 import io.netty.handler.codec.dns.DnsSection;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.client.utils.DateUtils;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -67,7 +67,8 @@ public void export(ChannelHandlerContext ctx, DatagramDnsQuery query, DatagramDn
             queryRecord.setHost(query.recordAt(DnsSection.QUESTION).name());
             queryRecord.setIp(query.sender().getAddress().getHostAddress());
             queryRecord.setQueryType(query.recordAt(DnsSection.QUESTION).type().name());
-            queryRecord.setDate(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            queryRecord.setDate(formatter.format(new Date()));
             queryRecord.setRes(JSON.toJSONString(records));
             queryRecord.setTimeMillis(System.currentTimeMillis());
             recordRepository.save(queryRecord);
@@ -88,6 +89,7 @@ public void export(ChannelHandlerContext ctx, DatagramDnsQuery query, DatagramDn
             sourceRecord.setQueryType(query.recordAt(DnsSection.QUESTION).type().name());
             sourceRecord.setResult(JSON.toJSONString(records));
             sourceRecord.setLastAccess(System.currentTimeMillis());
+            sourceRecord.setAnswerCnt(records.size());
             sourceRepository.save(sourceRecord);
         }
     }

starter/src/main/java/com/fxz/starter/queerer/EsQuery.java

@@ -3,10 +3,10 @@
 import com.fxz.dnscore.annotation.Priority;
 import com.fxz.dnscore.objects.BaseRecord;
 import com.fxz.dnscore.queerer.Query;
+import com.fxz.exporter.elastic.baserepository.BaseSourceRepository;
 import com.fxz.exporter.elastic.objects.SourceRecord;
 import com.fxz.queerer.util.CacheUtil;
 import com.fxz.queerer.util.ConvertUtil;
-import com.fxz.starter.repository.SourceRepository;
 import io.netty.handler.codec.dns.DefaultDnsQuestion;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
@@ -20,14 +20,14 @@
 @Slf4j
 @Priority(order = 3)
 public class EsQuery implements Query {
-    SourceRepository sourceRepository;
+    BaseSourceRepository sourceRepository;
 
     @Override
     public String name() {
         return "esQuery";
     }
 
-    public EsQuery(SourceRepository sourceRepository) {
+    public EsQuery(BaseSourceRepository sourceRepository) {
         this.sourceRepository = sourceRepository;
     }