From 6fa352c50bee89ed3f768a2360e651f447f94c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=9C=9D=E6=99=96?= <1481883582@qq.com>
Date: Sun, 10 Jan 2021 14:00:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=B0=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 falsework-client/pom.xml                          | 15 ++++++++-------
 .../src/test/java/TableViewSample.java            |  1 -
 falsework-sever/pom.xml                           | 12 ++++++++++--
 pom.xml                                           |  6 ++++--
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/falsework-client/pom.xml b/falsework-client/pom.xml
index 1db2b6a..92d6439 100644
--- a/falsework-client/pom.xml
+++ b/falsework-client/pom.xml
@@ -8,7 +8,6 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>falsework-client</artifactId>
 
     <properties>
@@ -16,6 +15,8 @@
         <maven.compiler.target>8</maven.compiler.target>
         <feign.version>10.9</feign.version>
         <java.version>1.8</java.version>
+        <datafx.version>8.0.2</datafx.version>
+        <jfoenix.version>8.0.10</jfoenix.version>
     </properties>
 
 
@@ -34,21 +35,21 @@
             <artifactId>jfoenix</artifactId>
             <version>${jfoenix.version}</version>
             <scope>system</scope>
-            <systemPath>${basedir}/libs/jfoenix-8.0.10.jar</systemPath>
+            <systemPath>${pom.basedir}/libs/jfoenix-8.0.10.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>datafx-flow</groupId>
             <artifactId>datafx-flow</artifactId>
             <version>${datafx.version}</version>
             <scope>system</scope>
-            <systemPath>${basedir}/libs/datafx-flow-8.0.2-SNAPSHOT.jar</systemPath>
+            <systemPath>${pom.basedir}/libs/datafx-flow-8.0.2-SNAPSHOT.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>tilesfx</groupId>
             <artifactId>tilesfx</artifactId>
             <version>1.6.8</version>
             <scope>system</scope>
-            <systemPath>${basedir}/libs/tilesfx-1.6.8.jar</systemPath>
+            <systemPath>${pom.basedir}/libs/tilesfx-1.6.8.jar</systemPath>
         </dependency>
 
         <dependency>
@@ -56,21 +57,21 @@
             <artifactId>datafx-injection</artifactId>
             <version>${datafx.version}</version>
             <scope>system</scope>
-            <systemPath>${basedir}/libs/datafx-injection-8.0.2-SNAPSHOT.jar</systemPath>
+            <systemPath>${pom.basedir}/libs/datafx-injection-8.0.2-SNAPSHOT.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>datafx-eventsystem</groupId>
             <artifactId>datafx-eventsystem</artifactId>
             <version>${datafx.version}</version>
             <scope>system</scope>
-            <systemPath>${basedir}/libs/datafx-eventsystem-8.0.2-SNAPSHOT.jar</systemPath>
+            <systemPath>${pom.basedir}/libs/datafx-eventsystem-8.0.2-SNAPSHOT.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>datafx-core</groupId>
             <artifactId>datafx-core</artifactId>
             <version>${datafx.version}</version>
             <scope>system</scope>
-            <systemPath>${basedir}/libs/datafx-core-8.0.2-SNAPSHOT.jar</systemPath>
+            <systemPath>${pom.basedir}/libs/datafx-core-8.0.2-SNAPSHOT.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
diff --git a/falsework-client/src/test/java/TableViewSample.java b/falsework-client/src/test/java/TableViewSample.java
index e2a1a6d..e6b5900 100644
--- a/falsework-client/src/test/java/TableViewSample.java
+++ b/falsework-client/src/test/java/TableViewSample.java
@@ -1,4 +1,3 @@
-import com.epri.fx.server.vo.UserVO;
 import javafx.application.Application;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ListProperty;
diff --git a/falsework-sever/pom.xml b/falsework-sever/pom.xml
index 73fc7e8..777ae0f 100644
--- a/falsework-sever/pom.xml
+++ b/falsework-sever/pom.xml
@@ -104,7 +104,7 @@
             <artifactId>DmJdbcDriver</artifactId>
             <version>1.0.0</version>
             <scope>system</scope>
-            <systemPath>${basedir}/libs/DmJdbcDriver-1.0.0.jar</systemPath>
+            <systemPath>${pom.basedir}/libs/DmJdbcDriver-1.0.0.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
@@ -116,7 +116,7 @@
             <artifactId>pinyin4j</artifactId>
             <version>2.5.0</version>
             <scope>system</scope>
-            <systemPath>${basedir}/libs/pinyin4j-2.5.0.jar</systemPath>
+            <systemPath>${pom.basedir}/libs/pinyin4j-2.5.0.jar</systemPath>
         </dependency>
     </dependencies>
 
@@ -134,6 +134,14 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/pom.xml b/pom.xml
index 072ef35..f7ff2d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.epri</groupId>
@@ -10,7 +11,7 @@
 
     <modules>
         <module>falsework-client</module>
-        <module>falsework-client</module>
+        <module>falsework-sever</module>
     </modules>
     <properties>
         <java.version>1.8</java.version>
@@ -29,6 +30,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>