From 2c43632ad199905f759b1ba69cce2dcbc71c709f Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 10 九月 2025 16:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java |   75 ++++++++++++++++++-------------------
 1 files changed, 36 insertions(+), 39 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 bc5f335..df2d1f0 100644
--- a/src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java
+++ b/src/main/java/org/jeecg/modules/wms/config/WebServiceServerConfig.java
@@ -1,39 +1,36 @@
-package org.jeecg.modules.wms.config;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.spring.SpringBus;
-import org.apache.cxf.jaxws.EndpointImpl;
-import org.apache.cxf.transport.servlet.CXFServlet;
-import org.jeecg.modules.wms.service.MESWebServiceSoap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.xml.ws.Endpoint;
-
-
-@Configuration
-public class WebServiceServerConfig {
-    @Autowired
-    private MESWebServiceSoap webServiceSoap;
-
-    @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<>(new CXFServlet(), "/webservice/*");
-    }
-
-    @Bean
-    public Endpoint endpoint() {
-        // 鍙傛暟浜岋紝鏄疭EI瀹炵幇绫诲璞�
-        Endpoint endpoint = new EndpointImpl(this.springBus(), webServiceSoap);
-        // 鍙戝竷鏈嶅姟
-        endpoint.publish("/MESWebService");
-        return endpoint;
-    }
-}
+//package org.jeecg.modules.wms.config;
+//
+//import org.apache.cxf.Bus;
+//import org.apache.cxf.jaxws.EndpointImpl;
+//import org.apache.cxf.transport.servlet.CXFServlet;
+//import org.jeecg.modules.wms.service.MESWebServiceSoap;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.web.servlet.ServletRegistrationBean;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//import javax.xml.ws.Endpoint;
+//
+//
+//@Configuration
+//public class WebServiceServerConfig {
+//    @Autowired
+//    private Bus bus;
+//    @Autowired
+//    private MESWebServiceSoap mesWebServiceSoap;
+//
+//    @Bean(name = "cxfServlet")  // 娉ㄥ叆servlet bean name涓嶈兘dispatcherServlet ,鍚﹀垯浼氳鐩杁ispatcherServlet
+//    public ServletRegistrationBean<CXFServlet> cxfServlet() {
+//        return new ServletRegistrationBean<>(new CXFServlet(), "/webservice/*");
+//    }
+//
+//    @Bean
+//    public Endpoint endpoint() {
+//        // 鍙傛暟浜岋紝鏄疭EI瀹炵幇绫诲璞�
+//        Endpoint endpoint = new EndpointImpl(bus, mesWebServiceSoap);
+//        // 鍙戝竷鏈嶅姟
+//        endpoint.publish("/MESWebService");
+//
+//        return endpoint;
+//    }
+//}

--
Gitblit v1.9.3