diff --git a/pom.xml b/pom.xml index 1f8db79a..e2a5fd9a 100644 --- a/pom.xml +++ b/pom.xml @@ -78,49 +78,4 @@ - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - com.spotify - docker-maven-plugin - ${docker.maven.plugin.version} - - - - - - - - - - - mmcloud/${project.artifactId}:${project.version} - ${docker.host} - java:8 - ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] - - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - - - - - \ No newline at end of file diff --git a/xm-bootstrap/pom.xml b/xm-bootstrap/pom.xml index cc2ea7c1..71fbc3ef 100644 --- a/xm-bootstrap/pom.xml +++ b/xm-bootstrap/pom.xml @@ -28,6 +28,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + org.springframework.boot spring-boot-maven-plugin @@ -39,14 +46,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - 唛盟云-项目管理系统微服务启动器 diff --git a/xm-bootstrap/src/main/java/com/xm/XmApplication.java b/xm-bootstrap/src/main/java/com/xm/XmApplication.java index 93b10ac5..caf74912 100644 --- a/xm-bootstrap/src/main/java/com/xm/XmApplication.java +++ b/xm-bootstrap/src/main/java/com/xm/XmApplication.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; @SpringCloudApplication @EnableRedisHttpSession -@ComponentScan(basePackages={"com.mdp"}) +@ComponentScan(basePackages={"com.mdp","com.xm"}) public class XmApplication { diff --git a/xm-bootstrap/xm-bootstrap.iml b/xm-bootstrap/xm-bootstrap.iml index 94521c63..cb24a5f4 100644 --- a/xm-bootstrap/xm-bootstrap.iml +++ b/xm-bootstrap/xm-bootstrap.iml @@ -121,6 +121,23 @@ + + + + + + + + + + + + + + + + + @@ -186,23 +203,6 @@ - - - - - - - - - - - - - - - - - diff --git a/xm-core/pom.xml b/xm-core/pom.xml index 88cf7893..742f9140 100644 --- a/xm-core/pom.xml +++ b/xm-core/pom.xml @@ -14,6 +14,11 @@ + + com.mdp + mdp-boot-starter + ${mdp.version} + com.mdp mdp-oauth2-client diff --git a/xm-core/src/test/java/com/xm/XmApplication.java b/xm-core/src/test/java/com/xm/XmApplication.java index 7c2fb0df..d92159c8 100644 --- a/xm-core/src/test/java/com/xm/XmApplication.java +++ b/xm-core/src/test/java/com/xm/XmApplication.java @@ -4,7 +4,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; -@ComponentScan(basePackages={"com.mdp"}) +@ComponentScan(basePackages={"com.mdp","com.xm"}) @SpringBootApplication @EnableRedisHttpSession public class XmApplication { diff --git a/xm-core/xm-core.iml b/xm-core/xm-core.iml index adcd80e1..bba16314 100644 --- a/xm-core/xm-core.iml +++ b/xm-core/xm-core.iml @@ -11,6 +11,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -92,31 +117,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - -