From 43d92b7e1e420f8d537b045421b08c4c7604212e Mon Sep 17 00:00:00 2001
From: tianxx7 <1729549607@qq.com>
Date: Tue, 19 May 2020 14:08:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=BF=E7=94=A8gradle=E6=89=93=E6=88=90?=
 =?UTF-8?q?=E5=92=8Cant=E4=B8=80=E6=A0=B7=E7=9A=84zip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 836f58c..6774b3b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,10 +9,20 @@ dependencies {
 //这个不可以使用form /libs/*.*的通配符,
 //可以使用from指定具体的文件名
 //将生成的zip输出到$buildDir下
-task zip(type:Zip,dependsOn:["build"]){
+task copyFile(type:Copy,dependsOn: ["build"]){
     from "$buildDir/libs"
+    from "$projectDir/lib"
     from "$projectDir/plugin.xml"
+    into file("$buildDir/temp/fr-"+"$project.name"+"-$project.version")
+}
+
+task zip(type:Zip,dependsOn:["copyFile"]){
+    from "$buildDir/temp"
     destinationDir file("$buildDir")
+    //生成的文件名 baseName-appendix-0.0.1.zip
+//    baseName 'baseName'
+//    appendix 'appendix'
+//    version '0.0.1'
 }
 //先清理再build
 build.mustRunAfter clean

From 92cef2e774b2e86e739a10f62780e2642b40c004 Mon Sep 17 00:00:00 2001
From: tianxx7 <1729549607@qq.com>
Date: Thu, 21 May 2020 10:58:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A5=BC=E5=9B=BE?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=B8=BAgradle,=E5=91=BD=E4=BB=A4=E8=A1=8Cgr?=
 =?UTF-8?q?adle=20zip=E8=BF=9B=E8=A1=8C=E6=8F=92=E4=BB=B6=E6=89=93?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ant_build.xml | 10 ++++++++++
 build.gradle  | 45 ++++++++++++++++++++++++++++++++++++---------
 2 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 ant_build.xml

diff --git a/ant_build.xml b/ant_build.xml
new file mode 100644
index 0000000..15c436f
--- /dev/null
+++ b/ant_build.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+    <target name="compile_javas" depends="copyFiles">
+        <echo message="编译${compile_files}下的Java文件"/>
+        <taskdef name="pretreatment" classname="com.fr.plugin.pack.PluginPretreatmentTask">
+            <classpath refid="compile.classpath"/>
+        </taskdef>
+        <pretreatment baseDir="${projectDir}"/>
+    </target>
+</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6774b3b..ae4b2de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,12 +4,40 @@ dependencies {
     //使用本地jar
     implementation  fileTree(dir: 'lib', include: ['*.jar'])
 }
+ant.importBuild("ant_build.xml")
+//定义ant变量
+ant.projectDir = projectDir
+//定义ant中的path标签
+ant.references["compile.classpath"] = ant.path {
+    fileset(dir: "lib", includes: '*.jar')
+    fileset(dir: "$rootDir/webroot/WEB-INF/lib", includes: '*.jar')
+    fileset(dir: ".",includes:"**/*.jar" )
+}
+//clean -> classes -> copyFiles -> compile_javas(ant加密) -> preJar -> makeJar->copyFile->zip
+classes.dependsOn('clean')
+
+task copyFiles(type: Copy,dependsOn: 'classes'){
+    from "$buildDir/classes/java/main"
+    from "$buildDir/resources/main"
+    into "$projectDir/classes"
+}
+
+task preJar(type:Copy,dependsOn: 'compile_javas'){
+    from "$projectDir/classes"
+    into "$buildDir/classes/java/main"
+    include "**/*.class"
+    doLast(){
+        delete file("$projectDir/classes")
+    }
+}
+jar.dependsOn("preJar")
+
+task makeJar(type: Jar,dependsOn: preJar){
+    from fileTree(dir:"$buildDir/classes/java/main")
+    destinationDir = file("$buildDir/libs")
+}
 
-//将下面两个文件夹的内容打包成为zip
-//这个不可以使用form /libs/*.*的通配符,
-//可以使用from指定具体的文件名
-//将生成的zip输出到$buildDir下
-task copyFile(type:Copy,dependsOn: ["build"]){
+task copyFile(type: Copy,dependsOn: ["jar"]){
     from "$buildDir/libs"
     from "$projectDir/lib"
     from "$projectDir/plugin.xml"
@@ -18,14 +46,13 @@ task copyFile(type:Copy,dependsOn: ["build"]){
 
 task zip(type:Zip,dependsOn:["copyFile"]){
     from "$buildDir/temp"
-    destinationDir file("$buildDir")
-    //生成的文件名 baseName-appendix-0.0.1.zip
+    destinationDir file("$buildDir/install")
+    //生成的文件名: baseName-appendix-0.0.1.zip
 //    baseName 'baseName'
 //    appendix 'appendix'
 //    version '0.0.1'
 }
-//先清理再build
-build.mustRunAfter clean
+
 //控制build时包含哪些文件,排除哪些文件
 processResources {
 //    exclude everything