weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rcx
2026-08-26 17:32:40 +08:00
parent 353300b643 1e00681289
commit 1006860698
3 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java
+24 -24
View File
@@ -53,8 +53,8 @@ public class StockInOrderApi extends BaseController {
private StockInOrderAssembler stockInOrderAssembler; private StockInOrderAssembler stockInOrderAssembler;
@Resource @Resource
private StockOutOrderAssembler stockOutOrderAssembler; private StockOutOrderAssembler stockOutOrderAssembler;
@Autowired // @Autowired
private XxlJobServiceFeign xxlJobServiceFeign; // private XxlJobServiceFeign xxlJobServiceFeign;
/** /**
* 分页查询入库单列表 * 分页查询入库单列表
@@ -353,32 +353,32 @@ public class StockInOrderApi extends BaseController {
return stockInOrderApplicationService.batchSignature(dto); return stockInOrderApplicationService.batchSignature(dto);
} }
@GetMapping("/xxlopenfeign") // @GetMapping("/xxlopenfeign")
public AjaxResult xxlopenfeign(@RequestParam String param) { // public AjaxResult xxlopenfeign(@RequestParam String param) {
R<Map<String, Object>> mapR = xxlJobServiceFeign.openFeignTest(param); // R<Map<String, Object>> mapR = xxlJobServiceFeign.openFeignTest(param);
return AjaxResult.success(mapR); // return AjaxResult.success(mapR);
} // }
/** /**
* 1. 简单任务示例（Bean模式） * 1. 简单任务示例（Bean模式）
* 这里的 demoJobHandler 必须和调度中心配置一致 * 这里的 demoJobHandler 必须和调度中心配置一致
*/ */
@XxlJob("demoJobHandler") // @XxlJob("demoJobHandler")
public void demoJobHandler() { // public void demoJobHandler() {
// 获取任务参数 // // 获取任务参数
String param = XxlJobHelper.getJobParam(); // String param = XxlJobHelper.getJobParam();
logger.info("XXL-JOB 开始执行，参数：{}", param); // logger.info("XXL-JOB 开始执行，参数：{}", param);
//
try { // try {
// ========== 你的业务逻辑 ========== // // ========== 你的业务逻辑 ==========
logger.info("执行若依微服务定时任务..."); // logger.info("执行若依微服务定时任务...");
//
// 设置任务执行结果 // // 设置任务执行结果
XxlJobHelper.handleSuccess("执行成功"); // XxlJobHelper.handleSuccess("执行成功");
} catch (Exception e) { // } catch (Exception e) {
logger.error("XXL-JOB 执行失败", e); // logger.error("XXL-JOB 执行失败", e);
XxlJobHelper.handleFail("执行失败：" + e.getMessage()); // XxlJobHelper.handleFail("执行失败：" + e.getMessage());
} // }
} // }
} }
mhd_wms/src/main/java/com/mhd/wms/util/XxlJobConfig.java
+41 -41
View File
@@ -9,46 +9,46 @@ import org.springframework.context.annotation.Configuration;
/** /**
* XXL-JOB 配置类 * XXL-JOB 配置类
*/ */
@Configuration //@Configuration
public class XxlJobConfig { public class XxlJobConfig {
private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class); // private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
//
@Value("${xxl.job.admin.addresses}") // @Value("${xxl.job.admin.addresses}")
private String adminAddresses; // private String adminAddresses;
//
@Value("${xxl.job.accessToken}") // @Value("${xxl.job.accessToken}")
private String accessToken; // private String accessToken;
//
@Value("${xxl.job.executor.appname}") // @Value("${xxl.job.executor.appname}")
private String appname; // private String appname;
//
@Value("${xxl.job.executor.address}") // @Value("${xxl.job.executor.address}")
private String address; // private String address;
//
@Value("${xxl.job.executor.ip}") // @Value("${xxl.job.executor.ip}")
private String ip; // private String ip;
//
@Value("${xxl.job.executor.port}") // @Value("${xxl.job.executor.port}")
private int port; // private int port;
//
@Value("${xxl.job.executor.logpath}") // @Value("${xxl.job.executor.logpath}")
private String logPath; // private String logPath;
//
@Value("${xxl.job.executor.logretentiondays}") // @Value("${xxl.job.executor.logretentiondays}")
private int logRetentionDays; // private int logRetentionDays;
//
@Bean // @Bean
public XxlJobSpringExecutor xxlJobExecutor() { // public XxlJobSpringExecutor xxlJobExecutor() {
logger.info(">>>>>>>>>>> xxl-job config init."); // logger.info(">>>>>>>>>>> xxl-job config init.");
XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); // XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
xxlJobSpringExecutor.setAdminAddresses(adminAddresses); // xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
xxlJobSpringExecutor.setAppname(appname); // xxlJobSpringExecutor.setAppname(appname);
xxlJobSpringExecutor.setAddress(address); // xxlJobSpringExecutor.setAddress(address);
xxlJobSpringExecutor.setIp(ip); // xxlJobSpringExecutor.setIp(ip);
xxlJobSpringExecutor.setPort(port); // xxlJobSpringExecutor.setPort(port);
xxlJobSpringExecutor.setAccessToken(accessToken); // xxlJobSpringExecutor.setAccessToken(accessToken);
xxlJobSpringExecutor.setLogPath(logPath); // xxlJobSpringExecutor.setLogPath(logPath);
xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); // xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
return xxlJobSpringExecutor; // return xxlJobSpringExecutor;
} // }
} }
mhd_wms/src/main/resources/bootstrap.yml
+21 -21
View File
@@ -36,24 +36,24 @@ spring:
shared-configs: shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# XXL-JOB 配置 # XXL-JOB 配置
xxl: #xxl:
job: # job:
# 调度中心地址（填你部署的地址） # # 调度中心地址（填你部署的地址）
admin: # admin:
addresses: http://192.168.1.6:8020/xxl-job-admin # addresses: http://192.168.1.6:8020/xxl-job-admin
# 执行器配置 # # 执行器配置
executor: # executor:
# 执行器名称（自定义，后面调度中心要用到） # # 执行器名称（自定义，后面调度中心要用到）
appname: wms-service-executor # appname: wms-service-executor
# 执行器注册地址，默认0表示自动获取 # # 执行器注册地址，默认0表示自动获取
address: # address:
# 执行器IP，默认空自动获取 # # 执行器IP，默认空自动获取
ip: # ip:
# 执行器端口号（每个微服务不能重复，建议9997/9998/9999） # # 执行器端口号（每个微服务不能重复，建议9997/9998/9999）
port: 9997 # port: 9997
# 执行器日志存放路径 # # 执行器日志存放路径
logpath: /data/applogs/xxl-job/jobhandler # logpath: /data/applogs/xxl-job/jobhandler
# 日志保留天数 # # 日志保留天数
logretentiondays: 30 # logretentiondays: 30
# 调度中心通讯令牌（默认空，安全可设置） # # 调度中心通讯令牌（默认空，安全可设置）
accessToken: default_token # accessToken: default_token