diff --git a/bin/javadoc.sh b/bin/javadoc.sh index 38eb2b683..0341e1d22 100755 --- a/bin/javadoc.sh +++ b/bin/javadoc.sh @@ -4,3 +4,8 @@ # 多模块聚合文档,生成在target/site/apidocs exec mvn javadoc:aggregate + +bin_home="$(dirname ${BASH_SOURCE[0]})" + +# 拷贝自定义的index.html到聚合文档目录 +cp -vf $bin_home/../docs/apidocs/index.html $bin_home/../target/reports/apidocs/ diff --git a/hutool-json/src/main/java/cn/hutool/json/JSON.java b/hutool-json/src/main/java/cn/hutool/json/JSON.java index 9a5972cc9..3034902d8 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSON.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSON.java @@ -117,6 +117,7 @@ public interface JSON extends Cloneable, Serializable, IJSONTypeConverter { * * @param expression 表达式 * @param targetType 返回值类型 + * @param 获取对象类型 * @return 对象 * @see BeanPath#get(Object) * @since 5.8.34 diff --git a/pom.xml b/pom.xml index 8fc8c657b..57b32548a 100755 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.11.2 package