From 1f17678f58ee6acf459758c01dec7404ebdabeff Mon Sep 17 00:00:00 2001
From: richie <richie@fanruan.com>
Date: Thu, 13 Sep 2018 16:53:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=BC=80=E5=8F=91=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  3 +-
 .../build.xml                                 |  0
 .../plugin.xml                                |  0
 plugin-function/pom.xml                       | 28 +++++++++++++++++++
 .../src/main/java/com/fr/plugin/MyAbs.java    |  0
 plugins/plugin-function/pom.xml               | 14 ----------
 plugins/pom.xml                               | 21 --------------
 pom.xml                                       |  5 ++--
 8 files changed, 33 insertions(+), 38 deletions(-)
 rename {plugins/plugin-function => plugin-function}/build.xml (100%)
 rename {plugins/plugin-function => plugin-function}/plugin.xml (100%)
 create mode 100644 plugin-function/pom.xml
 rename {plugins/plugin-function => plugin-function}/src/main/java/com/fr/plugin/MyAbs.java (100%)
 delete mode 100644 plugins/plugin-function/pom.xml
 delete mode 100644 plugins/pom.xml

diff --git a/.gitignore b/.gitignore
index 17b07ff..3a2d861 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.iml
 .idea/
 /target/
-/download/
\ No newline at end of file
+/download/
+/webroot/
\ No newline at end of file
diff --git a/plugins/plugin-function/build.xml b/plugin-function/build.xml
similarity index 100%
rename from plugins/plugin-function/build.xml
rename to plugin-function/build.xml
diff --git a/plugins/plugin-function/plugin.xml b/plugin-function/plugin.xml
similarity index 100%
rename from plugins/plugin-function/plugin.xml
rename to plugin-function/plugin.xml
diff --git a/plugin-function/pom.xml b/plugin-function/pom.xml
new file mode 100644
index 0000000..e8d28af
--- /dev/null
+++ b/plugin-function/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.fr.plugin</groupId>
+        <artifactId>starter</artifactId>
+        <version>10.0</version>
+    </parent>
+
+    <packaging>jar</packaging>
+    <artifactId>plugin-function</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.fr.plugin</groupId>
+            <artifactId>gson</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/gson-2.3.1.jar</systemPath>
+        </dependency>
+    </dependencies>
+    <build>
+        <!---如果要更改调试插件，改这里的配置就可以了-->
+        <outputDirectory>${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.function.test-1.0/classes</outputDirectory>
+    </build>
+</project>
\ No newline at end of file
diff --git a/plugins/plugin-function/src/main/java/com/fr/plugin/MyAbs.java b/plugin-function/src/main/java/com/fr/plugin/MyAbs.java
similarity index 100%
rename from plugins/plugin-function/src/main/java/com/fr/plugin/MyAbs.java
rename to plugin-function/src/main/java/com/fr/plugin/MyAbs.java
diff --git a/plugins/plugin-function/pom.xml b/plugins/plugin-function/pom.xml
deleted file mode 100644
index ada9db6..0000000
--- a/plugins/plugin-function/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.fr.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>1.0</version>
-    </parent>
-    <packaging>jar</packaging>
-    <artifactId>plugin-function</artifactId>
-</project>
\ No newline at end of file
diff --git a/plugins/pom.xml b/plugins/pom.xml
deleted file mode 100644
index 1f8dc82..0000000
--- a/plugins/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.fr.plugin</groupId>
-        <artifactId>starter</artifactId>
-        <version>1.0</version>
-    </parent>
-    <packaging>pom</packaging>
-    <artifactId>plugins</artifactId>
-    <modules>
-        <module>plugin-function</module>
-    </modules>
-    <build>
-        <!---如果要更改调试插件，改这里的配置就可以了-->
-        <outputDirectory>${web-inf-path}/plugins/plugin-com.fr.plugin.function.test-1.0/classes</outputDirectory>
-    </build>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0f32fd8..4c4df1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.fr.plugin</groupId>
     <artifactId>starter</artifactId>
-    <version>1.0</version>
+    <version>10.0</version>
     <packaging>pom</packaging>
     <properties>
         <common-version>10.0-RELEASE-SNAPSHOT</common-version>
         <web-inf-path>${project.basedir}/webroot/WEB-INF</web-inf-path>
     </properties>
     <modules>
-        <module>plugins</module>
+        <module>plugin-function</module>
     </modules>
     <dependencies>
         <!-- core包 -->
@@ -143,6 +143,7 @@
 
     </dependencies>
     <build>
+        <outputDirectory>${web-inf-path}/classes</outputDirectory>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>