From a5cf6c5aea6d42e1fa488883c6bd5dda3539dd3e Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Fri, 18 Feb 2022 14:50:55 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=90=8E=E7=AB=AF=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=20=E6=95=B0=E5=AD=97=20=E7=BA=A6=E6=9D=9F=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/business/log/apilog/index.vue   |  9 +++-
 .../validation/annotation/CheckNumber.java    | 38 ++++++++++++++++
 .../CheckNumberConstraintValidator.java       | 44 +++++++++++++++++++
 .../xjs/validation/{ => group}/AddGroup.java  |  2 +-
 .../validation/{ => group}/SelectGroup.java   |  2 +-
 .../validation/{ => group}/UpdateGroup.java   |  2 +-
 .../controller/EnglishWordController.java     |  6 +--
 .../java/com/xjs/word/domain/EnglishWord.java |  6 +--
 .../apilog/controller/ApiLogController.java   |  6 ++-
 .../java/com/xjs/apilog/domain/ApiLog.java    |  9 ++++
 .../java/com/xjs/sina/task/SinaNewsTask.java  |  9 +++-
 11 files changed, 119 insertions(+), 14 deletions(-)
 create mode 100644 xjs-business/xjs-business-common/src/main/java/com/xjs/validation/annotation/CheckNumber.java
 create mode 100644 xjs-business/xjs-business-common/src/main/java/com/xjs/validation/constraintValidator/CheckNumberConstraintValidator.java
 rename xjs-business/xjs-business-common/src/main/java/com/xjs/validation/{ => group}/AddGroup.java (74%)
 rename xjs-business/xjs-business-common/src/main/java/com/xjs/validation/{ => group}/SelectGroup.java (75%)
 rename xjs-business/xjs-business-common/src/main/java/com/xjs/validation/{ => group}/UpdateGroup.java (75%)

diff --git a/ruoyi-ui/src/views/business/log/apilog/index.vue b/ruoyi-ui/src/views/business/log/apilog/index.vue
index 69c154e5..89399302 100644
--- a/ruoyi-ui/src/views/business/log/apilog/index.vue
+++ b/ruoyi-ui/src/views/business/log/apilog/index.vue
@@ -22,6 +22,7 @@
           placeholder="请输入请求URL"
           clearable
           size="small"
+          maxlength="100"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -32,6 +33,7 @@
           placeholder="请输入请求参数"
           clearable
           size="small"
+          maxlength="1000"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -42,6 +44,7 @@
           placeholder="请输入响应参数"
           clearable
           size="small"
+          maxlength="15000"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -134,7 +137,11 @@
           <span>{{ scope.row.request !== "" ? scope.row.request : "-" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="响应参数" align="center" prop="response" :show-overflow-tooltip="true"/>
+      <el-table-column label="响应参数" align="center" prop="response" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.response !== "" ? scope.row.response : "-" }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
       <el-table-column label="是否请求成功" align="center" prop="isSuccess" :show-overflow-tooltip="true">
         <template slot-scope="scope">
diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/annotation/CheckNumber.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/annotation/CheckNumber.java
new file mode 100644
index 00000000..793474db
--- /dev/null
+++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/annotation/CheckNumber.java
@@ -0,0 +1,38 @@
+package com.xjs.validation.annotation;
+
+/**
+ * 自定义校验注解 ：检查数字类型长度
+ * @author xiejs
+ * @since 2022-02-18
+ */
+
+import com.xjs.validation.constraintValidator.CheckNumberConstraintValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.*;
+
+@Documented
+@Inherited
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = {CheckNumberConstraintValidator.class })
+public @interface CheckNumber {
+
+    /**
+     * 描述信息
+     * @return str
+     */
+    String message() default "数值在指定范围之外！！！";
+
+    /**
+     * 校验数字  tip:  [1,2]
+     * @return int
+     */
+    int [] num();
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[]  payload() default {};
+
+}
diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/constraintValidator/CheckNumberConstraintValidator.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/constraintValidator/CheckNumberConstraintValidator.java
new file mode 100644
index 00000000..d42d5d04
--- /dev/null
+++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/constraintValidator/CheckNumberConstraintValidator.java
@@ -0,0 +1,44 @@
+package com.xjs.validation.constraintValidator;
+
+import com.xjs.validation.annotation.CheckNumber;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.util.Objects;
+
+/**
+ * 数字长度约束验证器
+ * @author xiejs
+ * @since 2022-02-18
+ */
+public class CheckNumberConstraintValidator implements ConstraintValidator<CheckNumber,Integer> {
+
+    private int[] num;
+
+    @Override
+    public void initialize(CheckNumber constraintAnnotation) {
+        this.num = constraintAnnotation.num();
+    }
+
+    /**
+     *  校验
+     * @param value 属性值
+     * @param context context
+     * @return boolean
+     */
+    @Override
+    public boolean isValid(Integer value, ConstraintValidatorContext context) {
+
+        if (Objects.nonNull(value)) {
+            for (int i : num) {
+                if (value == i) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //为空则直接过
+        return true;
+    }
+}
diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/AddGroup.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/group/AddGroup.java
similarity index 74%
rename from xjs-business/xjs-business-common/src/main/java/com/xjs/validation/AddGroup.java
rename to xjs-business/xjs-business-common/src/main/java/com/xjs/validation/group/AddGroup.java
index 6fbc44cd..2a5f01c2 100644
--- a/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/AddGroup.java
+++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/group/AddGroup.java
@@ -1,4 +1,4 @@
-package com.xjs.validation;
+package com.xjs.validation.group;
 
 /**
  * 添加校验分组
diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/SelectGroup.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/group/SelectGroup.java
similarity index 75%
rename from xjs-business/xjs-business-common/src/main/java/com/xjs/validation/SelectGroup.java
rename to xjs-business/xjs-business-common/src/main/java/com/xjs/validation/group/SelectGroup.java
index 58acc2fc..097a5e13 100644
--- a/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/SelectGroup.java
+++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/group/SelectGroup.java
@@ -1,4 +1,4 @@
-package com.xjs.validation;
+package com.xjs.validation.group;
 
 /**
  * 查询校验分组
diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/UpdateGroup.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/group/UpdateGroup.java
similarity index 75%
rename from xjs-business/xjs-business-common/src/main/java/com/xjs/validation/UpdateGroup.java
rename to xjs-business/xjs-business-common/src/main/java/com/xjs/validation/group/UpdateGroup.java
index eced3334..5d0243ac 100644
--- a/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/UpdateGroup.java
+++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/validation/group/UpdateGroup.java
@@ -1,4 +1,4 @@
-package com.xjs.validation;
+package com.xjs.validation.group;
 
 /**
  * 修改校验分组
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java
index a6b9c14a..48b614bc 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java
@@ -7,9 +7,9 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.xjs.validation.AddGroup;
-import com.xjs.validation.SelectGroup;
-import com.xjs.validation.UpdateGroup;
+import com.xjs.validation.group.AddGroup;
+import com.xjs.validation.group.SelectGroup;
+import com.xjs.validation.group.UpdateGroup;
 import com.xjs.web.MyBaseController;
 import com.xjs.word.domain.EnglishWord;
 import com.xjs.word.service.IEnglishWordService;
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java
index 86cceeb4..69f73553 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java
@@ -2,9 +2,9 @@ package com.xjs.word.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.ruoyi.common.core.annotation.Excel;
-import com.xjs.validation.AddGroup;
-import com.xjs.validation.SelectGroup;
-import com.xjs.validation.UpdateGroup;
+import com.xjs.validation.group.AddGroup;
+import com.xjs.validation.group.SelectGroup;
+import com.xjs.validation.group.UpdateGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/controller/ApiLogController.java b/xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/controller/ApiLogController.java
index e5c77636..c998acdb 100644
--- a/xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/controller/ApiLogController.java
+++ b/xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/controller/ApiLogController.java
@@ -10,9 +10,11 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.xjs.apilog.domain.ApiLog;
 import com.xjs.apilog.service.IApiLogService;
+import com.xjs.validation.group.SelectGroup;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -37,7 +39,7 @@ public class ApiLogController extends BaseController {
     public R<Object> saveApiLog(@RequestBody ApiLog apiLog) {
 
         boolean save = apiLogService.save(apiLog);
-        return save?R.ok():R.fail();
+        return save ? R.ok() : R.fail();
     }
 
 
@@ -58,7 +60,7 @@ public class ApiLogController extends BaseController {
     @RequiresPermissions("log:apilog:list")
     @GetMapping("/list")
     @ApiOperation("查询日志列表")
-    public TableDataInfo list(ApiLog apiLog) {
+    public TableDataInfo list(@Validated({SelectGroup.class}) ApiLog apiLog) {
         startPage();
         List<ApiLog> list = apiLogService.selectApiLogList(apiLog);
         return getDataTable(list);
diff --git a/xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/domain/ApiLog.java b/xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/domain/ApiLog.java
index 1b229a70..0b616595 100644
--- a/xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/domain/ApiLog.java
+++ b/xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/domain/ApiLog.java
@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
+import com.xjs.validation.annotation.CheckNumber;
+import com.xjs.validation.group.SelectGroup;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -28,26 +31,32 @@ public class ApiLog implements Serializable
 
     /** 接口名称 */
     @Excel(name = "接口名称")
+    @Size(max = 20, message = "请控制接口名称长度在20字符", groups = { SelectGroup.class})
     private String apiName;
 
     /** 请求API的url */
     @Excel(name = "请求API的url")
+    @Size(max = 100, message = "请控制请求API的url长度在100字符", groups = { SelectGroup.class})
     private String url;
 
     /** 请求API的方法 */
     @Excel(name = "请求API的方法")
+    @Size(max = 10, message = "请控制请求API的方法长度在10字符", groups = { SelectGroup.class})
     private String method;
 
     /** 请求request */
     @Excel(name = "请求request")
+    @Size(max = 1000, message = "请控制请求request长度在1000字符", groups = { SelectGroup.class})
     private String request;
 
     /** 响应体 */
     @Excel(name = "响应体")
+    @Size(max = 15000, message = "请控制响应体长度在15000字符", groups = { SelectGroup.class})
     private String response;
 
     /** 是否请求成功 */
     @Excel(name = "是否请求成功",readConverterExp = "1=成功,2=失败")
+    @CheckNumber(num= {1, 2}, groups = { SelectGroup.class})
     private Integer isSuccess;
 
     @Excel(name = "创建时间" ,dateFormat = "yyyy-MM-dd HH:mm:ss")
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/task/SinaNewsTask.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/task/SinaNewsTask.java
index ab98bd1f..afc84617 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/task/SinaNewsTask.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/task/SinaNewsTask.java
@@ -39,6 +39,7 @@ public class SinaNewsTask {
 
     @ReptileLog(name = "新浪新闻", url = URL)
     public Long reptileSinaNews() {
+        Long thisCount = 0L;
         try {
 
             String html = httpUtils.doGetHtml(URL);
@@ -46,10 +47,15 @@ public class SinaNewsTask {
             Document document = Jsoup.parse(html);
 
             this.parse(document);
+
+            thisCount = count;
         } catch (Exception e) {
             log.error(e.getMessage());
+        } finally {
+            //执行完初始化
+            this.count = 0L;
         }
-        return count;
+        return thisCount;
     }
 
     /**
@@ -172,7 +178,6 @@ public class SinaNewsTask {
             }
 
 
-
             sinaNewsService.saveBatch(sinaNewsList, 30);
 
             //删除重复