Browse Source

refactor:调整框架

王智勇 4 years ago
parent
commit
2c0b581d08
4 changed files with 92 additions and 36 deletions
  1. 56 7
      dim-client/pom.xml
  2. 25 6
      dim-common/pom.xml
  3. 11 2
      dim-service/pom.xml
  4. 0 21
      pom.xml

+ 56 - 7
dim-client/pom.xml

@@ -2,21 +2,70 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>dim</artifactId>
-        <groupId>dzdy</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    <groupId>com.dzdy</groupId>
     <artifactId>dim-client</artifactId>
+    <version>1.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
-            <groupId>dzdy</groupId>
+            <groupId>com.dzdy</groupId>
             <artifactId>dim-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <!--<plugin>
+                &lt;!&ndash; Build an executable JAR &ndash;&gt;
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.dzdy.dim.NettyClient</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.dzdy.dim.NettyClient</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
+                        <phase>package</phase> <!-- 指定在打包节点执行jar包合并操作 -->
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

+ 25 - 6
dim-common/pom.xml

@@ -2,14 +2,20 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>dim</artifactId>
-        <groupId>dzdy</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    <groupId>com.dzdy</groupId>
     <artifactId>dim-common</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <netty.version>4.1.6.Final</netty.version>
+        <lombok.version>1.18.6</lombok.version>
+        <fastjson.version>1.2.56</fastjson.version>
+        <jwt.version>0.10.5</jwt.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <dependencies>
         <!-- netty -->
         <dependency>
@@ -49,4 +55,17 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

+ 11 - 2
dim-service/pom.xml

@@ -8,13 +8,14 @@
         <version>2.1.5.RELEASE</version>
         <relativePath/>
     </parent>
+    <groupId>com.dzdy</groupId>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>dim-service</artifactId>
+    <version>1.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
-            <groupId>dzdy</groupId>
+            <groupId>com.dzdy</groupId>
             <artifactId>dim-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
@@ -34,4 +35,12 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

+ 0 - 21
pom.xml

@@ -15,25 +15,4 @@
     <version>1.0-SNAPSHOT</version>
     <description>push service power by netty</description>
 
-    <properties>
-        <java.version>1.8</java.version>
-        <netty.version>4.1.6.Final</netty.version>
-        <lombok.version>1.18.6</lombok.version>
-        <fastjson.version>1.2.56</fastjson.version>
-        <jwt.version>0.10.5</jwt.version>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>