Merge remote-tracking branch 'origin/dev' into dev-ty1.2

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java

@@ -53,8 +53,8 @@ public class StockInOrderApi extends BaseController {
     private StockInOrderAssembler stockInOrderAssembler;
     @Resource
     private StockOutOrderAssembler stockOutOrderAssembler;
-    @Autowired
-    private XxlJobServiceFeign xxlJobServiceFeign;
+//    @Autowired
+//    private XxlJobServiceFeign xxlJobServiceFeign;
 
     /**
      * 分页查询入库单列表
@@ -353,32 +353,32 @@ public class StockInOrderApi extends BaseController {
         return stockInOrderApplicationService.batchSignature(dto);
     }
 
-    @GetMapping("/xxlopenfeign")
-    public AjaxResult xxlopenfeign(@RequestParam String param) {
-        R<Map<String, Object>> mapR = xxlJobServiceFeign.openFeignTest(param);
-        return AjaxResult.success(mapR);
-    }
+//    @GetMapping("/xxlopenfeign")
+//    public AjaxResult xxlopenfeign(@RequestParam String param) {
+//        R<Map<String, Object>> mapR = xxlJobServiceFeign.openFeignTest(param);
+//        return AjaxResult.success(mapR);
+//    }
 
     /**
      * 1. 简单任务示例（Bean模式）
      * 这里的 demoJobHandler 必须和调度中心配置一致
      */
-    @XxlJob("demoJobHandler")
-    public void demoJobHandler() {
-        // 获取任务参数
-        String param = XxlJobHelper.getJobParam();
-        logger.info("XXL-JOB 开始执行，参数：{}", param);
-
-        try {
-            // ========== 你的业务逻辑 ==========
-            logger.info("执行若依微服务定时任务...");
-
-            // 设置任务执行结果
-            XxlJobHelper.handleSuccess("执行成功");
-        } catch (Exception e) {
-            logger.error("XXL-JOB 执行失败", e);
-            XxlJobHelper.handleFail("执行失败：" + e.getMessage());
-        }
-    }
+//    @XxlJob("demoJobHandler")
+//    public void demoJobHandler() {
+//        // 获取任务参数
+//        String param = XxlJobHelper.getJobParam();
+//        logger.info("XXL-JOB 开始执行，参数：{}", param);
+//
+//        try {
+//            // ========== 你的业务逻辑 ==========
+//            logger.info("执行若依微服务定时任务...");
+//
+//            // 设置任务执行结果
+//            XxlJobHelper.handleSuccess("执行成功");
+//        } catch (Exception e) {
+//            logger.error("XXL-JOB 执行失败", e);
+//            XxlJobHelper.handleFail("执行失败：" + e.getMessage());
+//        }
+//    }
 
 }

mhd_wms/src/main/java/com/mhd/wms/util/XxlJobConfig.java

@@ -9,46 +9,46 @@ import org.springframework.context.annotation.Configuration;
 /**
  * XXL-JOB 配置类
  */
-@Configuration
+//@Configuration
 public class XxlJobConfig {
-    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
-
-    @Value("${xxl.job.admin.addresses}")
-    private String adminAddresses;
-
-    @Value("${xxl.job.accessToken}")
-    private String accessToken;
-
-    @Value("${xxl.job.executor.appname}")
-    private String appname;
-
-    @Value("${xxl.job.executor.address}")
-    private String address;
-
-    @Value("${xxl.job.executor.ip}")
-    private String ip;
-
-    @Value("${xxl.job.executor.port}")
-    private int port;
-
-    @Value("${xxl.job.executor.logpath}")
-    private String logPath;
-
-    @Value("${xxl.job.executor.logretentiondays}")
-    private int logRetentionDays;
-
-    @Bean
-    public XxlJobSpringExecutor xxlJobExecutor() {
-        logger.info(">>>>>>>>>>> xxl-job config init.");
-        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-        xxlJobSpringExecutor.setAppname(appname);
-        xxlJobSpringExecutor.setAddress(address);
-        xxlJobSpringExecutor.setIp(ip);
-        xxlJobSpringExecutor.setPort(port);
-        xxlJobSpringExecutor.setAccessToken(accessToken);
-        xxlJobSpringExecutor.setLogPath(logPath);
-        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-        return xxlJobSpringExecutor;
-    }
+//    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+//
+//    @Value("${xxl.job.admin.addresses}")
+//    private String adminAddresses;
+//
+//    @Value("${xxl.job.accessToken}")
+//    private String accessToken;
+//
+//    @Value("${xxl.job.executor.appname}")
+//    private String appname;
+//
+//    @Value("${xxl.job.executor.address}")
+//    private String address;
+//
+//    @Value("${xxl.job.executor.ip}")
+//    private String ip;
+//
+//    @Value("${xxl.job.executor.port}")
+//    private int port;
+//
+//    @Value("${xxl.job.executor.logpath}")
+//    private String logPath;
+//
+//    @Value("${xxl.job.executor.logretentiondays}")
+//    private int logRetentionDays;
+//
+//    @Bean
+//    public XxlJobSpringExecutor xxlJobExecutor() {
+//        logger.info(">>>>>>>>>>> xxl-job config init.");
+//        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+//        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+//        xxlJobSpringExecutor.setAppname(appname);
+//        xxlJobSpringExecutor.setAddress(address);
+//        xxlJobSpringExecutor.setIp(ip);
+//        xxlJobSpringExecutor.setPort(port);
+//        xxlJobSpringExecutor.setAccessToken(accessToken);
+//        xxlJobSpringExecutor.setLogPath(logPath);
+//        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+//        return xxlJobSpringExecutor;
+//    }
 }