From 9fe18b1d238227de207021dfab5f897e927f40bd Mon Sep 17 00:00:00 2001 From: richie Date: Thu, 4 Jun 2020 17:48:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8gradle=E6=9E=84=E5=BB=BAjavad?= =?UTF-8?q?oc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 11 +- build.gradle | 60 ++++++ gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 ++++++++++++++++++ gradlew.bat | 100 ++++++++++ readme.md | 6 +- settings.gradle | 1 + .../com/fanruan/api/cal/CalculatorKit.java | 4 +- .../fanruan/api/conf/BaseConfiguration.java | 2 - .../api/decision/role/CustomRoleKit.java | 2 +- .../fanruan/api/design/util/GUICoreKit.java | 2 +- .../api/design/work/RichTextToolBar.java | 2 +- .../com/fanruan/api/function/FunctionKit.java | 2 +- .../fanruan/api/function/shell/FineFunc.java | 6 +- .../net/http/rs/BaseHttpResponseHandle.java | 2 +- .../api/net/http/rs/StreamResponseHandle.java | 2 +- .../api/net/http/rs/TextResponseHandle.java | 2 +- .../api/net/http/rs/UploadResponseHandle.java | 2 +- .../com/fanruan/api/report/TemplateKit.java | 2 +- .../fanruan/api/report/analy/AnalyKit.java | 2 +- .../java/com/fanruan/api/util/CodeKit.java | 1 - src/main/java/com/fanruan/api/util/IOKit.java | 1 - .../java/com/fanruan/api/util/StringKit.java | 6 - .../com/fanruan/api/util/TransmissionKit.java | 2 +- .../fanruan/api/util/trans/BaseSmsBody.java | 2 +- .../fanruan/api/util/trans/BatchSmsBody.java | 2 +- .../com/fanruan/api/util/trans/EmailBody.java | 2 +- .../fanruan/api/util/trans/SingleSmsBody.java | 2 +- .../java/com/fanruan/api/ModulePrepare.java | 2 +- .../fanruan/api/cal/CalculatorKitEnvTest.java | 2 +- .../fanruan/api/cal/CalculatorKitTest.java | 2 +- .../fanruan/api/function/FunctionKitTest.java | 2 +- .../fanruan/api/util/TransmissionKitTest.java | 2 +- 33 files changed, 386 insertions(+), 40 deletions(-) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index 71cf645..e3ae075 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,13 @@ *.iml .idea/ -target/ +/target/ +/download/ +/webroot/ .DS_Store -.classpath +.gradle +build +local.properties +classes/ +transform-classes/ +tomcat.* *.jar \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..9dc9fe6 --- /dev/null +++ b/build.gradle @@ -0,0 +1,60 @@ +apply plugin: 'java' + +/** + * 可以修改这个变量以依赖不同的开发版本 + */ +def fineVersion = '10.0-FEATURE-SNAPSHOT' + +group = 'com.fanruan.api' +version = '10.0' +sourceCompatibility = '1.8' + +static def getDate() { + def date = new Date() + def formattedDate = date.format('yyyyMMdd') + return formattedDate +} + +jar { + manifest{ + attributes ("Manifest-Version" : "10.0", "Build" : getDate()) + } + baseName 'finekit' + version archiveVersion.get() + "-" + getDate() +} + +repositories { + mavenLocal() + maven { + url = uri('http://mvn.finedevelop.com/repository/maven-public/') + } + + maven { + url = uri('http://repo.maven.apache.org/maven2') + } +} + +dependencies { + implementation files("${System.getProperty('java.home')}/../lib/tools.jar") + implementation 'com.fr.third:fine-third:' + fineVersion + implementation 'com.fr.activator:fine-activator:' + fineVersion + implementation 'com.fr.core:fine-core:' + fineVersion + implementation 'com.fr.webui:fine-webui:' + fineVersion + implementation 'com.fr.datasource:fine-datasource:' + fineVersion + implementation 'com.fr.decision:fine-decision:' + fineVersion + implementation 'com.fr.decision:fine-decision-report:' + fineVersion + implementation 'com.fr.schedule:fine-schedule:' + fineVersion + implementation 'com.fr.schedule:fine-schedule-report:' + fineVersion + implementation 'com.fr.intelligence:fine-swift:' + fineVersion + implementation 'com.fr.intelligence:fine-accumulator:' + fineVersion + implementation 'com.fr.report:fine-report-engine:' + fineVersion + implementation 'com.fr.report:fine-report-designer:' + fineVersion + + implementation 'org.slf4j:slf4j-api:1.7.30' + implementation 'org.slf4j:slf4j-simple:1.7.30' + testImplementation 'junit:junit:4.12' + testImplementation 'org.easymock:easymock:3.5.1' + testImplementation 'org.powermock:powermock-api-easymock:1.7.1' + testImplementation 'org.powermock:powermock-module-junit4:1.7.1' + testImplementation 'com.squareup.okhttp3:mockwebserver:4.0.1' +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..07291ca --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://downloads.gradle-dn.com/distributions/gradle-6.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..2fe81a7 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/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..9618d8d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@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 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/readme.md b/readme.md index 5a58af5..3c18126 100644 --- a/readme.md +++ b/readme.md @@ -45,10 +45,10 @@ SessionKit#getSession(@NotNull String sessionID); ## 使用方法 ### 生成运行时依赖jar包 -先使用maven打包,执行下面的命令(跳过单元测试) +先使用gradle打包,执行下面的命令(跳过单元测试) ``` - mvn package -Dmaven.test.skip=true + gradle build -x test ``` 会在target目录下获得一个形如finekit-10.0-20190815.jar名字jar包,直接作为插件依赖jar包即可。 @@ -57,7 +57,7 @@ SessionKit#getSession(@NotNull String sessionID); 执行maven命令 ``` -mvn javadoc:javadoc +gradle javadoc ``` 即可在target/javadocs目录下获取到javadoc文档。 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..815124a --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'finekit' \ No newline at end of file diff --git a/src/main/java/com/fanruan/api/cal/CalculatorKit.java b/src/main/java/com/fanruan/api/cal/CalculatorKit.java index 195141d..108c5ec 100644 --- a/src/main/java/com/fanruan/api/cal/CalculatorKit.java +++ b/src/main/java/com/fanruan/api/cal/CalculatorKit.java @@ -24,7 +24,7 @@ import java.util.Map; * @author zack * @version 10.0 * 帆软算子工具类(主要用于公式计算) - * @date 2019/8/23 + * @since 2019/8/23 */ public class CalculatorKit { /** @@ -39,7 +39,7 @@ public class CalculatorKit { /** * 创建一个带参数计算的算子 * (可以支持计算入参paraMap里面相关的带参函数, - * 比如paraMap带有参数a->1,b->2,CalculatorKit.createCalculator(paraMap).evalValue("SUM(a,b)")输出3) + * 比如paraMap带有参数

a->1,b->2,CalculatorKit.createCalculator(paraMap).evalValue("SUM(a,b)")

输出3) * * @return 算子 */ diff --git a/src/main/java/com/fanruan/api/conf/BaseConfiguration.java b/src/main/java/com/fanruan/api/conf/BaseConfiguration.java index c6b7066..637a887 100644 --- a/src/main/java/com/fanruan/api/conf/BaseConfiguration.java +++ b/src/main/java/com/fanruan/api/conf/BaseConfiguration.java @@ -8,7 +8,6 @@ import com.fr.config.DefaultConfiguration; * @version 10.0 * Created by richie on 2019-08-16 * 插件要实现配置类的时候,直接继承该抽象类即可 - *

* private static class MyConf extends BaseConfiguration { * * private static volatile MyConf instance = null; @@ -20,7 +19,6 @@ import com.fr.config.DefaultConfiguration; * return instance; * } * } - *

*/ public abstract class BaseConfiguration extends DefaultConfiguration { diff --git a/src/main/java/com/fanruan/api/decision/role/CustomRoleKit.java b/src/main/java/com/fanruan/api/decision/role/CustomRoleKit.java index a6d3261..a824a60 100644 --- a/src/main/java/com/fanruan/api/decision/role/CustomRoleKit.java +++ b/src/main/java/com/fanruan/api/decision/role/CustomRoleKit.java @@ -2,8 +2,8 @@ package com.fanruan.api.decision.role; import com.fr.decision.authority.data.CustomRole; import com.fr.decision.webservice.utils.ControllerFactory; +import org.jetbrains.annotations.NotNull; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/fanruan/api/design/util/GUICoreKit.java b/src/main/java/com/fanruan/api/design/util/GUICoreKit.java index 455914c..8187078 100644 --- a/src/main/java/com/fanruan/api/design/util/GUICoreKit.java +++ b/src/main/java/com/fanruan/api/design/util/GUICoreKit.java @@ -82,7 +82,7 @@ public class GUICoreKit { * 生成一个边界布局的容器,并根据参数规则将组件添加进去 *

* GUICoreKit.createBorderLayoutPane(new JLabel(), BorderLayout.CENTER, new JButton(), BorderLayout.NORTH); - *

+ *

* * @param args 布局内部的元素,位置等 * @return 具有边界布局的面板 diff --git a/src/main/java/com/fanruan/api/design/work/RichTextToolBar.java b/src/main/java/com/fanruan/api/design/work/RichTextToolBar.java index 995bc25..33510a5 100644 --- a/src/main/java/com/fanruan/api/design/work/RichTextToolBar.java +++ b/src/main/java/com/fanruan/api/design/work/RichTextToolBar.java @@ -462,7 +462,7 @@ public class RichTextToolBar extends BasicPane { * 从样式中更新工具栏上的按钮状态 * * @param attrs 样式 - * @date 2015-1-5-下午5:12:33 + * @since 2015-1-5-下午5:12:33 */ public void populateToolBar(AttributeSet attrs) { int size = scaleDown(StyleConstants.getFontSize(attrs)); diff --git a/src/main/java/com/fanruan/api/function/FunctionKit.java b/src/main/java/com/fanruan/api/function/FunctionKit.java index 7c5d03e..b580335 100644 --- a/src/main/java/com/fanruan/api/function/FunctionKit.java +++ b/src/main/java/com/fanruan/api/function/FunctionKit.java @@ -15,7 +15,7 @@ import java.util.List; /** * @author zack - * @date 2019/8/23 + * @since 2019/8/23 * @version 10.0 * 函数相关工具类 */ diff --git a/src/main/java/com/fanruan/api/function/shell/FineFunc.java b/src/main/java/com/fanruan/api/function/shell/FineFunc.java index 06f8ead..25f732b 100644 --- a/src/main/java/com/fanruan/api/function/shell/FineFunc.java +++ b/src/main/java/com/fanruan/api/function/shell/FineFunc.java @@ -5,9 +5,9 @@ import com.fr.stable.script.FunctionDef; /** * ClassName FineFunc * - * @Author zack - * @Date 2019/8/23 - * @Version 10.0 + * @author zack + * @since 2019/8/23 + * @version 10.0 * 自定义函数实体 */ public class FineFunc extends FunctionDef { diff --git a/src/main/java/com/fanruan/api/net/http/rs/BaseHttpResponseHandle.java b/src/main/java/com/fanruan/api/net/http/rs/BaseHttpResponseHandle.java index 4198916..31eb3b3 100644 --- a/src/main/java/com/fanruan/api/net/http/rs/BaseHttpResponseHandle.java +++ b/src/main/java/com/fanruan/api/net/http/rs/BaseHttpResponseHandle.java @@ -9,7 +9,7 @@ import java.io.IOException; * http 结果解析器 * * @author vito - * @date 2019-07-14 + * @since 2019-07-14 */ public abstract class BaseHttpResponseHandle { diff --git a/src/main/java/com/fanruan/api/net/http/rs/StreamResponseHandle.java b/src/main/java/com/fanruan/api/net/http/rs/StreamResponseHandle.java index e10bfdd..b8bb9cd 100644 --- a/src/main/java/com/fanruan/api/net/http/rs/StreamResponseHandle.java +++ b/src/main/java/com/fanruan/api/net/http/rs/StreamResponseHandle.java @@ -12,7 +12,7 @@ import java.io.InputStream; * 流响应解析器 * * @author vito - * @date 2019-07-14 + * @since 2019-07-14 */ public class StreamResponseHandle extends BaseHttpResponseHandle { diff --git a/src/main/java/com/fanruan/api/net/http/rs/TextResponseHandle.java b/src/main/java/com/fanruan/api/net/http/rs/TextResponseHandle.java index c8c58c0..5418e27 100644 --- a/src/main/java/com/fanruan/api/net/http/rs/TextResponseHandle.java +++ b/src/main/java/com/fanruan/api/net/http/rs/TextResponseHandle.java @@ -10,7 +10,7 @@ import java.io.IOException; * 文本响应解析器 * * @author vito - * @date 2019-07-14 + * @since 2019-07-14 */ public class TextResponseHandle extends BaseHttpResponseHandle { diff --git a/src/main/java/com/fanruan/api/net/http/rs/UploadResponseHandle.java b/src/main/java/com/fanruan/api/net/http/rs/UploadResponseHandle.java index 3b68be0..478b4a0 100644 --- a/src/main/java/com/fanruan/api/net/http/rs/UploadResponseHandle.java +++ b/src/main/java/com/fanruan/api/net/http/rs/UploadResponseHandle.java @@ -11,7 +11,7 @@ import java.io.IOException; * 上传响应解析器 * * @author vito - * @date 2019-07-14 + * @since 2019-07-14 */ public class UploadResponseHandle extends BaseHttpResponseHandle { diff --git a/src/main/java/com/fanruan/api/report/TemplateKit.java b/src/main/java/com/fanruan/api/report/TemplateKit.java index f2282df..a670b57 100644 --- a/src/main/java/com/fanruan/api/report/TemplateKit.java +++ b/src/main/java/com/fanruan/api/report/TemplateKit.java @@ -4,7 +4,7 @@ import com.fr.io.TemplateWorkBookIO; import com.fr.main.TemplateWorkBook; /** * @author zack - * @date 2019/8/23 + * @since 2019/8/23 * @version 10.0 * 模板操作相关工具类 */ diff --git a/src/main/java/com/fanruan/api/report/analy/AnalyKit.java b/src/main/java/com/fanruan/api/report/analy/AnalyKit.java index 0deba55..00f3125 100644 --- a/src/main/java/com/fanruan/api/report/analy/AnalyKit.java +++ b/src/main/java/com/fanruan/api/report/analy/AnalyKit.java @@ -22,7 +22,7 @@ import java.util.Map; /** * @author zack - * @date 2019/8/23 + * @since 2019/8/23 * @version 10.0 * 数据分析相关工具类 */ diff --git a/src/main/java/com/fanruan/api/util/CodeKit.java b/src/main/java/com/fanruan/api/util/CodeKit.java index 5336e8d..f501e98 100644 --- a/src/main/java/com/fanruan/api/util/CodeKit.java +++ b/src/main/java/com/fanruan/api/util/CodeKit.java @@ -41,7 +41,6 @@ public class CodeKit { * * @param text 经过处理的字符串 * @return 字符串 - * @throws Exception */ public static String encodeURIComponent(String text) { return CommonCodeUtils.encodeURIComponent(text); diff --git a/src/main/java/com/fanruan/api/util/IOKit.java b/src/main/java/com/fanruan/api/util/IOKit.java index ce37a3f..08d6ebc 100644 --- a/src/main/java/com/fanruan/api/util/IOKit.java +++ b/src/main/java/com/fanruan/api/util/IOKit.java @@ -142,7 +142,6 @@ public class IOKit { /** * 将输入流转为byte数组 - *

* 原来的写法是 byte[] b = new byte[in.avalable]; in.read(b); * 但是在CipherInputStream测试的时候,发现拿到的byte[]长度为0 * diff --git a/src/main/java/com/fanruan/api/util/StringKit.java b/src/main/java/com/fanruan/api/util/StringKit.java index 9e55aa2..0910b56 100644 --- a/src/main/java/com/fanruan/api/util/StringKit.java +++ b/src/main/java/com/fanruan/api/util/StringKit.java @@ -16,7 +16,6 @@ public class StringKit { /** *

检查一个字符串是否是空字符串

- *

*

      * StringKit.isEmpty(null)      = true
      * StringKit.isEmpty("")        = true
@@ -24,7 +23,6 @@ public class StringKit {
      * StringKit.isEmpty("bob")     = false
      * StringKit.isEmpty("  bob  ") = false
      * 
- *

* * @param text 被检查的字符串,可能为null * @return 如果字符串为空或者是null则返回true,否则返回false @@ -35,14 +33,12 @@ public class StringKit { /** *

检查一个字符串是否不为空字符串

- *

*

      * StringKit.isNotEmpty(null)      = false
      * StringKit.isNotEmpty("")        = false
      * StringKit.isNotEmpty(" ")       = true
      * StringKit.isNotEmpty("bob")     = true
      * StringKit.isNotEmpty("  bob  ") = true
-     * 
* * @param text 被检查的字符串,可能是null * @return 如果字符串不为空且不是null则返回true,否则返回false @@ -53,7 +49,6 @@ public class StringKit { /** *

检查一个字符串是否为空白字符串

- *

*

      * StringKit.isBlank(null)      = true
      * StringKit.isBlank("")        = true
@@ -71,7 +66,6 @@ public class StringKit {
 
     /**
      * 

检查一个字符串是否不是空白字符串

- *

*

      * StringKit.isNotBlank(null)      = false
      * StringKit.isNotBlank("")        = false
diff --git a/src/main/java/com/fanruan/api/util/TransmissionKit.java b/src/main/java/com/fanruan/api/util/TransmissionKit.java
index afd0ea4..1d81d07 100644
--- a/src/main/java/com/fanruan/api/util/TransmissionKit.java
+++ b/src/main/java/com/fanruan/api/util/TransmissionKit.java
@@ -7,7 +7,7 @@ import com.fr.base.sms.SMSManager;
 
 /**
  * @author zack
- * @date 2019/8/23
+ * @since  2019/8/23
  * @version 10.0
  * fine kit for data transmission.(eg. email or sms...)
  * 数据发送工具类(比如:邮件发送,短信发送)
diff --git a/src/main/java/com/fanruan/api/util/trans/BaseSmsBody.java b/src/main/java/com/fanruan/api/util/trans/BaseSmsBody.java
index 0ae2fd5..37a88a7 100644
--- a/src/main/java/com/fanruan/api/util/trans/BaseSmsBody.java
+++ b/src/main/java/com/fanruan/api/util/trans/BaseSmsBody.java
@@ -4,7 +4,7 @@ package com.fanruan.api.util.trans;
  * 抽象短信体
  *
  * @author vito
- * @date 2019-07-24
+ * @since 2019-07-24
  */
 public abstract class BaseSmsBody {
     private String templateCode;
diff --git a/src/main/java/com/fanruan/api/util/trans/BatchSmsBody.java b/src/main/java/com/fanruan/api/util/trans/BatchSmsBody.java
index 005e3aa..4f67db3 100644
--- a/src/main/java/com/fanruan/api/util/trans/BatchSmsBody.java
+++ b/src/main/java/com/fanruan/api/util/trans/BatchSmsBody.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 批量短信体
  *
  * @author vito
- * @date 2019-07-24
+ * @since 2019-07-24
  */
 public class BatchSmsBody extends BaseSmsBody {
     private List mobiles;
diff --git a/src/main/java/com/fanruan/api/util/trans/EmailBody.java b/src/main/java/com/fanruan/api/util/trans/EmailBody.java
index 968bf3e..64a9a0d 100644
--- a/src/main/java/com/fanruan/api/util/trans/EmailBody.java
+++ b/src/main/java/com/fanruan/api/util/trans/EmailBody.java
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.Nullable;
  * 邮件体
  *
  * @author vito
- * @date 2019-07-24
+ * @since 2019-07-24
  */
 public class EmailBody {
     private String toAddress;
diff --git a/src/main/java/com/fanruan/api/util/trans/SingleSmsBody.java b/src/main/java/com/fanruan/api/util/trans/SingleSmsBody.java
index 8c9b872..a1f10c4 100644
--- a/src/main/java/com/fanruan/api/util/trans/SingleSmsBody.java
+++ b/src/main/java/com/fanruan/api/util/trans/SingleSmsBody.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
  * 单个短信体
  *
  * @author vito
- * @date 2019-07-24
+ * @since 2019-07-24
  */
 public class SingleSmsBody extends BaseSmsBody {
     private String mobile;
diff --git a/src/test/java/com/fanruan/api/ModulePrepare.java b/src/test/java/com/fanruan/api/ModulePrepare.java
index b0ae31f..21844d8 100644
--- a/src/test/java/com/fanruan/api/ModulePrepare.java
+++ b/src/test/java/com/fanruan/api/ModulePrepare.java
@@ -19,7 +19,7 @@ import org.junit.Before;
 
 /**
  * @author zack
- * @date 2019/8/26
+ * @since 2019/8/26
  * @version 10.0
  */
 public class ModulePrepare {
diff --git a/src/test/java/com/fanruan/api/cal/CalculatorKitEnvTest.java b/src/test/java/com/fanruan/api/cal/CalculatorKitEnvTest.java
index 9f228c8..e421728 100644
--- a/src/test/java/com/fanruan/api/cal/CalculatorKitEnvTest.java
+++ b/src/test/java/com/fanruan/api/cal/CalculatorKitEnvTest.java
@@ -20,7 +20,7 @@ import java.util.Map;
  * 需要启动模块的算子单元测试
  *
  * @author zack
- * @date 2019/8/23
+ * @since 2019/8/23
  * @version 10.0
  */
 public class CalculatorKitEnvTest extends Prepare {
diff --git a/src/test/java/com/fanruan/api/cal/CalculatorKitTest.java b/src/test/java/com/fanruan/api/cal/CalculatorKitTest.java
index fc6fe62..3ca657e 100644
--- a/src/test/java/com/fanruan/api/cal/CalculatorKitTest.java
+++ b/src/test/java/com/fanruan/api/cal/CalculatorKitTest.java
@@ -10,7 +10,7 @@ import java.util.Map;
 
 /**
  * @author zack
- * @date 2019/8/23
+ * @since 2019/8/23
  * @version 10.0
  */
 public class CalculatorKitTest {
diff --git a/src/test/java/com/fanruan/api/function/FunctionKitTest.java b/src/test/java/com/fanruan/api/function/FunctionKitTest.java
index b3dafbc..4207eec 100644
--- a/src/test/java/com/fanruan/api/function/FunctionKitTest.java
+++ b/src/test/java/com/fanruan/api/function/FunctionKitTest.java
@@ -11,7 +11,7 @@ import static org.junit.Assert.assertNotEquals;
 
 /**
  * @author zack
- * @date 2019/8/23
+ * @since 2019/8/23
  * @version 10.0
  */
 public class FunctionKitTest extends Prepare {
diff --git a/src/test/java/com/fanruan/api/util/TransmissionKitTest.java b/src/test/java/com/fanruan/api/util/TransmissionKitTest.java
index 15da05a..8dec40c 100644
--- a/src/test/java/com/fanruan/api/util/TransmissionKitTest.java
+++ b/src/test/java/com/fanruan/api/util/TransmissionKitTest.java
@@ -9,7 +9,7 @@ import static org.junit.Assert.fail;
 
 /**
  * @author zack
- * @date 2019/8/23
+ * @since 2019/8/23
  * @version 10.0
  */
 public class TransmissionKitTest {