diff --git a/pom.xml b/pom.xml index 8203b8c..258250f 100644 --- a/pom.xml +++ b/pom.xml @@ -12,10 +12,14 @@ jd-wx + 17 3.1.5 - + 17 + 17 + + @@ -46,9 +50,9 @@ - mysql - mysql-connector-java - runtime + com.mysql + mysql-connector-j + 8.0.33 org.apache.rocketmq @@ -82,7 +86,7 @@ cn.hutool hutool-all - 5.8.8 + 5.8.24 @@ -108,31 +112,27 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - cn.van.Application - - - - org.apache.maven.plugins - maven-compiler-plugin - - 17 - 17 - - - - - - - maven-local88 - Local Repository - http://192.168.8.88:8081/repository/maven-local88/ - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 17 + + --enable-preview + + + + + + + + + + + + + diff --git a/src/main/java/cn/van/business/controller/jd/OrderController.java b/src/main/java/cn/van/business/controller/jd/OrderController.java index 7216899..8e42a90 100644 --- a/src/main/java/cn/van/business/controller/jd/OrderController.java +++ b/src/main/java/cn/van/business/controller/jd/OrderController.java @@ -3,11 +3,11 @@ package cn.van.business.controller.jd; import cn.van.business.mq.MessageProducerService; import cn.van.business.util.JDUtil; import com.alibaba.fastjson2.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; /** * @author Leo @@ -20,9 +20,9 @@ import javax.annotation.Resource; public class OrderController { public static String TOKEN = "cc0313"; - @Resource + @Autowired private JDUtil jdUtils; - @Resource + @Autowired private MessageProducerService messageProducerService; public boolean checkToken(String token) { diff --git a/src/main/java/cn/van/business/model/jd/GoodsInfoVO.java b/src/main/java/cn/van/business/model/jd/GoodsInfoVO.java index 2ea06f0..a033775 100644 --- a/src/main/java/cn/van/business/model/jd/GoodsInfoVO.java +++ b/src/main/java/cn/van/business/model/jd/GoodsInfoVO.java @@ -1,6 +1,6 @@ package cn.van.business.model.jd; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author Leo diff --git a/src/main/java/cn/van/business/model/jd/OrderRow.java b/src/main/java/cn/van/business/model/jd/OrderRow.java index 9d6bde0..4b39a96 100644 --- a/src/main/java/cn/van/business/model/jd/OrderRow.java +++ b/src/main/java/cn/van/business/model/jd/OrderRow.java @@ -7,7 +7,9 @@ package cn.van.business.model.jd; * @description： */ -import javax.persistence.*; +import jakarta.persistence.*; +import jakarta.persistence.TemporalType; + import java.util.Date; @Entity diff --git a/src/main/java/cn/van/business/model/wx/Setting.java b/src/main/java/cn/van/business/model/wx/Setting.java index 15f456c..f93b69c 100644 --- a/src/main/java/cn/van/business/model/wx/Setting.java +++ b/src/main/java/cn/van/business/model/wx/Setting.java @@ -1,10 +1,9 @@ package cn.van.business.model.wx; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; -import javax.persistence.*; - @Getter @Setter @Entity diff --git a/src/main/java/cn/van/business/model/wx/WxMessageDataForChat.java b/src/main/java/cn/van/business/model/wx/WxMessageDataForChat.java index 16c3698..1b063e7 100644 --- a/src/main/java/cn/van/business/model/wx/WxMessageDataForChat.java +++ b/src/main/java/cn/van/business/model/wx/WxMessageDataForChat.java @@ -1,9 +1,9 @@ package cn.van.business.model.wx; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; -import javax.persistence.*; @Getter @Setter diff --git a/src/main/java/cn/van/business/model/wx/WxMessageDataForTransfer.java b/src/main/java/cn/van/business/model/wx/WxMessageDataForTransfer.java index 77dffc7..3be89c6 100644 --- a/src/main/java/cn/van/business/model/wx/WxMessageDataForTransfer.java +++ b/src/main/java/cn/van/business/model/wx/WxMessageDataForTransfer.java @@ -1,9 +1,9 @@ package cn.van.business.model.wx; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; -import javax.persistence.*; import java.math.BigDecimal; @Getter diff --git a/src/main/java/cn/van/business/model/wx/WxUser.java b/src/main/java/cn/van/business/model/wx/WxUser.java index 2d83a62..b7241f6 100644 --- a/src/main/java/cn/van/business/model/wx/WxUser.java +++ b/src/main/java/cn/van/business/model/wx/WxUser.java @@ -1,9 +1,9 @@ package cn.van.business.model.wx; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; -import javax.persistence.*; import java.math.BigDecimal; @Getter diff --git a/src/main/java/cn/van/business/util/OrderUtil.java b/src/main/java/cn/van/business/util/OrderUtil.java index abc47fd..c2bc47f 100644 --- a/src/main/java/cn/van/business/util/OrderUtil.java +++ b/src/main/java/cn/van/business/util/OrderUtil.java @@ -10,11 +10,9 @@ import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.text.SimpleDateFormat; import static cn.van.business.util.WXUtil.getWxidFromJdid; -import static cn.van.business.util.WXUtil.jdidToWxidMap; /** @@ -30,7 +28,7 @@ public class OrderUtil { private StringRedisTemplate redisTemplate; @Autowired private OrderRowRepository orderRowRepository; - @Resource + @Autowired private WXUtil wxUtil; //标记唯一订单行：订单+sku维度的唯一标识 private static final String ORDER_ROW_KEY = "jd:order:row:";