From 522200e7734236a8f9f01dfd3b25c19adaa598ce Mon Sep 17 00:00:00 2001
From: richie <jihua.me@gmail.com>
Date: Tue, 31 Jul 2018 19:32:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/plugin-function/build.xml             | 126 ++++++++++++++++++
 .../plugin-function/build/assembly/zip.xml    |  21 ---
 plugins/plugin-function/plugin.xml            |   2 +-
 plugins/plugin-function/pom.xml               |  24 ----
 .../src/main/java/com/fr/plugin/MyAbs.java    |   5 +
 5 files changed, 132 insertions(+), 46 deletions(-)
 create mode 100644 plugins/plugin-function/build.xml
 delete mode 100644 plugins/plugin-function/build/assembly/zip.xml

diff --git a/plugins/plugin-function/build.xml b/plugins/plugin-function/build.xml
new file mode 100644
index 0000000..59ae0c1
--- /dev/null
+++ b/plugins/plugin-function/build.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project basedir="." default="jar" name="plugin">
+    <!-- JDK路径，根据自己机器上实际位置修改-->
+    <property name="jdk.home" value="/Library/Java/JavaVirtualMachines/JDK1.8/Contents/Home"/>
+
+    <property name="libs" value="${basedir}/lib"/>
+    <property name="publicLibs" value=""/>
+    <property name="reportLibs" value="${basedir}/../../webroot/WEB-INF/lib"/>
+    <property name="destLoc" value="."/>
+    <property name="classes" value="classes"/>
+    <xmlproperty file="${basedir}/plugin.xml"/>
+    <property name="current-version" value="${plugin.version}"/>
+
+    <!-- 插件版本-->
+    <property name="plugin-version" value="${current-version}"/>
+    <!-- 插件名字-->
+    <property name="plugin-name" value="function-test"/>
+    <property name="plugin-jar" value="fr-plugin-${plugin-name}-${plugin-version}.jar"/>
+
+    <target name="prepare">
+        <delete dir="${classes}"/>
+        <delete dir="fr-plugin-${plugin-name}-${plugin-version}"/>
+        <xmlproperty file="${basedir}/plugin.xml"/>
+        <delete dir="${destLoc}/${plugin.name}"/>
+    </target>
+    <path id="compile.classpath">
+        <fileset dir="${libs}">
+            <include name="**/*.jar"/>
+        </fileset>
+        <fileset dir="${publicLibs}">
+            <include name="**/*.jar"/>
+        </fileset>
+        <fileset dir="${reportLibs}">
+            <include name="**/*.jar"/>
+        </fileset>
+    </path>
+    <patternset id="resources4Jar">
+        <exclude name="**/.settings/**"/>
+        <exclude name=".classpath"/>
+        <exclude name=".project"/>
+
+        <exclude name="**/*.java"/>
+        <exclude name="**/*.db"/>
+        <exclude name="**/*.g"/>
+        <exclude name="**/package.html"/>
+    </patternset>
+    <target name="copy_resources">
+        <echo message="从${resources_from}拷贝图片,JS,CSS等资源文件"/>
+        <delete dir="tmp"/>
+        <copy todir="tmp">
+            <fileset dir="${resources_from}/src/main/resources">
+                <patternset refid="resources4Jar"/>
+            </fileset>
+        </copy>
+        <copy todir="${classes}">
+            <fileset dir="tmp"/>
+        </copy>
+        <delete dir="tmp"/>
+    </target>
+    <target name="compile_javas">
+        <echo message="编译${compile_files}下的Java文件"/>
+        <javac destdir="${classes}" debug="false" optimize="on" source="${source_jdk_version}"
+               target="${target_jdk_version}"
+               fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}"
+               executable="${compile_jdk_version}/bin/javac">
+            <src path="${basedir}/src/main/java"/>
+            <exclude name="**/.svn/**"/>
+            <compilerarg line="-encoding UTF8 "/>
+            <classpath refid="compile.classpath"/>
+        </javac>
+    </target>
+
+    <target name="jar_classes">
+        <echo message="打Jar包:${jar_name}"/>
+        <delete file="${basedir}/${jar_name}"/>
+        <jar jarfile="${basedir}/${jar_name}">
+            <fileset dir="${classes}">
+            </fileset>
+        </jar>
+    </target>
+
+    <target name="super_jar" depends="prepare">
+        <antcall target="copy_resources">
+            <param name="resources_from" value="${basedir}"/>
+        </antcall>
+        <antcall target="compile_javas">
+            <param name="source_jdk_version" value="1.6"/>
+            <param name="target_jdk_version" value="1.6"/>
+            <param name="compile_jdk_version" value="${jdk.home}"/>
+            <param name="compile_files" value="${basedir}/src"/>
+        </antcall>
+        <echo message="compile plugin success!"/>
+
+        <antcall target="jar_classes">
+            <param name="jar_name" value="${plugin-jar}"/>
+        </antcall>
+        <delete dir="${classes}"/>
+
+    </target>
+
+    <target name="jar" depends="super_jar">
+        <antcall target="zip"/>
+    </target>
+
+    <target name="zip">
+        <property name="plugin-folder" value="fr-plugin-${plugin-name}-${plugin-version}"/>
+        <echo message="----------zip files----------"/>
+        <mkdir dir="${plugin-folder}"/>
+        <copy todir="${plugin-folder}">
+            <fileset dir=".">
+                <include name="${plugin-jar}"/>
+                <include name="plugin.xml"/>
+            </fileset>
+            <fileset dir="${libs}">
+                <include name="*.jar"/>
+                <include name="*.dll"/>
+            </fileset>
+        </copy>
+        <zip destfile="${basedir}/${plugin-folder}.zip" basedir=".">
+            <include name="${plugin-folder}/*.jar"/>
+            <include name="${plugin-folder}/*.dll"/>
+            <include name="${plugin-folder}/plugin.xml"/>
+        </zip>
+        <move file="${plugin-folder}.zip" todir="${destLoc}/install"/>
+    </target>
+</project>
diff --git a/plugins/plugin-function/build/assembly/zip.xml b/plugins/plugin-function/build/assembly/zip.xml
deleted file mode 100644
index 11da522..0000000
--- a/plugins/plugin-function/build/assembly/zip.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-    <id>Project.release</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>/bin</outputDirectory>
-        </fileSet>
-    </fileSets>
-    <dependencySets>
-        <dependencySet>
-            <useProjectArtifact>true</useProjectArtifact>
-            <outputDirectory>/</outputDirectory>
-            <scope>runtime</scope>
-        </dependencySet>
-    </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/plugins/plugin-function/plugin.xml b/plugins/plugin-function/plugin.xml
index a7553ec..4816b1a 100644
--- a/plugins/plugin-function/plugin.xml
+++ b/plugins/plugin-function/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><plugin>
-    <id>com.fr.plugin.test</id>
+    <id>com.fr.plugin.function.test</id>
     <name><![CDATA[测试函数插件]]></name>
     <active>yes</active>
     <version>1.0</version>
diff --git a/plugins/plugin-function/pom.xml b/plugins/plugin-function/pom.xml
index 5741a87..ada9db6 100644
--- a/plugins/plugin-function/pom.xml
+++ b/plugins/plugin-function/pom.xml
@@ -11,28 +11,4 @@
     </parent>
     <packaging>jar</packaging>
     <artifactId>plugin-function</artifactId>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5.4</version>
-                <executions>
-                    <execution>
-                        <id>make-zip</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptors>
-                        <descriptor>build/assembly/zip.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
\ No newline at end of file
diff --git a/plugins/plugin-function/src/main/java/com/fr/plugin/MyAbs.java b/plugins/plugin-function/src/main/java/com/fr/plugin/MyAbs.java
index 6e2b94a..78dab4c 100644
--- a/plugins/plugin-function/src/main/java/com/fr/plugin/MyAbs.java
+++ b/plugins/plugin-function/src/main/java/com/fr/plugin/MyAbs.java
@@ -2,12 +2,17 @@ package com.fr.plugin;
 
 import com.fr.general.FArray;
 import com.fr.general.GeneralUtils;
+import com.fr.intelli.record.Focus;
+import com.fr.intelli.record.Original;
+import com.fr.record.analyzer.EnableMetrics;
 import com.fr.script.AbstractFunction;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Primitive;
 
+@EnableMetrics
 public class MyAbs extends AbstractFunction  {
 
+    @Focus(id = "com.fr.plugin.function.test", text = "Function description", source = Original.PLUGIN)
     public Object run(Object[] args) {
         int len = ArrayUtils.getLength(args);
         if (len == 0) {