commit a674a39a5b2d4d5e8399b2f077db4f6007f8a537 Author: rinoux Date: Mon Nov 2 14:50:30 2020 +0800 demo代码 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1e1a9e5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +lib/report +*/*.zip +*.iml +.gradle +.idea +.DS_Store +build +*/build +*.ipr +*.iws +classes +pom.xml + +# test code +**/OutputClassFileContent.java + +local.properties \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..faf1bb7 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +# 数据集额外属性插件 + +## 使用场景 +- 和IOFileAttrMark使用类似，以插件的方式，为数据集添加额外的属性，且插件卸载后不会丢失。 + +## 注意事项 +- 注册插件接口后，使用```com.fr.base.TableData#getAttrMark```获取属性，使用```com.fr.base.TableData#addAttrMark```添加属性 \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..b636189 --- /dev/null +++ b/build.gradle @@ -0,0 +1,165 @@ +import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel + +plugins { + id 'java' + id 'java-library' +} + +def loadLocalProp() { + Properties prop = new Properties(); + File propFile = new File(projectDir.getAbsolutePath(), "local.properties") + if (propFile.exists()) { + prop.load(propFile.newDataInputStream()) + } + return prop +} + +def getRootGradle() { + def currentGradle = gradle + while (currentGradle.parent) { + currentGradle = currentGradle.parent + } + return currentGradle +} + +def findOutputPath(Properties p) { + def localEnv = p.getProperty("local.env") + if (localEnv != null && localEnv.length() > 0) { + return localEnv + } + def rootGradle = getRootGradle() + def hookProject = rootGradle.getIncludedBuilds() + .find({ build -> build.name == 'hook' }) + if (hookProject) { + def path = hookProject.projectDir.parentFile.parent + '/env/webroot/WEB-INF' + return path + } + return projectDir.getAbsolutePath() + "/env/webroot/WEB-INF" +} + +def getFRVersion(String name) { + def v = localProp.getProperty("local.dev." + name) + if ("true".equalsIgnoreCase(v)) { + return "DEV" + frVersion + } + return frVersion +} + +/* +工程自定义配置说明 +--------------- +1. 工程env默认情况为build.gradle所在目录下的env/webroot/WEB-INF， + 如果本工程是导入FR主代码工程中，env路径是主代码工程finereport-maven所在目录下的env/webroot/WEB-INF +2. 如果需要自定义env路径，则在build.gradle所在目录下创建一个local.properties文件（该文件不会进入git仓库） + 在里面添加: + local.env=你的WEB-INF目录 +3. 主jar依赖默认只依赖jar包，对于有代码的模块，也可以在local.properties文件中增加对应的配置来让其依赖代码 + 例如存在core和report-engine的代码，只需在local.properties中新增: + local.dev.core=true + local.dev.report-engine=true + 最终的依赖就是: + com.fr.core:fine-core:DEV10.0-RELEASE-SNAPSHOT + com.fr.report:fine-report-engine:DEV10.0-RELEASE-SNAPSHOT + 可以依赖代码的模块有以下几个: + local.dev.third=true + local.dev.core=true + local.dev.activator=true + local.dev.datasource=true + local.dev.webui=true + local.dev.decision=true + local.dev.decision-report=true + local.dev.schedule=true + local.dev.schedule-report=true + local.dev.report-engine=true + local.dev.report-designer=true +4. 完整local.properties内容示例，假设输出目录自定义为/Users/rinoux/envs/dev/webroot/WEB-INF， + 依赖代码的模块为core,activator,datasource,decision,decision-report,report-engine,report-designer， + 文件内容如下： + local.env=/Users/rinoux/envs/dev/webroot/WEB-INF + local.dev.core=true + local.dev.activator=true + local.dev.datasource=true + local.dev.decision=true + local.dev.decision-report=true + local.dev.report-engine=true + local.dev.report-designer=true + */ + +ext { + localProp = loadLocalProp() + env = findOutputPath(localProp) + frVersion = "10.0-RELEASE-SNAPSHOT" + + def xmlParser = new XmlParser(); + def plugin = xmlParser.parse("${project.projectDir}/plugin.xml") + finePluginId = plugin.id[0].find() + finePluginVersion = plugin.version[0].find() + + //插件编译目录 + outputPath = "${env}/plugins/plugin-${finePluginId}-${finePluginVersion}" + ignoreTestFailureSetting = true + languageLevelSetting = 1.8 +} + +dependencies { +} + +allprojects { + apply plugin: 'java' + apply plugin: 'java-library' + apply plugin: 'maven-publish' + apply plugin: 'java-gradle-plugin' + apply plugin: 'idea' + + group 'com.fr.plugin' + version frVersion + sourceCompatibility = languageLevelSetting + targetCompatibility = languageLevelSetting + + tasks.withType(JavaCompile) { + options.encoding = "UTF-8" + } + + repositories { + mavenLocal() + } + + idea { + module { + inheritOutputDirs = false + outputDir = file(outputPath + "/classes") + testOutputDir = file(outputPath + "/test-classes") + languageLevel = new IdeaLanguageLevel(sourceCompatibility) + targetBytecodeVersion = targetCompatibility + } + } + + + task copyPluginXML(type: Copy) { + //拷贝plugin.xml到插件安装目录 + into outputPath + from(projectDir.getAbsolutePath()) { + include "plugin.xml" + } + } + processResources.dependsOn copyPluginXML + + dependencies { + implementation 'com.fr.third.server:servlet-api:3.0' + implementation 'com.fr.third:fine-third:' + getFRVersion("third") + implementation 'com.fr.core:fine-core:' + getFRVersion("core") + implementation 'com.fr.activator:fine-activator:' + getFRVersion("activator") + implementation 'com.fr.datasource:fine-datasource:' + getFRVersion("datasource") + implementation 'com.fr.webui:fine-webui:' + getFRVersion("webui") + implementation 'com.fr.decision:fine-decision:' + getFRVersion("decision") + implementation 'com.fr.decision:fine-decision-report:' + getFRVersion("decision-report") + implementation 'com.fr.schedule:fine-schedule:' + getFRVersion("schedule") + implementation 'com.fr.schedule:fine-schedule-report:' + getFRVersion("schedule-report") + implementation 'com.fr.report:fine-report-engine:' + getFRVersion("report-engine") + implementation 'com.fr.report:fine-report-designer:' + getFRVersion("report-designer") + testImplementation 'org.easymock:easymock:3.5.1' + testImplementation 'org.powermock:powermock-module-junit4:1.7.1' + testImplementation 'org.powermock:powermock-api-easymock:1.7.1' + testImplementation 'junit:junit:4.12' + } +} \ No newline at end of file diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..1dec331 --- /dev/null +++ b/build.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..62d4c05 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..622ab64 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..fbd7c51 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..a9f778a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,104 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/plugin.xml b/plugin.xml new file mode 100644 index 0000000..c38b8bd --- /dev/null +++ b/plugin.xml @@ -0,0 +1,22 @@ + + + com.fr.plugin.tabledata.extra.attr.demo + + yes + no + 1.0 + 10.0 + 2020-10-22 + finereport + + + + com.fr.plugin + + + + + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..a55bafa --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + maven { + url 'http://mvn.finedevelop.com/repository/maven-public/' + } + } +} +rootProject.name = 'plugin-tabledata-extra-attr-demo' + diff --git a/src/main/java/com/fr/plugin/tabledata/attr/DemoTDXtraConfig.java b/src/main/java/com/fr/plugin/tabledata/attr/DemoTDXtraConfig.java new file mode 100644 index 0000000..3d0fb45 --- /dev/null +++ b/src/main/java/com/fr/plugin/tabledata/attr/DemoTDXtraConfig.java @@ -0,0 +1,58 @@ +package com.fr.plugin.tabledata.attr; + +import com.fr.log.FineLoggerFactory; +import com.fr.plugin.transform.ExecuteFunctionRecord; +import com.fr.plugin.transform.FunctionRecorder; +import com.fr.stable.StringUtils; +import com.fr.stable.fun.impl.AbstractTableDataAttrMark; +import com.fr.stable.xml.XMLPrintWriter; +import com.fr.stable.xml.XMLableReader; + +/** + * @author rinoux + * @version 10.0 + * Created by rinoux on 2020/11/2 + */ +@FunctionRecorder +public class DemoTDXtraConfig extends AbstractTableDataAttrMark { + + public static final String XML_TAG = "DemoTDXtraConfig"; + public static final String ATTR_MARK_TAG = "DemoTDXtraConfigAttr"; + + + private String demoAttr = "this is a tabledata extra attr demo"; + + + @ExecuteFunctionRecord + public String getDemoAttr() { + return demoAttr; + } + + public void setDemoAttr(String demoAttr) { + this.demoAttr = demoAttr; + } + + @Override + public String attrMarkTag() { + return ATTR_MARK_TAG; + } + + @Override + public void readXML(XMLableReader reader) { + if (reader.isChildNode()) { + String tagName = reader.getTagName(); + if (XML_TAG.equals(tagName)) { + this.demoAttr = reader.getAttrAsString("demoAttr", StringUtils.EMPTY); + FineLoggerFactory.getLogger().info("demoAttr is found as value {}", this.demoAttr); + } + } + } + + @Override + public void writeXML(XMLPrintWriter writer) { + XMLPrintWriter configTag = writer.startTAG(XML_TAG); + + configTag.attr("demoAttr", this.demoAttr); + configTag.end(); + } +}