diff --git a/src/main/java/com/docus/collect/config/CxfConfig.java b/src/main/java/com/docus/collect/config/CxfConfig.java deleted file mode 100644 index 0d81ae6..0000000 --- a/src/main/java/com/docus/collect/config/CxfConfig.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.docus.collect.config; - - - -//@Configuration -public class CxfConfig { - -// /** -// * 注入Servlet,注意beanName不能为dispatcherServlet -// * @author Fang Ruichuan -// * @date 2022/11/14 19:16 -// */ -// @Bean -// public ServletRegistrationBean cxfServlet() { -// return new ServletRegistrationBean(new CXFServlet(), "/webservice/*"); -// } -// -// @Bean(name = Bus.DEFAULT_BUS_ID) -// public SpringBus springBus() { -// return new SpringBus(); -// } -// -// @Bean -// public Endpoint endpoint() { -// EndpointImpl endpoint = new EndpointImpl(springBus(), receiveServer); -// endpoint.publish("/api"); -// return endpoint; -// } - -} diff --git a/src/main/java/com/docus/server/collect/CollectApplication.java b/src/main/java/com/docus/server/collect/CollectApplication.java new file mode 100644 index 0000000..7113d0a --- /dev/null +++ b/src/main/java/com/docus/server/collect/CollectApplication.java @@ -0,0 +1,24 @@ +package com.docus.server.collect; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import java.util.Properties; + +/** + * 病案报告采集 + * + * @author wyb + */ +@SpringBootApplication(scanBasePackages = {"com.docus"}) +@MapperScan("com.docus.server.**.mapper") +public class CollectApplication { + public static void main(String[] args) { + Properties props = System.getProperties(); + props.setProperty("org.apache.cxf.stax.allowInsecureParser", "1"); + props.setProperty("UseSunHttpHandler", "true"); + props.setProperty("javax.xml.parsers.DocumentBuilderFactory", "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"); + SpringApplication.run(CollectApplication.class, args); + } +} diff --git a/src/main/java/com/docus/collect/config/XxlJobConfig.java b/src/main/java/com/docus/server/collect/config/XxlJobConfig.java similarity index 69% rename from src/main/java/com/docus/collect/config/XxlJobConfig.java rename to src/main/java/com/docus/server/collect/config/XxlJobConfig.java index e81d37c..6b33340 100644 --- a/src/main/java/com/docus/collect/config/XxlJobConfig.java +++ b/src/main/java/com/docus/server/collect/config/XxlJobConfig.java @@ -1,4 +1,5 @@ -package com.docus.collect.config; +package com.docus.server.collect.config; + import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,6 +9,21 @@ import org.springframework.context.annotation.Configuration; /** * xxl-job配置 + * 针对多网卡、容器内部署等情况,可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP; + *

+ * 1、引入依赖: + * + * org.springframework.cloud + * spring-cloud-commons + * ${version} + * + *

+ * 2、配置文件,或者容器启动变量 + * spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.' + *

+ * 3、获取IP + * String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); + * * @author js */ @Configuration @@ -54,23 +70,4 @@ public class XxlJobConfig { return xxlJobSpringExecutor; } - - /** - * 针对多网卡、容器内部署等情况,可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP; - * - * 1、引入依赖: - * - * org.springframework.cloud - * spring-cloud-commons - * ${version} - * - * - * 2、配置文件,或者容器启动变量 - * spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.' - * - * 3、获取IP - * String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); - *//* - -*/ } diff --git a/src/main/java/com/docus/collect/util/HttpWsClientUtil.java b/src/main/java/com/docus/server/collect/util/HttpWsClientUtil.java similarity index 98% rename from src/main/java/com/docus/collect/util/HttpWsClientUtil.java rename to src/main/java/com/docus/server/collect/util/HttpWsClientUtil.java index 72f54b8..53084e8 100644 --- a/src/main/java/com/docus/collect/util/HttpWsClientUtil.java +++ b/src/main/java/com/docus/server/collect/util/HttpWsClientUtil.java @@ -1,4 +1,4 @@ -package com.docus.collect.util; +package com.docus.server.collect.util; import com.docus.core.util.Func; import org.slf4j.Logger; diff --git a/src/main/java/com/docus/collect/util/JaxWsDynamicClientUtil.java b/src/main/java/com/docus/server/collect/util/JaxWsDynamicClientUtil.java similarity index 98% rename from src/main/java/com/docus/collect/util/JaxWsDynamicClientUtil.java rename to src/main/java/com/docus/server/collect/util/JaxWsDynamicClientUtil.java index 07af89f..7acec0a 100644 --- a/src/main/java/com/docus/collect/util/JaxWsDynamicClientUtil.java +++ b/src/main/java/com/docus/server/collect/util/JaxWsDynamicClientUtil.java @@ -1,4 +1,4 @@ -package com.docus.collect.util; +package com.docus.server.collect.util; import org.apache.cxf.endpoint.Client; import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; diff --git a/src/main/java/com/docus/collect/util/XmlUtil.java b/src/main/java/com/docus/server/collect/util/XmlUtil.java similarity index 99% rename from src/main/java/com/docus/collect/util/XmlUtil.java rename to src/main/java/com/docus/server/collect/util/XmlUtil.java index b3f066f..48e0d7e 100644 --- a/src/main/java/com/docus/collect/util/XmlUtil.java +++ b/src/main/java/com/docus/server/collect/util/XmlUtil.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: DreamLu 卢春梦 (596392912@qq.com) */ -package com.docus.collect.util; +package com.docus.server.collect.util; import com.docus.core.util.Exceptions; import com.docus.core.util.IoUtil;