diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/RemoteLogFeign.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/RemoteLogFeign.java index 1fb54a2b..a3003d5b 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/RemoteLogFeign.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/RemoteLogFeign.java @@ -3,6 +3,7 @@ package com.xjs.business.log; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.xjs.business.log.domain.ApiLog; +import com.xjs.business.log.domain.WebmagicLog; import com.xjs.business.log.factory.RemoteLogFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -20,4 +21,8 @@ public interface RemoteLogFeign { @PostMapping("/apilog/forPRC") R saveApiLog(@RequestBody ApiLog apiLog); + + + @PostMapping("reptileLog/saveForPRC") + public R saveReptileLog(@RequestBody WebmagicLog webmagicLog); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/domain/WebmagicLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/domain/WebmagicLog.java new file mode 100644 index 00000000..c7a9d024 --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/domain/WebmagicLog.java @@ -0,0 +1,39 @@ +package com.xjs.business.log.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 爬虫日志实体类 + * @author xiejs + * @since 2022-02-17 + */ +@Data +public class WebmagicLog implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 爬虫名称 */ + private String name; + + /** 爬虫地址 */ + private String url; + + /** + * 复杂度 + */ + private Long complexRate; + + private Integer status; + + /** 请求耗费时间(单位毫秒) */ + private Long requestTime; + + private Date createTime; + +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/factory/RemoteLogFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/factory/RemoteLogFactory.java index a90c3c7b..b00620bc 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/factory/RemoteLogFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/factory/RemoteLogFactory.java @@ -1,8 +1,9 @@ package com.xjs.business.log.factory; import com.ruoyi.common.core.domain.R; -import com.xjs.business.api.factory.RemoteTranDictFactory; import com.xjs.business.log.RemoteLogFeign; +import com.xjs.business.log.domain.ApiLog; +import com.xjs.business.log.domain.WebmagicLog; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -19,7 +20,18 @@ public class RemoteLogFactory implements FallbackFactory { @Override public RemoteLogFeign create(Throwable cause) { - log.error("日志模块服务添加调用失败:{}", cause.getMessage()); - return apiLog -> R.fail("日志模块服务添加调用失败" + cause.getMessage()); + return new RemoteLogFeign() { + @Override + public R saveApiLog(ApiLog apiLog) { + log.error("日志模块api日志服务添加调用失败"); + return R.fail("日志模块api日志服务添加调用失败" + cause.getMessage()); + } + + @Override + public R saveReptileLog(WebmagicLog webmagicLog) { + log.error("日志模块爬虫日志服务添加调用失败"); + return R.fail("日志模块爬虫日志服务添加调用失败" + cause.getMessage()); + } + }; } } diff --git a/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue b/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue index a50aab4a..3ee6a6bd 100644 --- a/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue +++ b/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue @@ -82,6 +82,8 @@ + +