From a04797899856a822c792530d0d65e88b3622ddd7 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 09 五月 2024 13:43:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/PipIrrMwRtuApplication.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/PipIrrMwRtuApplication.java
similarity index 85%
rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java
rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/PipIrrMwRtuApplication.java
index ac5fdb3..d0b8b60 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/PipIrrMwRtuApplication.java
@@ -1,4 +1,4 @@
-package com.dy.aceMw;
+package com.dy.rtuMw;
import com.dy.common.multiDataSource.EnableMultiDataSource;
import org.mybatis.spring.annotation.MapperScan;
@@ -14,16 +14,16 @@
@EnableAspectJAutoProxy
//@EnableAspectJAutoProxy(exposeProxy=true)//瑙乭ttps://blog.csdn.net/qq_32590703/article/details/109320381
@EnableMultiDataSource
-@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.aceMw"},
+@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.rtuMw"},
excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
com.dy.common.apiDoc.SpringApiConfig.class
}) })
-//@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.aceMw"})
+//@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.rtuMw"})
@MapperScan(basePackages={"com.dy.pipIrrGlobal"})
-public class PipIrrMwAcceptApplication implements CommandLineRunner {
+public class PipIrrMwRtuApplication implements CommandLineRunner {
public static void main(String[] args) {
- SpringApplication.run(PipIrrMwAcceptApplication.class, args);
+ SpringApplication.run(PipIrrMwRtuApplication.class, args);
}
/**
@@ -40,11 +40,11 @@
e.printStackTrace();
}
finally {
- this.startAceSv() ;
+ this.startMwSv() ;
}
}
- private void startAceSv(){
+ private void startMwSv(){
if(sv != null){
sv.startServer();
}
--
Gitblit v1.8.0