Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/xjx/ddtcrawler/aspect/ReturnExceptionAspect.java

readme.md

@@ -1 +1,5 @@
-这里是本工程的介绍
+## 这里是本工程的介绍
+
+# 部署方式
+
+待补充

src/main/java/com/xjx/ddtcrawler/advice/ControllerReturnAdvice.java

@@ -15,7 +15,7 @@
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/10 1:59
  */
 @RestControllerAdvice

src/main/java/com/xjx/ddtcrawler/aspect/ConcurrentAspect.java

@@ -13,7 +13,7 @@
 import org.springframework.stereotype.Component;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/15 2:01
  */
 @Component

src/main/java/com/xjx/ddtcrawler/aspect/ReturnExceptionAspect.java

@@ -0,0 +1,36 @@
+package com.xjx.ddtcrawler.aspect;
+
+import com.xjx.ddtcrawler.exception.MyException;
+import com.xjx.ddtcrawler.vo.ResultCode;
+import com.xjx.ddtcrawler.vo.ResultCodeConstant;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author XieJiaxing
+ * @date 2021/8/10 0:17
+ */
+//@Aspect
+@Component
+@Slf4j
+public class ReturnExceptionAspect {
+//    @Around("execution(* com.xjx.ddtcrawler.controller..*(..))")
+    public Object around(ProceedingJoinPoint joinPoint) {
+        Object result;
+        try {
+            result = joinPoint.proceed();
+            return new ResultCode(result);
+        } catch (MyException e) {
+            String message = e.getMessage();
+            log.warn(message);
+            return new ResultCode(message);
+        } catch (Throwable throwable) {
+            String message = throwable.getMessage();
+            log.error(message, throwable);
+            return new ResultCode(ResultCodeConstant.CodeEnum.SYSTEM_ERROR.getCode(), message);
+        }
+    }
+}

src/main/java/com/xjx/ddtcrawler/cache/CacheDomain.java

@@ -8,7 +8,7 @@
 import java.io.Serializable;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/7 17:36
  */
 @Data

src/main/java/com/xjx/ddtcrawler/cache/CacheInterface.java

@@ -1,7 +1,7 @@
 package com.xjx.ddtcrawler.cache;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/21 17:37
  */
 public interface CacheInterface {

src/main/java/com/xjx/ddtcrawler/cache/CommonCache.java

@@ -7,7 +7,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/7 17:33
  */
 @Component

src/main/java/com/xjx/ddtcrawler/cache/WebUserCache.java

@@ -9,7 +9,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/1 22:56
  */
 @Component

src/main/java/com/xjx/ddtcrawler/controller/AuctionController.java

@@ -14,7 +14,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/1 21:15
  */
 @RestController

src/main/java/com/xjx/ddtcrawler/controller/TaskController.java

@@ -7,7 +7,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/14 18:40
  */
 @RestController

src/main/java/com/xjx/ddtcrawler/controller/TemplateController.java

@@ -12,7 +12,7 @@
 import java.util.List;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/14 18:33
  */
 @RestController

src/main/java/com/xjx/ddtcrawler/controller/UserController.java

@@ -13,7 +13,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/14 18:31
  */
 @RestController

src/main/java/com/xjx/ddtcrawler/cookie/CookieHelper.java

@@ -9,7 +9,7 @@
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/14 12:29
  */
 public class CookieHelper {

src/main/java/com/xjx/ddtcrawler/cookie/WebUser.java

@@ -12,7 +12,7 @@
 import java.io.Serializable;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/14 12:29
  */
 @EqualsAndHashCode(callSuper = true)

src/main/java/com/xjx/ddtcrawler/domain/Item.java

@@ -14,7 +14,7 @@
 import java.util.Objects;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/1 16:58
  */
 @Data

src/main/java/com/xjx/ddtcrawler/domain/QueryUrl.java

@@ -14,7 +14,7 @@
 import java.util.Random;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/1 15:40
  */
 @Data

src/main/java/com/xjx/ddtcrawler/domain/Result.java

@@ -16,7 +16,7 @@
 import java.util.stream.Collectors;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/1 16:57
  */
 @Data

src/main/java/com/xjx/ddtcrawler/domain/Template.java

@@ -11,7 +11,7 @@
 import java.io.Serializable;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/1 20:56
  */
 @Data

src/main/java/com/xjx/ddtcrawler/domain/constant/AuctionConstant.java

@@ -1,7 +1,7 @@
 package com.xjx.ddtcrawler.domain.constant;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/1 16:13
  */
 public class AuctionConstant {

src/main/java/com/xjx/ddtcrawler/exception/MyException.java

@@ -6,7 +6,7 @@
 import java.io.Serializable;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/1 22:52
  */
 public class MyException extends RuntimeException implements Serializable {

src/main/java/com/xjx/ddtcrawler/filter/FilterRegistration.java

@@ -5,7 +5,7 @@
 import org.springframework.context.annotation.Configuration;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/14 15:59
  */
 @Configuration

src/main/java/com/xjx/ddtcrawler/filter/WebUserFilter.java

@@ -12,7 +12,7 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/14 15:32
  */
 @Slf4j

src/main/java/com/xjx/ddtcrawler/logic/AuctionLogic.java

@@ -20,7 +20,7 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/1 21:24
  */
 @Component

src/main/java/com/xjx/ddtcrawler/logic/TemplateLogic.java

@@ -13,7 +13,7 @@
 import java.util.List;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/14 18:34
  */
 @Component

src/main/java/com/xjx/ddtcrawler/logic/WebUserLogic.java

@@ -12,7 +12,7 @@
 import org.springframework.stereotype.Component;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/14 16:32
  */
 @Component

src/main/java/com/xjx/ddtcrawler/mapper/TemplateMapper.java

@@ -7,7 +7,7 @@
 import java.util.List;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/1 20:40
  */
 @Repository

src/main/java/com/xjx/ddtcrawler/schedule/MySchedule.java

@@ -13,7 +13,7 @@
 import java.util.Random;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/21 17:29
  */
 @Configuration

src/main/java/com/xjx/ddtcrawler/service/ItemService.java

@@ -10,7 +10,7 @@
 import java.util.List;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/7 16:25
  */
 @Service

src/main/java/com/xjx/ddtcrawler/service/TemplateService.java

@@ -11,7 +11,7 @@
 import java.util.*;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/1 20:56
  */
 @Service

src/main/java/com/xjx/ddtcrawler/task/ItemTask.java

@@ -20,7 +20,7 @@
 import java.util.List;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/7 16:14
  */
 @Component

src/main/java/com/xjx/ddtcrawler/test/Test.java

@@ -11,7 +11,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/1 15:25
  */
 public class Test {

src/main/java/com/xjx/ddtcrawler/utils/EncryptedUtils.java

@@ -5,7 +5,7 @@
 import java.util.Random;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/14 19:20
  */
 public class EncryptedUtils {

src/main/java/com/xjx/ddtcrawler/utils/ThreadPoolUtil.java

@@ -8,7 +8,7 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/9 2:08
  */
 public class ThreadPoolUtil {

src/main/java/com/xjx/ddtcrawler/utils/TimeUtil.java

@@ -8,7 +8,7 @@
 import java.util.TimeZone;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/7 14:01
  */
 public class TimeUtil {

src/main/java/com/xjx/ddtcrawler/vo/MyMessage.java

@@ -8,7 +8,7 @@
 import java.io.Serializable;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/14 20:57
  */
 @Data

src/main/java/com/xjx/ddtcrawler/vo/ResultCode.java

@@ -8,7 +8,7 @@
 import java.io.Serializable;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/10 0:33
  */
 @AllArgsConstructor

src/main/java/com/xjx/ddtcrawler/vo/ResultCodeConstant.java

@@ -1,7 +1,7 @@
 package com.xjx.ddtcrawler.vo;
 
 /**
- * @author XieJiaxing
+ * @author XJX
  * @date 2021/8/10 0:38
  */
 public class ResultCodeConstant {