Merge branch 'release' into 'master'

Release

See merge request !152

middleware-automatic-center-client/src/main/java/com/zhiwei/middleware/automatic/server/pojo/CidRecordData.java

-package com.zhiwei.middleware.automatic.server.pojo;
-
-public class CidRecordData {
-    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;
-    }
-}

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.CidRecordData;
+import com.zhiwei.middleware.automatic.server.pojo.CidRecordInfo;
 
 public interface CidRecordDao {
 
-    void insert(CidRecordData cidRecord);
+    void insert(CidRecordInfo cidRecord);
 }

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.CidRecordData;
+import com.zhiwei.middleware.automatic.server.pojo.CidRecordInfo;
 import com.zhiwei.middleware.automatic.son.dao.CidRecordDao;
 import com.zhiwei.middleware.automatic.son.util.Tools;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -19,7 +19,7 @@ public class CidRecordDaoImpl implements CidRecordDao {
     }
 
     @Override
-    public void insert(CidRecordData cidRecord) {
+    public void insert(CidRecordInfo cidRecord) {
         mongoTemplate.insert(cidRecord, COLLECTION_NAME + Tools.TIME_FORMAT_COMMON.format(cidRecord.getStime()));
     }
 }

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

@@ -3,7 +3,7 @@ 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.CidRecordData;
+import com.zhiwei.middleware.automatic.server.pojo.CidRecordInfo;
 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;
@@ -41,7 +41,7 @@ public class TaskServiceCidRecord extends AbstractTaskService {
             }
             for (String s : data) {
                 try {
-                    CidRecordData cidRecord = JSONObject.parseObject(s, CidRecordData.class);
+                    CidRecordInfo cidRecord = JSONObject.parseObject(s, CidRecordInfo.class);
                     if (!test) {
                         test = true;
                         log.info("日志打印，源数据：{}，实体：{}", s, JSONObject.toJSONString(cidRecord));