feat: nacos迁移

pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.xiang.starter</groupId>
             <artifactId>xmc-common</artifactId>
-            <version>1.0</version>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>com.xiang.starter</groupId>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.xiang.starter</groupId>
             <artifactId>xmc-http-starter</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>com.xiang.starter</groupId>
@@ -54,12 +54,12 @@
         <dependency>
             <groupId>com.xiang.starter</groupId>
             <artifactId>xservice-quartz-core</artifactId>
-            <version>1.1</version>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>com.xiang.starter</groupId>
             <artifactId>xmc-logger-starter</artifactId>
-            <version>1.0</version>
+            <version>1.1</version>
         </dependency>
     </dependencies>
 

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/constants/RedisKeyConstant.java

@@ -1,5 +1,9 @@
 package com.xiang.app.modules.jntyzx.constants;
 
+import com.xiang.xservice.basic.utils.DateUtils;
+
+import java.time.LocalDate;
+
 /**
  * @Author: xiang
  * @Date: 2025-12-16 10:43
@@ -9,4 +13,23 @@ public class RedisKeyConstant {
     public static final String JNTYZX_ORDER_CREATE_KEY = "jntyzx:order:create:orderId:";
 
     public static final String JNTUZX_ORDER_PEEK_KEY = "jntyzx:order:peek:user:";
+
+    public static final String JNTYZX_VENUE_MSG_SEND_KEY = "jntyzx:order:venue:msg:send";
+
+    private static final String JNTYZX_VENUE_SUBSCRIBE_KEY = "jntyzx:venue:subscribe:";
+
+    private static final String JNTYZX_ORDER_CLOSE_CARD_KEY = "jntyzx:order:close:card:";
+
+    public static String getCloseCardKey(String username) {
+        return JNTYZX_ORDER_CLOSE_CARD_KEY + username + ":" +getDate();
+    }
+
+    public static String getVenueSubscribeKey(String placeName) {
+        return JNTYZX_VENUE_SUBSCRIBE_KEY + placeName + ":" + getDate();
+    }
+
+    public static String getDate() {
+        LocalDate now = LocalDate.now();
+        return ":" + DateUtils.getDateFromDate(now);
+    }
 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/entity/resp/query/UserInfoResponse.java

@@ -1,5 +1,6 @@
 package com.xiang.app.modules.jntyzx.entity.resp.query;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -94,6 +95,7 @@ public class UserInfoResponse {
     /**
      * 封禁截止日期
      */
+    @JSONField(name = "restrictionDeadline")
     private String restrictionDeadline;
     /**
      * 封禁原因
@@ -102,5 +104,6 @@ public class UserInfoResponse {
     /**
      * 封禁截止日期
      */
-    private String RestrictionDeadline;
+    @JSONField(name = "RestrictionDeadline")
+    private String RestrictionDeadline2;
 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/JntyzxHttpServiceImpl.java

@@ -5,9 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.xiang.app.modules.jntyzx.constants.RedisKeyConstant;
 import com.xiang.app.modules.jntyzx.constants.UrlConstant;
-import com.xiang.app.modules.jntyzx.entity.pojo.OrderInfoDO;
 import com.xiang.app.modules.jntyzx.entity.pojo.VenueInfoDO;
 import com.xiang.app.modules.jntyzx.entity.req.SubscribeRequest;
 import com.xiang.app.modules.jntyzx.entity.req.SubscribeVo;
@@ -20,10 +18,7 @@ import com.xiang.app.modules.jntyzx.manage.IOrderCreateInfoManage;
 import com.xiang.app.modules.jntyzx.service.IJntyzxHttpService;
 import com.xiang.app.modules.jntyzx.utils.JntyzxSaltEncodeUtils;
 import com.xiang.xmc.service.cache.service.IRedisService;
-import com.xiang.xmc.service.http.helper.BaseHttpHelp;
 import com.xiang.xmc.service.http.helper.HttpHelper;
-import com.xiang.xmc.service.http.helper.HttpHelperFactory;
-import com.xiang.xservice.basic.utils.Base64;
 import com.xiang.xservice.basic.utils.JsonUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -32,9 +27,6 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.nio.charset.StandardCharsets;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -154,14 +146,15 @@ public class JntyzxHttpServiceImpl implements IJntyzxHttpService {
         Map<String, String> params = Maps.newHashMap();
         params.put("X-Access-Token", token);
         String resp = HttpHelper.doPost(UrlConstant.ADD_SUBSCRIBE, params, JsonUtils.toJsonString(subscribeRequest));
+        log.info("[江体小程序] 羽毛球场地下单响应结果:{}", resp);
         if (StringUtils.isBlank(resp)) {
-            log.info("请求结果为空");
+            log.info("[resp] 请求结果为空");
             return null;
         }
         JntyzxResponse<OrderCreateResp> response = JSON.parseObject(resp, new TypeReference<JntyzxResponse<OrderCreateResp>>() {
         });
         if (Objects.isNull(response)) {
-            log.info("请求结果为空");
+            log.info("[res ==> response] 请求结果为空");
             return null;
         }
         return response;

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/OrderInfoServiceImpl.java

@@ -50,6 +50,12 @@ public class OrderInfoServiceImpl implements IJtOrderService {
             return true;
         }
 
+        String user = (String) redisService.get(RedisKeyConstant.getCloseCardKey(userTokenInfoDO.getName()));
+        if (StringUtils.isNotBlank(user)) {
+            log.info("用户:{}有锁卡风险，不在请求接口！");
+            return true;
+        }
+
         JntyzxResponse<OrderCreateResp> orderResp = jntyzxHttpService.createOrder(venueInfoDOS, userTokenInfoDO.getToken(), userTokenInfoDO.getOpenId());
         if (Objects.isNull(orderResp)) {
             return false;
@@ -80,8 +86,13 @@ public class OrderInfoServiceImpl implements IJtOrderService {
             }
             if (orderResp.getMessage().contains("限制")) {
                 log.info("改会员卡被限制，不在请求，用户:{}", userTokenInfoDO.getName());
+                redisService.set(RedisKeyConstant.getCloseCardKey(userTokenInfoDO.getName()), "true");
                 throw new BusinessException("会员卡被限制，不在请求");
             }
+            if (orderResp.getMessage().contains("已有人预订")) {
+                log.info("该场地已被人预定，更换场地, 用户：{}", userTokenInfoDO.getName());
+                redisService.set(RedisKeyConstant.getVenueSubscribeKey(venueInfoDOS.get(0).getPlaceName()), "true");
+            }
             return false;
         }
     }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/service/impl/UserTokenInfoServiceImpl.java

@@ -71,10 +71,10 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService {
             log.info("【心跳监测】查询用户信息为空，无需操作");
             return true;
         }
-        userTokenInfoDOS.parallelStream().forEach(this::healthDeclaration);
+        userTokenInfoDOS.forEach(this::healthDeclaration);
         // 信息更新
         userTokenInfoDOS = userTokenInfoManage.list();
-        userTokenInfoDOS.parallelStream().forEach(this::queryMemberCardInfo);
+        userTokenInfoDOS.forEach(this::queryMemberCardInfo);
         return true;
     }
 
@@ -123,18 +123,18 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService {
         if (response.getSuccess()) {
             UserInfoResponse userInfoResponse = response.getResult();
             userTokenInfoDO.setMemberCardNo(userInfoResponse.getConsCard());
-            if (StringUtils.isNotBlank(userInfoResponse.getRestrictionDeadline())) {
+            if (StringUtils.isNotBlank(userInfoResponse.getRestrictionDeadline2())) {
                 userTokenInfoDO.setIsRestriction(1);
                 userTokenInfoDO.setIsOrder(0);
                 UserRestrictionInfo userRestrictionInfo = userRestrictionManage.queryByUserId(userTokenInfoDO.getId());
                 if (Objects.isNull(userRestrictionInfo)) {
                     userRestrictionInfo = new UserRestrictionInfo();
                     userRestrictionInfo.setUserId(userTokenInfoDO.getId());
-                    userRestrictionInfo.setRestrictionDeadline(DateUtils.getDateTimeFromStr(userInfoResponse.getRestrictionDeadline()));
+                    userRestrictionInfo.setRestrictionDeadline(DateUtils.getDateTimeFromStr(userInfoResponse.getRestrictionDeadline2()));
                     userRestrictionInfo.setRestrictionDesc(userInfoResponse.getRestrictionDescription());
                     userRestrictionManage.save(userRestrictionInfo);
                 } else {
-                    userRestrictionInfo.setRestrictionDeadline(DateUtils.getDateTimeFromStr(userInfoResponse.getRestrictionDeadline()));
+                    userRestrictionInfo.setRestrictionDeadline(DateUtils.getDateTimeFromStr(userInfoResponse.getRestrictionDeadline2()));
                     userRestrictionInfo.setRestrictionDesc(userInfoResponse.getRestrictionDescription());
                     userRestrictionManage.updateById(userRestrictionInfo);
                 }

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/utils/MsgSendUtils.java

@@ -0,0 +1,42 @@
+package com.xiang.app.modules.jntyzx.utils;
+
+import com.xiang.app.common.service.dingtalk.JtDingTalkFactory;
+import com.xiang.app.modules.jntyzx.constants.RedisKeyConstant;
+import com.xiang.xmc.service.cache.service.IRedisService;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @Author: xiang
+ * @Date: 2026-01-26 09:14
+ */
+@Component
+@RequiredArgsConstructor
+public class MsgSendUtils {
+
+    private final IRedisService redisService;
+    private final JtDingTalkFactory jtDingTalkFactory;
+
+    /**
+     * 限制钉钉消息发送 1小时最多5次
+     * @param redisKey      redis缓存的key
+     * @param msgContent    消息内容
+     */
+    public void sendMsgRestrict1Hours(String redisKey, String msgContent) {
+        String key = RedisKeyConstant.JNTYZX_VENUE_MSG_SEND_KEY + RedisKeyConstant.getDate();
+        String cache = (String) redisService.get(redisKey);
+        if (StringUtils.isNotBlank(cache)) {
+            int sendNum = Integer.parseInt(cache);
+            if (sendNum >= 0 && sendNum <= 5) {
+                jtDingTalkFactory.sendMsg(msgContent);
+                redisService.set(key, String.valueOf(++sendNum), 1, TimeUnit.HOURS);
+            }
+        } else {
+            jtDingTalkFactory.sendMsg(msgContent);
+            redisService.set(key, "0", 1, TimeUnit.HOURS);
+        }
+    }
+}

xservice-core/src/main/java/com/xiang/app/modules/jntyzx/utils/VenueInfoUtils.java

@@ -25,4 +25,17 @@ public class VenueInfoUtils {
     public static boolean get8210VenueInfo(SitePositionList sitePositionList) {
         return StringUtils.equals(sitePositionList.getSjName(), "20:00-21:00") || StringUtils.equals(sitePositionList.getSjName(), "21:00-22:00");
     }
+
+    public static int sortVenueInfo(String placeName) {
+        if (placeName.contains("十号")) {
+            return 0;
+        }
+        if (placeName.contains("二号")) {
+            return 1;
+        }
+        if (placeName.contains("九号")) {
+            return 2;
+        }
+        return 3;
+    }
 }

xservice-server/src/main/java/com/xiang/app/Application.java

@@ -17,6 +17,7 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringBootApplication
 @ConfigurationPropertiesScan(basePackages = {
         "com.xiang.xservice.logger",
+        "com.xiang.xmc.service.http"
 })
 @MapperScan(basePackages = {
         "com.xiang.app.modules.*.mapper"

xservice-server/src/main/java/com/xiang/app/HealthController.java

@@ -0,0 +1,26 @@
+package com.xiang.app;
+
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@Slf4j
+@RestController
+public class HealthController {
+
+    @Value("${spring.profiles.active}")
+    private String env;
+
+    @GetMapping("/actuator/health")
+    public Map<String, String> checkHealth() {
+        Map<String, String> map = Maps.newHashMap();
+        map.put("env", env);
+        map.put("status", "UP");
+        log.info("cornucopia application health check success! listening in env:{}, now：{}", env, System.currentTimeMillis());
+        return map;
+    }
+}

xservice-server/src/main/java/com/xiang/app/debugger/OrderTest.java

@@ -0,0 +1,90 @@
+package com.xiang.app.debugger;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: xiang
+ * @Date: 2026-02-25 10:23
+ */
+@Slf4j
+public class OrderTest {
+    private static final UserTest userA = new UserTest(1L, "123");
+    private static final UserTest userB = new UserTest(2L, "234");
+    private static final UserTest userC = new UserTest(3L, "345");
+    private static final List<UserTest> users = Lists.newArrayList(userA, userB, userC);
+
+    private static final VenueInfoTest v1 = new VenueInfoTest(1L, "一号场地");
+    private static final VenueInfoTest v2 = new VenueInfoTest(2L, "二号场地");
+    private static final VenueInfoTest v3 = new VenueInfoTest(3L, "三号场地");
+    private static final Map<String, VenueInfoTest> venueInfoMap = Maps.newHashMap();
+    static {
+        venueInfoMap.put(v1.getPlaceName(), v1);
+        venueInfoMap.put(v2.getPlaceName(), v2);
+        venueInfoMap.put(v3.getPlaceName(), v3);
+    }
+
+    public static void main(String[] args) {
+        OrderTest orderTest = new OrderTest();
+        orderTest.test();
+    }
+
+    public void test() {
+        users.parallelStream().forEach(user -> {
+            try {
+                for (String placeName : venueInfoMap.keySet()) {
+                    VenueInfoTest venueInfoTest = venueInfoMap.get(placeName);
+                    for (int i = 0; i < 10; i++) {
+                        boolean order = createOrder(venueInfoTest, user);
+                        if (order) {
+                            return;
+                        }
+                        try {
+                            log.info("睡眠中 1.25s");
+                            Thread.sleep(1250);
+                        } catch (InterruptedException e) {
+                            log.error("睡眠失败～～～");
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                // 关键点：异常只影响当前 user
+                log.error("createOrder 异常，user={}", user.getId(), e);
+                return; // 结束这个 user，不影响其他 user
+            }
+        });
+    }
+
+    private boolean createOrder(VenueInfoTest venueInfoTest, UserTest userTest) {
+        log.info("用户:{}======>请求三方接口中", userTest.getUsername());
+        String order = order(venueInfoTest, userTest);
+        log.info("用户:{}======>请求结果：:{}", userTest.getUsername(), order);
+        if (order.contains("成功")) {
+            return true;
+        }
+        if (order.contains("锁卡")) {
+            return true;
+        }
+        return false;
+    }
+
+    private String order(VenueInfoTest venueInfoTest, UserTest userTest) {
+        String msg = "～～～";
+        if (venueInfoTest.getId() == 1L && userTest.getId() == 2L) {
+            msg = "用户" + userTest.getUsername() + "预定成功！";
+            return msg;
+        }
+        if (userTest.getId() == 1L) {
+            msg = "用户" + userTest.getUsername() + "频繁请求接口，将锁卡";
+            return msg;
+        }
+        if (venueInfoTest.getId() == 2L) {
+            msg = "场地" + venueInfoTest.getPlaceName() + "已被预订";
+        }
+        return msg;
+    }
+}

xservice-server/src/main/java/com/xiang/app/debugger/UserTest.java

@@ -0,0 +1,16 @@
+package com.xiang.app.debugger;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @Author: xiang
+ * @Date: 2026-02-25 10:24
+ */
+@Data
+@AllArgsConstructor
+public class UserTest {
+
+    private Long id;
+    private String username;
+}

xservice-server/src/main/java/com/xiang/app/debugger/VenueInfoTest.java

@@ -0,0 +1,18 @@
+package com.xiang.app.debugger;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @Author: xiang
+ * @Date: 2026-02-25 10:28
+ */
+@Data
+@AllArgsConstructor
+public class VenueInfoTest {
+
+    private Long id;
+
+    private String placeName;
+
+}

xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenuePickTask.java

@@ -0,0 +1,133 @@
+package com.xiang.app.schedule.jntyzx;
+
+import com.xiang.app.modules.jntyzx.constants.RedisKeyConstant;
+import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
+import com.xiang.app.modules.jntyzx.entity.pojo.VenueInfoDO;
+import com.xiang.app.modules.jntyzx.entity.resp.query.SitePositionList;
+import com.xiang.app.modules.jntyzx.service.IJntyzxHttpService;
+import com.xiang.app.modules.jntyzx.service.IJtOrderService;
+import com.xiang.app.modules.jntyzx.service.IUserTokenInfoService;
+import com.xiang.app.modules.jntyzx.utils.VenueInfoUtils;
+import com.xiang.app.modules.jntyzx.utils.WeekendUtils;
+import com.xiang.core.quartz.annotation.XxzJob;
+import com.xiang.xmc.service.cache.service.IRedisService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDate;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * 江体小程序场地捡漏任务 周日和周二 启动捡漏周一和周三的场地
+ * @Author: xiang
+ * @Date: 2026-03-23 09:23
+ */
+@Component
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class JtVenuePickTask {
+
+    private final IJntyzxHttpService jntyzxHttpService;
+    private final IUserTokenInfoService userTokenInfoService;
+    private final IRedisService redisService;
+    private final IJtOrderService jtOrderService;
+
+
+    @XxzJob(name = "jtVenuePickTask")
+    @GetMapping("jtVenuePickTask")
+    public void handler() {
+        log.info("江体小程序场地捡漏，time:{}", System.currentTimeMillis());
+
+        List<UserTokenInfoDO> availableUser = userTokenInfoService.getAvailableUser();
+        if (CollectionUtils.isEmpty(availableUser)) {
+            log.info("当前无可用用户查询场地信息！");
+            return;
+        }
+        UserTokenInfoDO userTokenInfoDO = availableUser.get(0);
+
+        if (Objects.isNull(userTokenInfoDO)) {
+            return;
+        }
+        String subscribeKey = RedisKeyConstant.JNTYZX_ORDER_CREATE_KEY + userTokenInfoDO.getName() + LocalDate.now();
+        String subscribeValue = (String) redisService.get(subscribeKey);
+        if (StringUtils.isNotBlank(subscribeValue)) {
+            log.info("用户:{}今日已进行场地预定，不进行捡漏处理！", userTokenInfoDO.getName());
+            return;
+        }
+
+        String token = userTokenInfoDO.getToken();
+        List<SitePositionList> sitePositionLists = jntyzxHttpService.queryAvailableTomorrow(WeekendUtils.isWeekend(), token);
+        sitePositionLists = sitePositionLists.stream()
+                .filter(item -> !item.getPlaceName().contains("小馆"))
+                .filter(VenueInfoUtils::get8210VenueInfo)
+                .filter(item -> StringUtils.equals(item.getContacts(), "0")).toList();
+        if (CollectionUtils.isEmpty(sitePositionLists)) {
+            log.info("目前没有可以捡漏的场地");
+            return;
+        }
+        Map<String, List<VenueInfoDO>> map = sitePositionLists.stream().map(item -> {
+            VenueInfoDO venueInfoDO = new VenueInfoDO();
+            venueInfoDO.setPlaceName(item.getPlaceName());
+            venueInfoDO.setPlaceId(item.getPlaceId());
+            venueInfoDO.setScheduleId(Integer.valueOf(item.getScheduleId()));
+            venueInfoDO.setSjName(item.getSjName());
+            venueInfoDO.setMoney(item.getMoney());
+            venueInfoDO.setClassName(item.getClassName());
+            venueInfoDO.setClassCode(item.getClassCode());
+            venueInfoDO.setAppointments(item.getAppointments());
+            venueInfoDO.setCTypeCode(item.getCtypeCode());
+            return venueInfoDO;
+        }).collect(Collectors.groupingByConcurrent(VenueInfoDO::getPlaceName));
+
+        if (MapUtils.isEmpty(map)) {
+            log.info("暂无可下单场地，time:{}", System.currentTimeMillis());
+            return;
+        }
+
+        List<UserTokenInfoDO> users = userTokenInfoService.getCanOrderUser();
+        if (CollectionUtils.isEmpty(users)) {
+            log.info("暂无可下单用户， time:{}", System.currentTimeMillis());
+            return;
+        }
+        users.parallelStream().forEach(user -> {
+            try {
+                List<String> placeNameList = map.keySet().stream().sorted(Comparator.comparing(VenueInfoUtils::sortVenueInfo)).toList();
+                for (String placeName : placeNameList) {
+                    List<VenueInfoDO> venueInfoDOList = map.get(placeName);
+                    String valid = (String) redisService.get(RedisKeyConstant.getVenueSubscribeKey(placeName));
+                    if (StringUtils.isNotBlank(valid)) {
+                        break;
+                    }
+                    boolean order = jtOrderService.createOrder(venueInfoDOList, user);
+                    if (order) {
+                        return;
+                    }
+                    try {
+                        Thread.sleep(1250);
+                    } catch (InterruptedException e) {
+                        log.error("睡眠失败～～～");
+                    }
+                }
+            } catch (Exception e) {
+                // 关键点：异常只影响当前 user
+                log.error("createOrder 异常，user={}", user.getId(), e);
+                return; // 结束这个 user，不影响其他 user
+            }
+        });
+
+
+
+
+    }
+}

xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenuePullTask.java

@@ -1,12 +1,13 @@
 package com.xiang.app.schedule.jntyzx;
 
 import com.google.common.collect.Maps;
-import com.xiang.app.common.service.dingtalk.JtDingTalkFactory;
+import com.xiang.app.modules.jntyzx.constants.RedisKeyConstant;
 import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
 import com.xiang.app.modules.jntyzx.entity.resp.query.SitePositionList;
 import com.xiang.app.modules.jntyzx.service.IJntyzxHttpService;
 import com.xiang.app.modules.jntyzx.service.IUserTokenInfoService;
 import com.xiang.app.modules.jntyzx.service.IVenueService;
+import com.xiang.app.modules.jntyzx.utils.MsgSendUtils;
 import com.xiang.app.modules.jntyzx.utils.VenueInfoUtils;
 import com.xiang.app.modules.jntyzx.utils.WeekendUtils;
 import com.xiang.core.quartz.annotation.XxzJob;
@@ -36,8 +37,8 @@ public class JtVenuePullTask {
 
     private final IUserTokenInfoService userTokenInfoService;
     private final IJntyzxHttpService jntyzxHttpService;
-    private final JtDingTalkFactory jtDingTalkFactory;
     private final IVenueService venueService;
+    private final MsgSendUtils msgSendUtils;
 
     @XxzJob(name = "jtVenueInfoPullTask")
     @GetMapping("/jtVenueInfoPullTask")
@@ -71,11 +72,15 @@ public class JtVenuePullTask {
                 return;
             }
 
-            StringBuffer msg = new StringBuffer("查询到20:00-22:00空闲场地信息===>\n时间:" + DateUtils.getDateFromDate(LocalDate.now()));
+            StringBuffer msg = new StringBuffer(
+                    "查询到20:00-22:00空闲场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now()) + "\n");
             sitePositionLists.forEach(item -> {
                 msg.append(item.getPlaceName()).append("\n");
             });
-            jtDingTalkFactory.sendMsg(msg.toString());
+
+            String key = RedisKeyConstant.JNTYZX_VENUE_MSG_SEND_KEY + RedisKeyConstant.getDate();
+            msgSendUtils.sendMsgRestrict1Hours(key, msg.toString());
+            return;
         }
     }
 

xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenueSubscribeTask.java

@@ -1,6 +1,7 @@
 package com.xiang.app.schedule.jntyzx;
 
 import com.xiang.app.common.service.dingtalk.JtDingTalkFactory;
+import com.xiang.app.modules.jntyzx.constants.RedisKeyConstant;
 import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
 import com.xiang.app.modules.jntyzx.entity.pojo.VenueInfoDO;
 import com.xiang.app.modules.jntyzx.service.IJtOrderService;
@@ -8,14 +9,17 @@ import com.xiang.app.modules.jntyzx.service.IUserTokenInfoService;
 import com.xiang.app.modules.jntyzx.service.IVenueService;
 import com.xiang.app.modules.jntyzx.utils.VenueInfoUtils;
 import com.xiang.core.quartz.annotation.XxzJob;
+import com.xiang.xmc.service.cache.service.IRedisService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -30,6 +34,7 @@ public class JtVenueSubscribeTask {
     private final IJtOrderService jtOrderService;
     private final IVenueService venueService;
     private final JtDingTalkFactory jtDingTalkFactory;
+    private final IRedisService redisService;
 
     @XxzJob(name = "jtVenueSubscribeTask")
     @GetMapping("/jtVenueSubscribeTask")
@@ -43,7 +48,10 @@ public class JtVenueSubscribeTask {
             return;
         }
         List<VenueInfoDO> venueInfoDOS = venueService.queryTomorrowCanBuyVenue();
-        Map<String, List<VenueInfoDO>> venueInfoMap = venueInfoDOS.stream().filter(VenueInfoUtils::get8210VenueInfo).collect(Collectors.groupingByConcurrent(VenueInfoDO::getPlaceName));
+        Map<String, List<VenueInfoDO>> venueInfoMap = venueInfoDOS.stream()
+                .filter(VenueInfoUtils::get8210VenueInfo)
+                .filter(item -> !StringUtils.contains(item.getPlaceName(), "小馆"))
+                .collect(Collectors.groupingByConcurrent(VenueInfoDO::getPlaceName));
         if (MapUtils.isEmpty(venueInfoMap)) {
             log.info("暂无可下单场地，time:{}", System.currentTimeMillis());
             return;
@@ -51,13 +59,23 @@ public class JtVenueSubscribeTask {
 
         users.parallelStream().forEach(user -> {
             try {
-                for (String placeName : venueInfoMap.keySet()) {
+                List<String> placeNameList = venueInfoMap.keySet().stream().sorted(Comparator.comparing(VenueInfoUtils::sortVenueInfo)).toList();
+                for (String placeName : placeNameList) {
                     List<VenueInfoDO> venueInfoDOList = venueInfoMap.get(placeName);
                     for (int i = 0; i < 10; i++) {
+                        String valid = (String) redisService.get(RedisKeyConstant.getVenueSubscribeKey(placeName));
+                        if (StringUtils.isNotBlank(valid)) {
+                            break;
+                        }
                         boolean order = jtOrderService.createOrder(venueInfoDOList, user);
                         if (order) {
                             return;
                         }
+                        try {
+                            Thread.sleep(1250);
+                        } catch (InterruptedException e) {
+                            log.error("睡眠失败～～～");
+                        }
                     }
                 }
             } catch (Exception e) {

xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenueTomorrowPullTask.java

@@ -16,7 +16,6 @@ import com.xiang.xservice.basic.utils.DateUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -78,7 +77,7 @@ public class JtVenueTomorrowPullTask {
             }
             map.put(sitePositionList.getPlaceName(), sitePositionList);
         }
-        StringBuffer msg = new StringBuffer("查询江体场地信息===>时间:\n" + DateUtils.getDateFromDate(LocalDate.now().plusDays(1)) + " 20:00-22:00\n");
+        StringBuffer msg = new StringBuffer("查询江体场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now().plusDays(1)) + " 20:00-22:00\n");
         map.forEach((placeName, sitePositionList) -> {
             msg.append(placeName).append("订购人：").append(sitePositionList.getContacts()).append("\n");
         });

xservice-server/src/main/resources/application-local.yml

@@ -4,7 +4,10 @@ spring:
       discovery:
         group: DEFAULT_GROUP
         namespace: 00131110-3ecb-4a35-8bbb-624edde1d937
-        server-addr: general.xiangtech.xyz:8848
+        server-addr: http://192.168.1.10:8848
+
+        # 是否启用健康检查
+        register-enabled: true
         username: nacos
         password: nacos
   datasource:

xservice-server/src/main/resources/application-outside.yml

@@ -0,0 +1,47 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        group: DEFAULT_GROUP
+        namespace: 00131110-3ecb-4a35-8bbb-624edde1d937
+        server-addr: http://general.xiangtech.xyz:8848
+        # 是否启用健康检查
+        register-enabled: false
+        username: nacos
+        password: nacos
+  datasource:
+    dynamic:
+      primary: master
+      datasource:
+        master:
+          url: jdbc:mysql://120.27.153.87:3306/xservice_cornucopia?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          username: cornucopia
+          password: cornucopia@123
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          sshConnect: false
+  redis:
+    host: r-bp1wt59a6nfyt4e3ltpd.redis.rds.aliyuncs.com
+    port: 6379
+    password: Xiang0000  # 如果无密码可以省略
+    database: 10
+    timeout: 5000
+    lettuce:
+      pool:
+        max-active: 8
+        max-idle: 8
+        min-idle: 0
+        max-wait: 1000
+xxz-job:
+  app-name: xservice-cornucopia
+  admin-address: http://192.168.1.10:10001
+  namespace: 1
+
+dingtalk:
+  robot:
+    properties:
+      venue:
+        name: 江南体育中心通知群
+        token: 6a218646972c684c75832b0229ea93a234778af537d7469ce96bef290faf530e
+        secret: SEC9018755ba86d3e5c1ed2fbfa1d6953d84bb2a6c8ebe7ed4e318457bfed5e0465
+        users:
+          - 450841600726084717

xservice-server/src/main/resources/application-prod.yml

@@ -4,7 +4,9 @@ spring:
       discovery:
         group: DEFAULT_GROUP
         namespace: 6f603892-e9f7-4ca4-acbc-538fa09ebec0
-        server-addr: general.xiangtech.xyz:8848
+        server-addr: http://192.168.32.3:8848
+        # 是否启用健康检查
+        register-enabled: true
         username: nacos
         password: nacos
   datasource:

xservice-server/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: local
   application:
     name: xservice-cornucopia
   main: