From 13ff6599513565a4a8b963bfa11e56d81bf972b1 Mon Sep 17 00:00:00 2001
From: richie <richie@fanruan.com>
Date: Fri, 19 Oct 2018 16:09:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   3 +-
 plugin-formula-script                         |   1 +
 plugin-function/build.xml                     | 126 ------------------
 plugin-function/plugin.xml                    |  18 ---
 plugin-function/pom.xml                       |  28 ----
 .../src/main/java/com/fr/plugin/MyAbs.java    |  30 -----
 plugin-iframe                                 |   1 -
 pom.xml                                       |   9 ++
 8 files changed, 12 insertions(+), 204 deletions(-)
 create mode 160000 plugin-formula-script
 delete mode 100644 plugin-function/build.xml
 delete mode 100644 plugin-function/plugin.xml
 delete mode 100644 plugin-function/pom.xml
 delete mode 100644 plugin-function/src/main/java/com/fr/plugin/MyAbs.java
 delete mode 160000 plugin-iframe

diff --git a/.gitignore b/.gitignore
index 3a2d861..1bf50a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 .idea/
 /target/
 /download/
-/webroot/
\ No newline at end of file
+/webroot/
+.DS_Store
\ No newline at end of file
diff --git a/plugin-formula-script b/plugin-formula-script
new file mode 160000
index 0000000..6788064
--- /dev/null
+++ b/plugin-formula-script
@@ -0,0 +1 @@
+Subproject commit 6788064856d8fd8af5a91cea5773d601d5b8cb94
diff --git a/plugin-function/build.xml b/plugin-function/build.xml
deleted file mode 100644
index 59ae0c1..0000000
--- a/plugin-function/build.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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/plugin-function/plugin.xml b/plugin-function/plugin.xml
deleted file mode 100644
index d7c1db9..0000000
--- a/plugin-function/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><plugin>
-    <id>com.fr.plugin.function.test</id>
-    <name><![CDATA[测试函数插件]]></name>
-    <active>yes</active>
-    <version>1.0</version>
-    <env-version>10.0</env-version>
-    <jartime>2018-07-31</jartime>
-    <vendor>author</vendor>
-    <description><![CDATA[可以把一组数组都求绝对值]]></description>
-    <change-notes><![CDATA[
-      [2018-08-01]修改一点问题。<br/>
-      [2018-07-31]初始化插件。<br/>
-    ]]></change-notes>
-    <extra-core>
-        <FunctionDefineProvider class="com.fr.plugin.MyAbs" name="MyAbs" description="求绝对值，支持数组。"/>
-    </extra-core>
-    <function-recorder class="com.fr.plugin.MyAbs"/>
-</plugin>
\ No newline at end of file
diff --git a/plugin-function/pom.xml b/plugin-function/pom.xml
deleted file mode 100644
index e8d28af..0000000
--- a/plugin-function/pom.xml
+++ /dev/null
@@ -1,28 +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>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/plugin-function/src/main/java/com/fr/plugin/MyAbs.java b/plugin-function/src/main/java/com/fr/plugin/MyAbs.java
deleted file mode 100644
index 78dab4c..0000000
--- a/plugin-function/src/main/java/com/fr/plugin/MyAbs.java
+++ /dev/null
@@ -1,30 +0,0 @@
-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) {
-            return Primitive.ERROR_VALUE;
-        } else if (len == 1) {
-            return Math.abs(GeneralUtils.objectToNumber(args[0]).doubleValue());
-        } else {
-            FArray<Double> result = new FArray<Double>();
-            for (Object arg : args) {
-                result.add(GeneralUtils.objectToNumber(arg).doubleValue());
-            }
-        }
-        return Primitive.ERROR_VALUE;
-    }
-}
diff --git a/plugin-iframe b/plugin-iframe
deleted file mode 160000
index f77aab6..0000000
--- a/plugin-iframe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f77aab6afd9bfbcf73b29100e6934feffc263832
diff --git a/pom.xml b/pom.xml
index 4c4df1a..257a177 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,17 @@
     </properties>
     <modules>
         <module>plugin-function</module>
+        <module>plugin-formula-script</module>
+        <module>plugin-iframe</module>
     </modules>
     <dependencies>
+        <!-- tools.jar包 -->
+        <dependency>
+            <groupId>jdk.tools</groupId>
+            <artifactId>tools</artifactId>
+            <version>1.8</version>
+            <systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>
+        </dependency>
         <!-- core包 -->
         <dependency>
             <groupId>com.fr.third</groupId>