Merge branch 'release' into 'master'

Release

See merge request !144

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/dao/CidRecordDao.java

 package com.zhiwei.middleware.automatic.son.dao;
 
-import com.zhiwei.middleware.automatic.server.pojo.CidRecord;
+import com.zhiwei.middleware.automatic.son.pojo.CidRecord;
 
 public interface CidRecordDao {
 

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/dao/impl/CidRecordDaoImpl.java

 package com.zhiwei.middleware.automatic.son.dao.impl;
 
-import com.zhiwei.middleware.automatic.server.pojo.CidRecord;
+import com.zhiwei.middleware.automatic.son.pojo.CidRecord;
 import com.zhiwei.middleware.automatic.son.dao.CidRecordDao;
 import com.zhiwei.middleware.automatic.son.util.Tools;
 import org.springframework.beans.factory.annotation.Qualifier;

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/pojo/CidRecord.java

+package com.zhiwei.middleware.automatic.son.pojo;
+
+public class CidRecord {
+
+    private String id;
+
+    private Long c4;
+
+    private Long c5;
+
+    private int foreign;
+
+    private String url;
+
+    private Long time;
+
+    private Long ctime;
+
+    private Long stime;
+
+    private String esId;
+
+    private Long cid;
+
+    public Long getC5() {
+        return c5;
+    }
+
+    public void setC5(Long c5) {
+        this.c5 = c5;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Long getC4() {
+        return c4;
+    }
+
+    public void setC4(Long c4) {
+        this.c4 = c4;
+    }
+
+    public int getForeign() {
+        return foreign;
+    }
+
+    public void setForeign(int foreign) {
+        this.foreign = foreign;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public Long getTime() {
+        return time;
+    }
+
+    public void setTime(Long time) {
+        this.time = time;
+    }
+
+    public Long getCtime() {
+        return ctime;
+    }
+
+    public void setCtime(Long ctime) {
+        this.ctime = ctime;
+    }
+
+    public Long getStime() {
+        return stime;
+    }
+
+    public void setStime(Long stime) {
+        this.stime = stime;
+    }
+
+    public String getEsId() {
+        return esId;
+    }
+
+    public void setEsId(String esId) {
+        this.esId = esId;
+    }
+
+    public Long getCid() {
+        return cid;
+    }
+
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    @Override
+    public String toString() {
+        return "CidRecord{" +
+                "id='" + id + '\'' +
+                ", c4=" + c4 +
+                ", c5=" + c5 +
+                ", foreign=" + foreign +
+                ", url='" + url + '\'' +
+                ", time=" + time +
+                ", ctime=" + ctime +
+                ", stime=" + stime +
+                ", esId='" + esId + '\'' +
+                ", cid=" + cid +
+                '}';
+    }
+}

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/service/TaskServiceCidRecord.java

@@ -3,10 +3,10 @@ package com.zhiwei.middleware.automatic.son.task.service;
 import com.alibaba.excel.util.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.middleware.automatic.server.pojo.AutoTask;
-import com.zhiwei.middleware.automatic.server.pojo.CidRecord;
 import com.zhiwei.middleware.automatic.server.pojo.enums.TaskType;
 import com.zhiwei.middleware.automatic.server.util.RedissonUtil;
 import com.zhiwei.middleware.automatic.son.dao.CidRecordDao;
+import com.zhiwei.middleware.automatic.son.pojo.CidRecord;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -44,7 +44,7 @@ public class TaskServiceCidRecord extends AbstractTaskService {
                     CidRecord cidRecord = JSONObject.parseObject(s, CidRecord.class);
                     if (!test) {
                         test = true;
-                        log.info("日志打印，源数据：{}，实体：{}", s, cidRecord);
+                        log.info("日志打印，源数据：{}，实体：{}", s, cidRecord.toString());
                     }
                     cidRecordDao.insert(cidRecord);
                 } catch (Exception e) {