commit

PddServer/pom.xml

@@ -47,6 +47,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
 
         <!-- mysql -->
         <dependency>

PddServer/src/main/java/org/ta/pddserver/config/APIFilter.java

@@ -2,13 +2,15 @@ package org.ta.pddserver.config;
 
 import jakarta.servlet.*;
 import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;
+import org.ta.pddserver.utils.JsonResponse;
 
 import java.io.IOException;
 
 @WebFilter(
-        urlPatterns = {"/apis/*"}, filterName = "apiFilter"
+        urlPatterns = {"/hj-api/*"}, filterName = "apiFilter"
 )
 @Order(1)
 @Slf4j
@@ -22,6 +24,12 @@ public class APIFilter implements Filter {
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
         log.info("API 开始处理请求，过滤数据");
+
+        HttpServletRequest  request = (HttpServletRequest) servletRequest;
+        String url = request.getRequestURI();
+        log.info("url = {}", url);
+        filterChain.doFilter(servletRequest, servletResponse);
+
     }
 
 

PddServer/src/main/java/org/ta/pddserver/config/ApiConfig.java

+package org.ta.pddserver.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class ApiConfig implements WebMvcConfigurer {
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**") // 对所有路径应用CORS配置
+                .allowedOrigins("http://localhost:8021", "http://ppd-jy-cc.linyihai-dt.com") // 允许的源
+                .allowedMethods("GET", "POST", "PUT", "DELETE") // 允许的方法
+                .allowedHeaders("*") // 允许的头部
+                .allowCredentials(true) // 是否发送cookies等凭证信息
+                .exposedHeaders("Authorization", "st", "ms", "Set-Cookie", "Cookie")
+                .maxAge(3600); // 预检请求的缓存时间（秒）
+    }
+
+
+
+//    @Override
+//    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+//        registry.addResourceHandler("/static/**").addResourceLocations("http://localhost:8021/");
+//        registry.addResourceHandler("/templates/**").addResourceLocations("http://localhost:8021/");
+//    }
+}

PddServer/src/main/java/org/ta/pddserver/config/RepeatedlyReadFilter.java

@@ -2,11 +2,13 @@ package org.ta.pddserver.config;
 
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 
 @Component
+@Slf4j
 public class RepeatedlyReadFilter implements Filter {
     @Override
     public void init(FilterConfig filterConfig) {
@@ -22,5 +24,7 @@ public class RepeatedlyReadFilter implements Filter {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        log.info("RepeatedlyReadFilter doFilter ok");
     }
+
 }

PddServer/src/main/java/org/ta/pddserver/config/security/JwtAuthFilter.java

+package org.ta.pddserver.config.security;
+
+import jakarta.annotation.Resource;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import java.io.IOException;
+
+@Component
+@RequiredArgsConstructor
+public class JwtAuthFilter extends OncePerRequestFilter {
+    private final JwtUtils jwtUtils;
+    @Resource
+    private final UserDetailsServiceImpl userDetailsService;
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+        try {
+            String jwt = parseJwt(request);
+            String username = jwtUtils.extractUsername(jwt);
+            UserDetails userDetails = userDetailsService.loadUserByUsername(username);
+            if (jwt != null && jwtUtils.validateToken(jwt, userDetails)) {
+                UsernamePasswordAuthenticationToken authentication =
+                        new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
+                authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+                SecurityContextHolder.getContext().setAuthentication(authentication);
+            }
+        } catch (Exception e) {
+            logger.error("无法设置用户认证: {}", e);
+        }
+        filterChain.doFilter(request, response);
+    }
+
+    private String parseJwt(HttpServletRequest request) {
+        String headerAuth = request.getHeader("Authorization");
+        if (headerAuth != null && headerAuth.startsWith("HJAuth ")) {
+            return headerAuth.substring(7);
+        }
+        return null;
+    }
+
+}

PddServer/src/main/java/org/ta/pddserver/config/security/JwtUtils.java

+package org.ta.pddserver.config.security;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Component;
+@Component
+public class JwtUtils {
+//    @Value("${app.jwt.secret}")
+    private String secret = "Allen";
+//    @Value("${app.jwt.expiration}")
+    private long expiration = 3600 * 18;
+    public String generateToken(UserDetails userDetails) {
+        return userDetails.getUsername() + ":" + userDetails.getPassword();
+    }
+    public String extractUsername(String token) {
+        return token.split(":")[0];
+    }
+    public boolean validateToken(String token, UserDetails userDetails) {
+        final String username = extractUsername(token);
+        return (username.equals(userDetails.getUsername())) && !isTokenExpired(token);
+    }
+    private boolean isTokenExpired(String token) {
+        return false;
+    }
+
+    @Bean
+    PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+}

PddServer/src/main/java/org/ta/pddserver/config/security/SecurityConfig.java

+package org.ta.pddserver.config.security;
+
+import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+@Configuration
+@EnableWebSecurity
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+@RequiredArgsConstructor
+public class SecurityConfig {
+    @Resource
+    private UserDetailsServiceImpl userDetailsService;
+    @Resource
+    private JwtAuthFilter jwtAuthFilter;
+
+
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http.csrf(csrf -> csrf.disable())
+                .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .authorizeHttpRequests(auth -> auth
+                        .requestMatchers("/hj-api/**", "/api/auth/login").permitAll()
+//                        .requestMatchers("/hj-api/*").hasRole("ADMIN")
+                        .requestMatchers("/test/**").hasAnyRole("ADMIN", "USER")
+                        .anyRequest().authenticated()
+                )
+                .addFilterBefore(jwtAuthFilter, UsernamePasswordAuthenticationFilter.class)
+                .userDetailsService(userDetailsService);
+        return http.build();
+    }
+
+    @Bean
+    public AuthenticationManager authenticationManager(AuthenticationConfiguration config) throws Exception {
+        return config.getAuthenticationManager();
+    }
+}

PddServer/src/main/java/org/ta/pddserver/config/security/UserDetailsServiceImpl.java

+package org.ta.pddserver.config.security;
+
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Component;
+import org.ta.pddserver.entity.UserEntity;
+import org.ta.pddserver.service.impl.UserImpl;
+
+@Slf4j
+@Component
+public class UserDetailsServiceImpl implements UserDetailsService {
+
+    @Resource
+    private UserImpl userService;
+    @Resource
+    PasswordEncoder passwordEncoder;
+
+
+
+    @Override
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+
+        log.info("UserDetailsManager loadUserByUsername username={}", username);
+        UserEntity userEntity = userService.getInfoByAccount(username);
+
+        if (userEntity == null) {
+            log.info("UserDetailsManager loadUserByUsername user is null");
+            //用户不存在，抛出异常
+            throw new UsernameNotFoundException(username);
+        } else {
+            log.info("UserDetailsManager loadUserByUsername user is find! " + passwordEncoder.encode(userEntity.getPassword()));
+            return org.springframework.security.core.userdetails.User.withUsername(userEntity.getAccount())
+                    .password(passwordEncoder.encode(userEntity.getPassword()))
+                    .roles("ADMIN", "USER")
+                    .authorities("delete", "update", "read", "edit")
+                    .build();
+        }
+    }
+}

PddServer/src/main/java/org/ta/pddserver/controller/AuthController.java

+package org.ta.pddserver.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.*;
+import org.ta.pddserver.config.security.JwtUtils;
+import org.ta.pddserver.model.api.request.UserRequest;
+import org.ta.pddserver.utils.JsonResponse;
+
+@RestController
+@RequestMapping("/auth")
+@RequiredArgsConstructor
+public class AuthController {
+    private final AuthenticationManager authenticationManager;
+    private final JwtUtils jwtUtils;
+    @PostMapping("/login")
+    public ResponseEntity<JSONObject> login(@RequestBody UserRequest loginRequest) {
+        Authentication authentication = authenticationManager.authenticate(
+                new UsernamePasswordAuthenticationToken(
+                        loginRequest.getAccount(),
+                        loginRequest.getPassword()
+                )
+        );
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+        UserDetails userDetails = (UserDetails) authentication.getPrincipal();
+        String jwt = jwtUtils.generateToken(userDetails);
+        return ResponseEntity.ok( JsonResponse.generateLocalCommonSuccessResponse( userDetails.getUsername(), jwt));
+    }
+}

PddServer/src/main/java/org/ta/pddserver/controller/PddLocalController.java

@@ -9,6 +9,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.ta.pddserver.config.PddAPIConfig;
 import org.ta.pddserver.entity.*;
@@ -34,6 +35,8 @@ import java.util.*;
 @Slf4j
 @RestController
 @Tag(name = "业务对接接口", description = "仓库系统对接本接口")
+@RequestMapping("/hj-api/")
+
 public class PddLocalController {
 
 
@@ -101,6 +104,7 @@ public class PddLocalController {
             description = "",
             deprecated = false      // 是否废弃
     )
+//    @PreAuthorize("hasAnyAuthority('ADMIN', 'read')")
     @PostMapping("/logOrderList")
     public JSONObject logOrderList(HttpServletRequest request, @RequestBody LogOrderListRequest logOrderListRequest) {
         return JsonResponse.generateLocalCommonSuccessResponse(logOrderImpl.getListByRequest(logOrderListRequest), "");
@@ -345,79 +349,6 @@ public class PddLocalController {
             notifyResult.setCode(0);
             logOrderMailDetailIoEntity.setStatus(StatusEnum.SIGNED.getCode());
 
-            //根据logisticsOrderCode 判断是否已存放
-
-            StorageEntity storageEntity = storageImpl.getInfoByLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
-
-            if (storageEntity == null) {
-                //计算存储位置
-                List<AreaEntity> list = areaImpl.getList();
-                String code = null;
-                int sub = 0;
-                //需要数量
-                int need = logOrderMailDetailImpl.findCountByLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
-
-                for (AreaEntity lists : list) {
-                    // 根据code 计算占用
-                    //获取所有入库数量
-                    int num = storageImpl.findAllCount(lists.getCode());
-                    //获取所有应入库但未入库数量
-                    Integer reNum = storageImpl.findReNumCount(lists.getCode());
-                    reNum = (reNum == null) ? 0 : reNum;
-                    // 区域总可用数量
-                    int blank = lists.getTotal() - lists.getReserved();
-                    // 实际可使用数量
-                    int actual = blank - reNum - num;
-
-                    if (actual >= need) {
-                        if (actual > sub) {
-                            sub = actual;
-                            code = lists.getCode();
-                        }
-                        key = true;
-
-                        break;
-                    }
-                }
-
-                if (!key) {
-                    //没有匹配到合适区域
-                    return JsonResponse.generateLocalCommonFailedResponse("-1", "暂无可用区域");
-                } else {
-                    //区域可用
-                    storageEntity = new StorageEntity();
-                    storageEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
-                    storageEntity.setCode(code);
-                    storageEntity.setMailNo(receiveRequest.getMailNo());
-                    storageEntity.setNum(1);
-                    storageEntity.setTotal(need);
-                    storageImpl.save(storageEntity);
-                }
-
-            } else {
-
-                StorageEntity storage = storageImpl.getInfoByMailNo(receiveRequest.getMailNo());
-                if (storage == null) {
-                    StorageEntity storageNew = new StorageEntity();
-                    storageNew.setLogisticsOrderCode(storageEntity.getLogisticsOrderCode());
-                    storageNew.setCode(storageEntity.getCode());
-                    storageNew.setMailNo(receiveRequest.getMailNo());
-                    storageNew.setNum(storageEntity.getNum());
-                    storageNew.setTotal(storageEntity.getTotal());
-                    storageImpl.save(storageNew);
-
-
-                    //获取已签收
-
-                    //已签收 + 1
-                    storageImpl.updateNumByLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
-
-                } else {
-                    return JsonResponse.generateLocalCommonFailedResponse("-1", "请勿重复签收");
-                }
-
-            }
-
             str = "签收成功";
 
         } else if (action.equals("warehouse_reject_sign")) {
@@ -585,6 +516,76 @@ public class PddLocalController {
         }
 
         logOrderImpl.updateById(logOrderEntity);
+        //根据logisticsOrderCode 判断是否已存放
+
+        StorageEntity storageEntity = storageImpl.getInfoByLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+
+        if (storageEntity == null) {
+            //计算存储位置
+            List<AreaEntity> list = areaImpl.getList();
+            String code = null;
+            int sub = 0;
+            //需要数量
+            int need = logOrderMailDetailImpl.findCountByLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+            boolean key = false;
+            for (AreaEntity lists : list) {
+                // 根据code 计算占用
+                //获取所有入库数量
+                int num2 = storageImpl.findAllCount(lists.getCode());
+                //获取所有应入库但未入库数量
+                Integer reNum = storageImpl.findReNumCount(lists.getCode());
+                reNum = (reNum == null) ? 0 : reNum;
+                // 区域总可用数量
+                int blank = lists.getTotal() - lists.getReserved();
+                // 实际可使用数量
+                int actual = blank - reNum - num2;
+
+                if (actual >= need) {
+                    if (actual > sub) {
+                        sub = actual;
+                        code = lists.getCode();
+                    }
+                    key = true;
+                }
+            }
+
+            if (!key) {
+                //没有匹配到合适区域
+                return JsonResponse.generateLocalCommonFailedResponse("-1", "暂无可用区域");
+            } else {
+                //区域可用
+                storageEntity = new StorageEntity();
+                storageEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+                storageEntity.setCode(code);
+                storageEntity.setMailNo(inBoundRequest.getMailNo());
+                storageEntity.setNum(1);
+                storageEntity.setTotal(need);
+                storageImpl.save(storageEntity);
+            }
+
+        } else {
+
+            StorageEntity storage = storageImpl.getInfoByMailNo(inBoundRequest.getMailNo());
+            if (storage == null) {
+                StorageEntity storageNew = new StorageEntity();
+                storageNew.setLogisticsOrderCode(storageEntity.getLogisticsOrderCode());
+                storageNew.setCode(storageEntity.getCode());
+                storageNew.setMailNo(inBoundRequest.getMailNo());
+                storageNew.setNum(storageEntity.getNum());
+                storageNew.setTotal(storageEntity.getTotal());
+                storageImpl.save(storageNew);
+
+
+                //获取已签收
+
+                //已签收 + 1
+                storageImpl.updateNumByLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+
+            } else {
+                return JsonResponse.generateLocalCommonFailedResponse("-1", "请勿重复签收");
+            }
+
+        }
 
         return JsonResponse.generateLocalCommonSuccessResponse(true, "");
     }
@@ -839,8 +840,6 @@ public class PddLocalController {
         return JsonResponse.generateLocalCommonSuccessResponse(true, "");
     }
 
-    /*收到出库通知后 开始拣货 拣货完成 */
-
     /**
      * 拣货异常
      */
@@ -982,7 +981,6 @@ public class PddLocalController {
         return JsonResponse.generateLocalCommonSuccessResponse(true, "");
     }
 
-
     /*拣货完成后出库*/
     @Operation(
             summary = "拣货完成后出库",
@@ -1082,60 +1080,60 @@ public class PddLocalController {
         notifyRequest.getSenderDetail().setDetailAddress(collectOrderSendEntity.getDetailAddress());
 
 
-//        CollectReceiverDetailEntity collectReceiverDetailEntity = collectReceiverDetailImpl.getInfoByOrderCode(outBoundRequest.getOrderCode());
-//        notifyRequest.setReceiverDetail(new PddServiceConsoOutboundRequest.ReceiverDetail());
-//        notifyRequest.getReceiverDetail().setName(collectReceiverDetailEntity.getName());
-//        notifyRequest.getReceiverDetail().setTelePhone(collectReceiverDetailEntity.getTelePhone());
-//        notifyRequest.getReceiverDetail().setCountry(collectReceiverDetailEntity.getCountry());
-//        notifyRequest.getReceiverDetail().setProvince(collectReceiverDetailEntity.getProvince());
-//        notifyRequest.getReceiverDetail().setCity(collectReceiverDetailEntity.getCity());
-//        notifyRequest.getReceiverDetail().setDistrict(collectReceiverDetailEntity.getDistrict());
-//        notifyRequest.getReceiverDetail().setDetailAddress(collectReceiverDetailEntity.getDetailAddress());
-//
-//        notifyRequest.setResult(new PddServiceConsoOutboundRequest.Result());
-//        notifyRequest.getResult().setCode(0);
-
-
-//        log.info("derelictionRequest:{}", JSON.toJSONString(notifyRequest));
-//        JYBaseRequestModel requestModel = new JYBaseRequestModel();
-//        requestModel.setRequest(JSON.toJSONString(notifyRequest));
-//        requestModel.setRequest_id("" + new Date().getTime());
-//        requestModel.setType("pdd.service.conso.outbound");
-//        requestModel.setTarget_client_id(PddAPIConfig.CLIENT_ID);
-//        requestModel.setClient_id(PddAPIConfig.CLIENT_ID);
-//        long time = new Date().getTime() / 1000;
-//        requestModel.setTimestamp(time);
-//        requestModel.setSign(PddSignTool.generateSign(requestModel, PddAPIConfig.CLIENT_SECRET));
-//        String resp = PddHttpTool.sendJsonPost(requestModel);
-//        JSONObject jsonObject = JSON.parseObject(resp);
-//        JSONObject respObject = (JSONObject) jsonObject.get("response");
-//        if (!respObject.getBoolean("success")) {
-//            return JsonResponse.generateOpenCommonFailedResponse(-1, "拼多多订单出库失败");
-//        }
-//        WorldexUtil.noticePddOrderOut(notifyRequest.getOrderCode());
-//        if (outBoundRequest.getOutPackageList() != null && outBoundRequest.getOutPackageList().size() > 0) {
-//            for (OutBoundRequest.OutPackage outPackage : outBoundRequest.getOutPackageList()) {
-//                LogOrderMailDetailIoEntity logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
-//                logOrderMailDetailIoEntity.setMailNo(outPackage.getMailNo());
-//                logOrderMailDetailIoEntity.setExpressCode(outPackage.getExpressCode());
-//                logOrderMailDetailIoEntity.setLogisticsOrderCode(outBoundRequest.getOrderCode());
-//                logOrderMailDetailIoEntity.setExpressCode(outPackage.getExpressCode());
-//                logOrderMailDetailIoEntity.setStatus(StatusEnum.FINISHOUTBOUND.getCode());
-//                logOrderMailDetailIoEntity.setAction("FINISHOUTBOUND");
-//                logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
-//                logOrderMailDetailIoEntity.setResp(resp);
-//                if (outPackage.getOutBound() != null && outPackage.getOutBound().size() > 0) {
-//                    logOrderMailDetailIoEntity.setRemarks(JSONObject.toJSONString(outPackage.getOutBound()));
-//                }
-//                logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
-//
-//                //更新collect_mail_detail
-//                for (CollectMailDetailEntity lists : list) {
-//                    Boolean result = collectMailDetailImpl.updateByMailNo(lists.getMailNo(), logOrderMailDetailIoEntity.getStatus());
-//                }
-//            }
-//        }
-//        collectOrderImpl.updateOrderStatus(StatusEnum.FINISHOUTBOUND.getCode(), collectOrderResponse.getUid());
+        CollectReceiverDetailEntity collectReceiverDetailEntity = collectReceiverDetailImpl.getInfoByOrderCode(outBoundRequest.getOrderCode());
+        notifyRequest.setReceiverDetail(new PddServiceConsoOutboundRequest.ReceiverDetail());
+        notifyRequest.getReceiverDetail().setName(collectReceiverDetailEntity.getName());
+        notifyRequest.getReceiverDetail().setTelePhone(collectReceiverDetailEntity.getTelePhone());
+        notifyRequest.getReceiverDetail().setCountry(collectReceiverDetailEntity.getCountry());
+        notifyRequest.getReceiverDetail().setProvince(collectReceiverDetailEntity.getProvince());
+        notifyRequest.getReceiverDetail().setCity(collectReceiverDetailEntity.getCity());
+        notifyRequest.getReceiverDetail().setDistrict(collectReceiverDetailEntity.getDistrict());
+        notifyRequest.getReceiverDetail().setDetailAddress(collectReceiverDetailEntity.getDetailAddress());
+
+        notifyRequest.setResult(new PddServiceConsoOutboundRequest.Result());
+        notifyRequest.getResult().setCode(0);
+
+
+        log.info("derelictionRequest:{}", JSON.toJSONString(notifyRequest));
+        JYBaseRequestModel requestModel = new JYBaseRequestModel();
+        requestModel.setRequest(JSON.toJSONString(notifyRequest));
+        requestModel.setRequest_id("" + new Date().getTime());
+        requestModel.setType("pdd.service.conso.outbound");
+        requestModel.setTarget_client_id(PddAPIConfig.CLIENT_ID);
+        requestModel.setClient_id(PddAPIConfig.CLIENT_ID);
+        long time = new Date().getTime() / 1000;
+        requestModel.setTimestamp(time);
+        requestModel.setSign(PddSignTool.generateSign(requestModel, PddAPIConfig.CLIENT_SECRET));
+        String resp = PddHttpTool.sendJsonPost(requestModel);
+        JSONObject jsonObject = JSON.parseObject(resp);
+        JSONObject respObject = (JSONObject) jsonObject.get("response");
+        if (!respObject.getBoolean("success")) {
+            return JsonResponse.generateOpenCommonFailedResponse(-1, "拼多多订单出库失败");
+        }
+        WorldexUtil.noticePddOrderOut(notifyRequest.getOrderCode());
+        if (outBoundRequest.getOutPackageList() != null && outBoundRequest.getOutPackageList().size() > 0) {
+            for (OutBoundRequest.OutPackage outPackage : outBoundRequest.getOutPackageList()) {
+                LogOrderMailDetailIoEntity logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
+                logOrderMailDetailIoEntity.setMailNo(outPackage.getMailNo());
+                logOrderMailDetailIoEntity.setExpressCode(outPackage.getExpressCode());
+                logOrderMailDetailIoEntity.setLogisticsOrderCode(outBoundRequest.getOrderCode());
+                logOrderMailDetailIoEntity.setExpressCode(outPackage.getExpressCode());
+                logOrderMailDetailIoEntity.setStatus(StatusEnum.FINISHOUTBOUND.getCode());
+                logOrderMailDetailIoEntity.setAction("FINISHOUTBOUND");
+                logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
+                logOrderMailDetailIoEntity.setResp(resp);
+                if (outPackage.getOutBound() != null && outPackage.getOutBound().size() > 0) {
+                    logOrderMailDetailIoEntity.setRemarks(JSONObject.toJSONString(outPackage.getOutBound()));
+                }
+                logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
+
+                //更新collect_mail_detail
+                for (CollectMailDetailEntity lists : list) {
+                    Boolean result = collectMailDetailImpl.updateByMailNo(lists.getMailNo(), logOrderMailDetailIoEntity.getStatus());
+                }
+            }
+        }
+        collectOrderImpl.updateOrderStatus(StatusEnum.FINISHOUTBOUND.getCode(), collectOrderResponse.getUid());
 
         return JsonResponse.generateLocalCommonSuccessResponse(outBoundRequest.getOutPackageList(), "");
     }
@@ -1343,7 +1341,6 @@ public class PddLocalController {
 
     }
 
-
     /* 问题件反馈 */
     @Operation(
             summary = "问题件反馈",
@@ -1400,7 +1397,6 @@ public class PddLocalController {
 
     }
 
-
     /*区域列表*/
     @PostMapping("/areaList")
     public JSONObject areaList(HttpServletRequest request, @RequestBody AreaListRequest areaListRequest) {
@@ -1452,7 +1448,6 @@ public class PddLocalController {
         return JsonResponse.generateLocalCommonSuccessResponse(true, "上架成功");
     }
 
-
     /*待拆包列表*/
     @PostMapping("/unpackNoticeList")
     public JSONObject unpackNoticeList(HttpServletRequest request, @RequestBody UnpackNoticeListRequest unpackNoticeListRequest) {
@@ -1557,7 +1552,6 @@ public class PddLocalController {
         return JsonResponse.generateLocalCommonSuccessResponse(result, "");
     }
 
-
     // 拆包的临时面单打印
     /*拆包PDF*/
     @PostMapping("/unpackLabel")
@@ -1571,11 +1565,6 @@ public class PddLocalController {
 
         List<UnpackMailDetailEntity> list = unpackMailDetailImpl.getListByCode(unpackNoticeRequest.getOrderCode());
 
-//
-//        if (lottoLabelInfo == null) {
-//            return JsonResponse.generateLocalCommonFailedResponse("-1", "获取快递终端信息异常");
-//        }
-
         byte[] bytes = ImagePdfCollectGenerator.generatePdQRfWithCollectTextImage(orderCode, "拆包", "" + list.size() + "件");
 
 
@@ -1588,7 +1577,6 @@ public class PddLocalController {
         return JsonResponse.generateLocalCommonSuccessResponse(result, "");
     }
 
-
     // 合包的临时面单打印
     /*出库PDF*/
     @PostMapping("/collectLabel")
@@ -1642,7 +1630,6 @@ public class PddLocalController {
         return JsonResponse.generateLocalCommonSuccessResponse(map, "");
     }
 
-
     // 打包后的临时面单打印
     /*出库PDF*/
     @PostMapping("/packageMailLabel")
@@ -1676,7 +1663,6 @@ public class PddLocalController {
         return JsonResponse.generateLocalCommonSuccessResponse(result, "请打印");
     }
 
-
     @PostMapping("/packageComplete")
     public JSONObject packageComplete(HttpServletRequest request, @RequestBody PackageCompleteRequest completeRequest) {
         List<String> mailList = new ArrayList<>();
@@ -1692,8 +1678,6 @@ public class PddLocalController {
             // 存储需要删除的元素
             List<CollectMailDetailEntity> toRemoveList = new ArrayList<>();
             List<String> toRemoveOutBound = new ArrayList<>();
-
-
             for (CollectMailDetailEntity lists : list) {
                 for (String mainNo : mailList) {
                     if (lists.getMailNo().equals(mainNo)) {
@@ -1702,7 +1686,6 @@ public class PddLocalController {
                     }
                 }
             }
-
             list.removeAll(toRemoveList);
             mailList.removeAll(toRemoveOutBound);
 
@@ -1729,7 +1712,7 @@ public class PddLocalController {
             packageDetailImpl.save(detailEntity);
             results.add(detailEntity);
         }
-        if (unpack) {
+        if (!unpack) {
             return JsonResponse.generateLocalCommonSuccessResponse(completeRequest.getOutPackageList(), "打包成功");
         }
         log.info("拆包单，同时发送拆包信息");
@@ -1939,8 +1922,9 @@ public class PddLocalController {
         List<PackageDetailEntity> packageDetailList = packageDetailImpl.getByOrderCode(mailDetailIoSelectResponse.getLogisticsOrderCode());
         CollectOrderEntity collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(mailDetailIoSelectResponse.getLogisticsOrderCode());
         List<CollectMailDetailEntity> collectMailDetailEntityList = collectMailDetailImpl.getListByOrderCode(mailDetailIoSelectResponse.getLogisticsOrderCode());
-        LogOrderEntity logOrderEntity = logOrderImpl.getByOrderCode(mailDetailIoSelectResponse.getLogisticsOrderCode());
-        List<LogOrderMailDetailEntity> logOrderMailDetailEntityList = logOrderMailDetailImpl.getListByCode(mailDetailIoSelectResponse.getLogisticsOrderCode());
+        LogOrderMailDetailEntity logOrderMailDetailEntity = logOrderMailDetailImpl.getAllInfoByMailNo(collectMailDetailEntityList.get(0).getMailNo());
+        LogOrderEntity logOrderEntity = logOrderImpl.getByOrderCode(logOrderMailDetailEntity.getLogisticsOrderCode());
+        List<LogOrderMailDetailEntity> logOrderMailDetailEntityList = logOrderMailDetailImpl.getListByCode(logOrderMailDetailEntity.getLogisticsOrderCode());
 
         Map<String, Object> map = new HashMap<>();
         map.put("mailDetail", mailDetailIoSelectResponse);
@@ -1982,58 +1966,22 @@ public class PddLocalController {
         }
 
         LogOrderEntity logOrderEntity = logOrderImpl.getByOrderCode(logOrderMailDetailEntity.getLogisticsOrderCode());
-
-        UnpackNoticeEntity unpackNoticeEntity = unpackNoticeImpl.getByCode(logOrderMailDetailEntity.getLogisticsOrderCode());
-
-        UnpackMailDetailEntity unpackMailDetailEntity = unpackMailDetailImpl.getByMailNo(mailNoRequest.getMailNo());
-
-        CollectOrderEntity collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(logOrderMailDetailEntity.getLogisticsOrderCode());
-
-        CollectMailDetailEntity collectMailDetail = collectMailDetailImpl.getByMailNo(mailNoRequest.getMailNo());
-
         Map<String, Object> map = new HashMap<>();
-        map.put("logOrderMailDetail", logOrderMailDetailEntity);
         map.put("logOrder", logOrderEntity);
+        map.put("logOrderMailDetail", logOrderMailDetailImpl.getListByCode(logOrderEntity.getLogisticsOrderCode()));
+        UnpackMailDetailEntity unpackMailDetailEntity = unpackMailDetailImpl.getByMailNo(mailNoRequest.getMailNo());
+        if (unpackMailDetailEntity != null) {
+            UnpackNoticeEntity unpackNoticeEntity = unpackNoticeImpl.getByCode(unpackMailDetailEntity.getOrderCode());
             map.put("unpackNotice", unpackNoticeEntity);
-        map.put("unpackMailDetail", unpackMailDetailEntity);
+            map.put("unpackMailDetail", unpackMailDetailImpl.getListByCode(unpackMailDetailEntity.getOrderCode()));
+            CollectOrderEntity collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(unpackNoticeEntity.getOrderCode());
+            if (collectOrderEntity != null) {
                 map.put("collectOrder", collectOrderEntity);
-        map.put("collectMailDetail", collectMailDetail);
-        return JsonResponse.generateLocalCommonSuccessResponse(map, "");
+                map.put("collectMailDetail", collectMailDetailImpl.getListByOrderCode(collectOrderEntity.getOrderCode()));
             }
-
-
-    /* 登录 */
-    @PostMapping("/userLogo")
-    public JSONObject userLogo(HttpServletRequest request, @RequestBody UserRequest userRequest) {
-        if(userRequest.getAccount() == null || userRequest.getPassword() == null){
-            return JsonResponse.generateLocalCommonFailedResponse("-1", "账号或密码为空");
-        }
-
-        UserEntity userEntity = userImpl.getInfoByAccount(userRequest.getAccount());
-
-        if(userEntity == null){
-            return JsonResponse.generateLocalCommonFailedResponse("-1", "账号不存在");
-        }
-
-        if(userEntity.getStatus() != 1){
-            return JsonResponse.generateLocalCommonFailedResponse("-1", "账号状态异常无法登录");
-        }
-
-        if(!userEntity.getPassword().equals(userRequest.getPassword())){
-            return JsonResponse.generateLocalCommonFailedResponse("-1", "密码错误");
         }
 
-        Map<String, Object> result = new HashMap<>();
-        result.put("user", userEntity);
-        OnlineUserData onlineUserData = new OnlineUserData();
-        onlineUserData.setUserId(userEntity.getUid());
-        onlineUserData.setAccount(userEntity.getAccount());
-        onlineUserData.setName(userEntity.getName());
-        request.getSession().setAttribute(OnlineUserData.ONLINE_CLIENT_DATA,onlineUserData);
-
-        request.getSession().setAttribute(userEntity.getUid(),userEntity);
-
-        return JsonResponse.generateLocalCommonSuccessResponse(result, "");
+        return JsonResponse.generateLocalCommonSuccessResponse(map, "");
     }
 
     /* 账号列表 */
@@ -2086,9 +2034,4 @@ public class PddLocalController {
         }
         return JsonResponse.generateLocalCommonSuccessResponse(userEntity,"修改成功");
     }
-
-    @RequestMapping(value = "checkUser", method = RequestMethod.POST)
-    public JSONObject checkUser(HttpServletRequest request) {
-        return userImpl.checkUser(request);
-    }
 }

PddServer/src/main/java/org/ta/pddserver/controller/TestController.java

 package org.ta.pddserver.controller;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.ta.pddserver.entity.LogOrderBuyerDetailEntity;
-import org.ta.pddserver.entity.LogOrderItemEntity;
-import org.ta.pddserver.entity.LogOrderMailDetailEntity;
-import org.ta.pddserver.entity.OrderCreateEntity;
-import org.ta.pddserver.service.impl.LogOrderBuyerDetailImpl;
-import org.ta.pddserver.service.impl.LogOrderItemImpl;
-import org.ta.pddserver.service.impl.LogOrderMailDetailImpl;
-import org.ta.pddserver.service.impl.OrderCreateImpl;
-
-import java.util.List;
+import org.ta.pddserver.config.security.JwtUtils;
+import org.ta.pddserver.model.api.request.UserRequest;
+import org.ta.pddserver.utils.JsonResponse;
 
 @RestController
-//@RequestMapping("/test")
-@Slf4j
+@RequestMapping("/test")
+@RequiredArgsConstructor
 public class TestController {
-
-    @Resource
-    OrderCreateImpl orderCreateImpl;
-    @Resource
-    LogOrderBuyerDetailImpl logOrderBuyerDetailImpl;
-    @Resource
-    LogOrderItemImpl logOrderItemImpl;
-    @Resource
-    LogOrderMailDetailImpl logOrderMailDetailImpl;
-
-
-
-//    @GetMapping("")
-    public String test() {
-        List<OrderCreateEntity> orderCreateEntityList = orderCreateImpl.list();
-        for (OrderCreateEntity orderCreateEntity : orderCreateEntityList) {
-            String logisticsOrderCode = orderCreateEntity.getLogisticsOrderCode();
-            LogOrderBuyerDetailEntity buyerDetailEntity = logOrderBuyerDetailImpl.getByOrderCode(logisticsOrderCode);
-            if (buyerDetailEntity == null) {
-                log.info("{} 缺少购买者详情信息。   ------------", logisticsOrderCode);
-                String buyerDetails =  orderCreateEntity.getBuyerDetail();
-            }
-            List<LogOrderMailDetailEntity> mailDetailEntityList = logOrderMailDetailImpl.getListByCode(logisticsOrderCode);
-            String mailDetails = orderCreateEntity.getMailDetails();
-            JSONArray mailArr = JSONArray.parseArray(mailDetails);
-            if (mailDetailEntityList.size() < mailArr.size()) {
-                log.info("{} 包裹信息异常 应该 {} 个， 现有{}个。", logisticsOrderCode, mailArr.size(), mailDetailEntityList.size());
-//                LogOrderMailDetailEntity mailDetailEntity = new LogOrderMailDetailEntity();
-//                mailDetailEntity.setUid(orderCreateEntity.getUid());
-//                mailDetailEntity.setLogisticsOrderCode(logisticsOrderCode);
-//                mailDetailEntity.setMailNo(mailArr.getJSONObject(0).getString("mailNo"));
-//                mailDetailEntity.setExpressCode(mailArr.getJSONObject(0).getString("expressCode"));
-//                mailDetailEntity.setStatus(1);
-//                mailDetailEntity.setCreated(orderCreateEntity.getCreated());
-//                mailDetailEntity.setUpdated(orderCreateEntity.getUpdated());
-//                mailDetailEntity.setRemarks("add");
-//                logOrderMailDetailImpl.save(mailDetailEntity);
-            }
-            String items = orderCreateEntity.getItems();
-            JSONArray itemArr = JSONArray.parseArray(items);
-            List<LogOrderItemEntity> itemEntityList = logOrderItemImpl.getByCode(logisticsOrderCode);
-            if (itemEntityList.size() != itemArr.size()) {
-                log.info("{} 商品信息异常 应该 {} 个， 现有{}个。", logisticsOrderCode, itemArr.size(), itemEntityList.size());
-//                LogOrderItemEntity orderItemEntity = new LogOrderItemEntity();
-//                JSONObject itemObject = itemArr.getJSONObject(0);
-//                orderItemEntity.setUid(itemObject.getString("uid"));
-//                orderItemEntity.setLogisticsOrderCode(orderCreateEntity.getLogisticsOrderCode());
-//                orderItemEntity.setItemId(itemObject.getString("itemId"));
-//                orderItemEntity.setItemName(itemObject.getString("itemName"));
-//                orderItemEntity.setCategoryId(itemObject.getLong("categoryId"));
-//                orderItemEntity.setCategoryName(itemObject.getString("categoryName"));
-//                orderItemEntity.setTotalActualPayment(itemObject.getLong("totalActualPayment"));
-//                orderItemEntity.setCurrencyUnit(itemObject.getString("currencyUnit"));
-//                orderItemEntity.setCurrency(itemObject.getString("currency"));
-//                orderItemEntity.setItemQuantity(itemObject.getInteger("itemQuantity"));
-//                orderItemEntity.setItemPicUrl(itemObject.getString("itemPicUrl"));
-//                orderItemEntity.setItemSkuProperty(itemObject.getString("itemSkuProperty"));
-//                orderItemEntity.setChargedStatus(itemObject.getBoolean("chargedStatus"));
-//                orderItemEntity.setGoodsType(itemObject.getString("goodsType"));
-//                orderItemEntity.setMagneticStatus(itemObject.getBoolean("magneticStatus"));
-//                orderItemEntity.setCreated(orderCreateEntity.getCreated());
-//                orderItemEntity.setUpdated(orderCreateEntity.getUpdated());
-//                orderItemEntity.setRemarks("add");
-//                logOrderItemImpl.save(orderItemEntity);
-            }
-        }
-        return "end";
+    private final AuthenticationManager authenticationManager;
+    private final JwtUtils jwtUtils;
+    @PostMapping("/hello")
+    public ResponseEntity<JSONObject> login(@RequestBody UserRequest loginRequest) {
+        return ResponseEntity.ok( JsonResponse.generateLocalCommonSuccessResponse("hello", "hello"));
     }
 }

PddServer/src/main/java/org/ta/pddserver/utils/OnlineUserData.java

 package org.ta.pddserver.utils;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
+@Data
 public class OnlineUserData implements Serializable {
-    public static final String ONLINE_CLIENT_DATA = "REGISTER-COMPANY-DATA";
+    public static final String ONLINE_CLIENT_DATA = "USER";
 
     private String userId; // 操作用户父级id
 
     private String account; // 操作用户父级id
 
     private String name; // 操作用户父级id
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }

PddServer/src/main/resources/application.yaml

@@ -5,6 +5,7 @@ spring:
     host: 127.0.0.1
     port: 5672
 
+
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
 #    url: jdbc:mysql://192.168.2.222:3306/pdd_api?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
@@ -26,12 +27,14 @@ spring:
   application:
     name: PddServer
 server:
-#  port: 9000 # 正式端口号 - 向拼多多正式环境开放接口
+  #  port: 9000 # 正式端口号 - 向拼多多正式环境开放接口
   port: 9100 # 正式端口号 - 向海际系统正式环境开放接口
 #  port: 8600 # 测试端口号
 logging:
   level:
     org:
+      springframework:
+        security: DEBUG
       ta:
         pddserver: debug
 mybatis-plus: