yingp 7 лет назад
Родитель
Сommit
381595bedf

+ 17 - 0
base-servers/mail/mail-server/src/main/java/com/usoftchina/saas/mail/MailApplication.java

@@ -0,0 +1,17 @@
+package com.usoftchina.saas.mail;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+
+/**
+ * @author yingp
+ * @date 2018/10/10
+ */
+@SpringBootApplication
+@EnableEurekaClient
+public class MailApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(MailApplication.class, args);
+    }
+}

+ 17 - 0
base-servers/sms/sms-server/src/main/java/com/usoftchina/saas/sms/SmsApplication.java

@@ -0,0 +1,17 @@
+package com.usoftchina.saas.sms;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+
+/**
+ * @author yingp
+ * @date 2018/10/10
+ */
+@SpringBootApplication
+@EnableEurekaClient
+public class SmsApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(SmsApplication.class, args);
+    }
+}

+ 44 - 23
pom.xml

@@ -16,10 +16,11 @@
     <groupId>com.usoftchina.saas</groupId>
     <artifactId>saas-platform</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>${project.release.version}</version>
     <description>saas framework parent</description>
 
     <properties>
+        <project.release.version>1.0.0-SNAPSHOT</project.release.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -40,6 +41,16 @@
         <docker.registry.name>saas</docker.registry.name>
     </properties>
 
+    <profiles>
+        <profile>
+            <!-- mvn deploy -P release -->
+            <id>release</id>
+            <properties>
+                <project.release.version>1.0.0</project.release.version>
+            </properties>
+        </profile>
+    </profiles>
+
     <repositories>
         <repository>
             <id>spring-milestones</id>
@@ -60,14 +71,14 @@
 
     <distributionManagement>
         <repository>
-            <id>repo.spring.io</id>
-            <name>Spring Release Repository</name>
-            <url>https://repo.spring.io/libs-release-local</url>
+            <id>release</id>
+            <name>release</name>
+            <url>http://10.10.100.21:8081/artifactory/libs-release-local</url>
         </repository>
         <snapshotRepository>
-            <id>repo.spring.io</id>
-            <name>Spring Snapshot Repository</name>
-            <url>https://repo.spring.io/libs-snapshot-local</url>
+            <id>snapshot</id>
+            <name>snapshot</name>
+            <url>http://10.10.100.21:8081/artifactory/libs-snapshot-local</url>
         </snapshotRepository>
     </distributionManagement>
 
@@ -187,72 +198,72 @@
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>core</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>file-dto</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>file-api</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>mail-dto</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>mail-api</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>account-dto</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>account-api</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>auth-dto</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>auth-common</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>auth-api</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>auth-client</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>common-dto</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>purchase-api</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>purchase-dto</artifactId>
-                <version>${project.version}</version>
+                <version>${project.release.version}</version>
             </dependency>
             <!-- file upload -->
             <dependency>
@@ -294,10 +305,9 @@
                     <artifactId>docker-maven-plugin</artifactId>
                     <version>1.0.0</version>
                     <configuration>
-                        <dockerDirectory>src/main/docker</dockerDirectory>
+                        <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
                         <registryUrl>${docker.repository}</registryUrl>
                         <pushImage>true</pushImage>
-                        <dockerDirectory>target/docker</dockerDirectory>
                         <imageName>
                             ${docker.repository}/${docker.registry.name}/${project.artifactId}:${project.version}
                         </imageName>
@@ -312,6 +322,17 @@
                             </resource>
                         </resources>
                     </configuration>
+                    <executions>
+                        <execution>
+                            <id>deploy-image</id>
+                            <phase>deploy</phase>
+                            <goals>
+                                <goal>build</goal>
+                                <goal>tag</goal>
+                                <goal>push</goal>
+                            </goals>
+                        </execution>
+                    </executions>
                 </plugin>
                 <!-- Docker maven plugin -->
             </plugins>