fix:guava-retrying version

pom.xml

@@ -33,6 +33,7 @@
         <encoding>UTF-8</encoding>
         <guava.version>16.0.1</guava.version>
         <mybatis-spring-boot.version>2.3.1</mybatis-spring-boot.version>
+        <mybatis-plus-spring-boot.version>3.5.14</mybatis-plus-spring-boot.version>
         <mysql.version>8.0.33</mysql.version>
         <lombok.version>1.18.30</lombok.version>
         <spring-data-redis.version>3.23.6</spring-data-redis.version>

xservice-cache-starter/src/main/java/com/xiang/xservice/cache/service/IRedisService.java

@@ -73,6 +73,15 @@ public interface IRedisService {
      */
     Boolean hasKey(String group, String key);
 
+    /**
+     * 设置过期时间
+     * @param key       key
+     * @param timeout   过期时间
+     * @param unit      时间单位
+     * @return          是否成功
+     */
+    Boolean expire(String key, long timeout, TimeUnit unit);
+
     /**
      * 设置过期时间
      * @param group     项目名称

xservice-cache-starter/src/main/java/com/xiang/xservice/cache/service/RedisServiceImpl.java

@@ -62,6 +62,11 @@ public class RedisServiceImpl implements IRedisService {
         return redisTemplate.hasKey(buildKey(group, key));
     }
 
+    @Override
+    public Boolean expire(String key, long timeout, TimeUnit unit) {
+        return expire(group, key, timeout, unit);
+    }
+
     @Override
     public Boolean expire(String group, String key, long timeout, TimeUnit unit) {
         return redisTemplate.expire(buildKey(group, key), timeout, unit);

xservice-common/src/main/java/com/xiang/xservice/basic/utils/DateUtils.java

@@ -1,6 +1,7 @@
 package com.xiang.xservice.basic.utils;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -84,4 +85,31 @@ public class DateUtils {
         }
         return false;
     }
+
+    /**
+     * 校验是否节假日
+     * @param date          当前日期
+     * @param statusDesc    状态描述，节假日/工作日/周末。1.当status为1时，表示节假日；2.当status为2时，表示工作日；3.当status为null时，如果week为周六或者周日，表示周末，否则表示工作日
+     * @param week          表示星期几
+     * @param status        当天状态标识，1:节假日，2:工作日，null：周末或工作日(可根据week进行判断，也可以直接根据statusDesc进行判断)
+     *
+     * @return  是否是节假日
+     */
+    public static Boolean validHolidayTime(String date, String statusDesc, String week, String status) {
+        if (StringUtils.equals(status, "1")) {
+            return Boolean.TRUE;
+        }
+        if (StringUtils.equals(status, "2")) {
+            log.info("当前日期:{}, {}, 是工作日", date, week);
+            return Boolean.FALSE;
+        }
+        if (StringUtils.isEmpty(status)) {
+            if (StringUtils.equals(week, "周六") || StringUtils.equals(week, "周日")) {
+                log.info("当前日期:{}, {}, 是周末", date, week);
+                return Boolean.TRUE;
+            }
+            return Boolean.FALSE;
+        }
+        return Boolean.TRUE;
+    }
 }

xservice-common/src/main/java/com/xiang/xservice/basic/utils/HttpUtils.java

@@ -1,5 +1,6 @@
 package com.xiang.xservice.basic.utils;
 
+import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.http.client.config.RequestConfig;
@@ -25,11 +26,15 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 public class HttpUtils {
 
-    private static final int socketTimeOut = 5000;
+    private static final int socketTimeOut = 10000;
     private static final int connectTimeout = 10000;
     private static final int connectionRequestTimeout = 3000;
-    private static final int defaultMaxPerRoute = 20;
+    private static final int defaultMaxPerRoute = 100;
-    private static final int maxTotal = 100;
+    private static final int maxTotal = 200;
+
+    private static final int LIVE_TIME = 5000;
+
+    private static final int ALIVE_STRATEGY = 30000;
 
     private static final RequestConfig requestConfig = RequestConfig.custom()
             .setConnectTimeout(connectTimeout)
@@ -47,12 +52,15 @@ public class HttpUtils {
         connectionManager.setMaxTotal(maxTotal);
         // 每个主机的最大连接数
         connectionManager.setDefaultMaxPerRoute(defaultMaxPerRoute);
+        connectionManager.setValidateAfterInactivity(LIVE_TIME);
+
 
         httpClient = HttpClients.custom()
                 .setConnectionManager(connectionManager)
                 .setDefaultRequestConfig(requestConfig)
                 // 清理空闲连接
                 .evictIdleConnections(30, TimeUnit.SECONDS)
+                .setKeepAliveStrategy((response, context) -> ALIVE_STRATEGY)
                 .build();
     }
 
@@ -60,7 +68,7 @@ public class HttpUtils {
         CloseableHttpResponse response = null;
         String result = "";
         try {
-            log.info("HTTP请求，请求地址===>{}, 请求参数===>{}", url, jsonParams);
+            log.info("HTTP请求，请求地址===>{}, 请求头===>{}, 请求参数===>{}", url, JSON.toJSONString(header), jsonParams);
             HttpPost httpPost = new HttpPost(url);
             httpPost.addHeader("Content-Type", "application/json");
             // 创建请求内容

xservice-http-starter/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.github.rholder</groupId>
             <artifactId>guava-retrying</artifactId>
-            <version>2.0.0</version>
+            <version>1.0.7</version>
         </dependency>
         <dependency>
             <groupId>com.xiang</groupId>

xservice-parent-starter/pom.xml

@@ -10,6 +10,7 @@
     </parent>
 
     <artifactId>xservice-parent-starter</artifactId>
+    <packaging>pom</packaging>
     <version>2.0</version>
 
     <properties>
@@ -50,12 +51,11 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>${mysql.version}</version>
         </dependency>
-
+        <!-- MyBatis-Plus 核心依赖 -->
-        <!-- MyBatis -->
         <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
+            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-spring-boot.version}</version>
+            <version>${mybatis-plus-spring-boot.version}</version> <!-- 建议使用最新版 -->
         </dependency>
 
         <!-- Redis -->
@@ -88,8 +88,8 @@
         <!-- 分页插件 -->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper</artifactId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>5.3.3</version>
+            <version>1.4.7</version>
         </dependency>
 
         <!-- 对象转换 -->

xservice-parent-starter/xservice-web-starter/pom.xml

@@ -11,6 +11,7 @@
     </parent>
 
     <artifactId>xservice-web-starter</artifactId>
+    <packaging>pom</packaging>
     <version>2.0</version>
 
     <properties>

xservice-schedule-starter/src/main/java/com/xiang/xservice/schedule/core/DynamicTaskScheduler.java

@@ -5,7 +5,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
@@ -21,8 +20,12 @@ public class DynamicTaskScheduler {
 
 
     public void schedule(TaskConfig config, Runnable task) {
+        schedule(config, task, LocalDateTime.now());
+    }
+
+    public void schedule(TaskConfig config, Runnable task, LocalDateTime serverTime) {
         LocalDateTime time = config.getExecutionTime();
-        if (time.isBefore(LocalDateTime.now())) return;
+        if (time.isBefore(serverTime)) return;
 
         ScheduledFuture<?> future = taskScheduler.schedule(() -> {
             try {