From 7ad6e5c924a41fd74694a856c52e6d2f17bc1bd5 Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Tue, 21 Jan 2025 12:43:59 +0800 Subject: [PATCH] dhl --- src/main/java/com/example/demo/domain/entity/DetailY.java | 1 - src/main/java/com/example/demo/mapper/DetailYMapper.java | 2 +- src/main/java/com/example/demo/security/SecurityConfig.java | 2 +- src/main/java/com/example/demo/security/TokenFilter.java | 3 ++- src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java | 8 +++++++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/example/demo/domain/entity/DetailY.java b/src/main/java/com/example/demo/domain/entity/DetailY.java index c6e541c..c035051 100644 --- a/src/main/java/com/example/demo/domain/entity/DetailY.java +++ b/src/main/java/com/example/demo/domain/entity/DetailY.java @@ -36,7 +36,6 @@ public class DetailY implements Serializable { private Integer updateType; private Integer detailFlag; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; private Date endDate; diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java index 2942ad2..b4ff888 100644 --- a/src/main/java/com/example/demo/mapper/DetailYMapper.java +++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java @@ -21,7 +21,7 @@ public interface DetailYMapper { "insert into detail_y \n" + "(jwcode, order_code, activity_id, recharge_way, product_id, consume_platform, consume_type, refund_type, refund_goods, name, username, area, contact_id, remark, recharge_coin, free_coin, task_coin, admin_id, update_type, detail_flag, create_time, first_recharge,product_name)\n" + "values \n" + - "(#{jwcode}, #{orderCode}, #{activityId}, #{rechargeWay}, #{productId}, #{consumePlatform}, #{consumeType}, #{refundType}, #{refundGoods}, #{name}, #{username}, #{area}, #{contactId}, #{remark}, #{rechargeCoin}, #{freeCoin}, #{taskCoin}, #{adminId}, #{updateType}, 1, now(), #{firstRecharge},#{productName})" + "(#{jwcode}, #{orderCode}, #{activityId}, #{rechargeWay}, #{productId}, #{consumePlatform}, #{consumeType}, #{refundType}, #{refundGoods},'小洪', #{username}, #{area}, #{contactId}, #{remark}, #{rechargeCoin}, #{freeCoin}, #{taskCoin}, #{adminId}, #{updateType}, 1, #{createTime}, #{firstRecharge},#{productName})" }) @Options(useGeneratedKeys = true,keyColumn = "detaily_id",keyProperty = "detailyId") int add(DetailY detaily); diff --git a/src/main/java/com/example/demo/security/SecurityConfig.java b/src/main/java/com/example/demo/security/SecurityConfig.java index 2615897..3275c91 100644 --- a/src/main/java/com/example/demo/security/SecurityConfig.java +++ b/src/main/java/com/example/demo/security/SecurityConfig.java @@ -60,7 +60,7 @@ public class SecurityConfig { request .requestMatchers( HttpMethod.POST, // 用户不登录就可以访问的路径 - "/admin/login","/upload/**").permitAll() + "/admin/login","/upload/**","/detailY/ERP").permitAll() .requestMatchers( "/error","alipay/**","/upload/**" ).permitAll() diff --git a/src/main/java/com/example/demo/security/TokenFilter.java b/src/main/java/com/example/demo/security/TokenFilter.java index 92de2aa..1d6299d 100644 --- a/src/main/java/com/example/demo/security/TokenFilter.java +++ b/src/main/java/com/example/demo/security/TokenFilter.java @@ -229,10 +229,11 @@ public class TokenFilter extends OncePerRequestFilter { protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { // 检查是否是上传请求 + boolean isErpRequest = request.getRequestURI().startsWith("/ERP") || request.getRequestURI().contains("ERP"); boolean isUploadRequest = request.getRequestURI().startsWith("/upload"); System.out.println(request.getRequestURI()); System.out.println(isUploadRequest); - if (isUploadRequest) { + if (isUploadRequest ) { // 如果是上传请求，直接将请求传递给下一个过滤器或目标资源 filterChain.doFilter(request, response); return; diff --git a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java index 46e8ffe..13b2080 100644 --- a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java @@ -123,7 +123,6 @@ public class OtherServiceImpl implements OtherService { String desjwcode= des.encrypt(JwCode); System.out.println("desjwcode:"+desjwcode); - // 创建 JSON 请求体 Map requestBody = new HashMap<>(); requestBody.put("jwcode", desjwcode); @@ -184,6 +183,7 @@ public class OtherServiceImpl implements OtherService { detailY.setConsumePlatform("ERP系统"); detailY.setRechargeWay(Way); detailY.setArea(country); + detailY.setCreateTime(erp.getCreateTime()); detailY.setUsername(name); @@ -203,6 +203,8 @@ public class OtherServiceImpl implements OtherService { detailY.setProductName(productName); detailY.setConsumePlatform("ERP系统"); detailY.setConsumeType(Way); + + detailY.setCreateTime(erp.getCreateTime()); } else if (typesToUpdateTwo.contains(type)) { System.out.println("退款------------------------------------------------------"); detailY.setUpdateType(2); // 设置 updateType 为 2 @@ -217,6 +219,8 @@ public class OtherServiceImpl implements OtherService { detailY.setProductName(productName); detailY.setConsumePlatform("ERP系统"); detailY.setRefundType(Way); + + detailY.setCreateTime(erp.getCreateTime()); }else if (typesToUpdateThree.contains(type)) { System.out.println("其他------------------------------------------------------"); detailY.setUpdateType(3); // 设置 updateType 为 3 @@ -231,6 +235,8 @@ public class OtherServiceImpl implements OtherService { detailY.setProductName(productName); detailY.setConsumePlatform("ERP系统"); detailY.setReson(Way); + + detailY.setCreateTime(erp.getCreateTime()); } // 添加其他业务逻辑 System.out.println(detailY+"-----测试能否传输------");