From 5a8a8e3a7cbcc4872642ec36c3a4af30f3cf9d77 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 15 八月 2025 16:16:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java b/src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java
index 0c818be..17ee53b 100644
--- a/src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java
+++ b/src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java
@@ -5,7 +5,7 @@
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.transport.servlet.CXFServlet;
import org.jeecg.modules.wms.service.ReceiveWMSScanItemListService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.jeecg.modules.wms.service.impl.ReceiveWMSScanItemListServiceImpl;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -15,25 +15,28 @@
@Configuration
public class WebServiceServerConfig {
- @Autowired
- private ReceiveWMSScanItemListService receiveWMSScanItemListService;
- @Bean(name = "cxfServer")
+ @Bean(name = Bus.DEFAULT_BUS_ID)
public Bus springBus() {
return new SpringBus();
}
@Bean(name = "cxfServlet") // 娉ㄥ叆servlet bean name涓嶈兘dispatcherServlet ,鍚﹀垯浼氳鐩杁ispatcherServlet
public ServletRegistrationBean<CXFServlet> cxfServlet() {
- return new ServletRegistrationBean<CXFServlet>(new CXFServlet(), "/webservice/*");
+ return new ServletRegistrationBean<>(new CXFServlet(), "/webservice/*");
+ }
+
+ @Bean
+ public ReceiveWMSScanItemListService receiveWMSScanItemListService() {
+ return new ReceiveWMSScanItemListServiceImpl();
}
@Bean
public Endpoint endpoint() {
// 鍙傛暟浜岋紝鏄疭EI瀹炵幇绫诲璞�
- Endpoint endpoint = new EndpointImpl(this.springBus(), receiveWMSScanItemListService);
+ Endpoint endpoint = new EndpointImpl(this.springBus(), this.receiveWMSScanItemListService());
// 鍙戝竷鏈嶅姟
- endpoint.publish("/userService");
+ endpoint.publish("/ReceiveWMSScanItemList");
return endpoint;
}
}
--
Gitblit v1.9.3