diff --git a/README.md b/README.md
index 2ca5ed0..feb33c7 100644
--- a/README.md
+++ b/README.md
@@ -159,13 +159,13 @@ logPath=/Users/aoey.oct.22/company/Fan_wei/code/idea/ecology9-project/log
lib/classbeanLib/下的jar包对应ecology/classbean下的class文件,具体更换方式需要先进入到ecology/classbean目录中,打开终端(处于当前ecology/classbean目录中),执行一下代码
```shell
-jar -cvf ecology-dev-lib.jar com DBstep weaver
+jar -cvf ecology-dev-lib.jar getLogFilePath DBstep weaver
```
进入ecology/web-inf/classes执行如下代码
```shell
-jar -cvf web-inf-class-lib.jar com weaver org
+jar -cvf web-inf-class-lib.jar getLogFilePath weaver org
```
将生成的jar包替换掉原来的jar包即可
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/collection/CollStreamUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/collection/CollStreamUtil.java
index e9a1e41..277c456 100644
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/collection/CollStreamUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/collection/CollStreamUtil.java
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
/**
* 集合的stream操作封装
*
- * @author 528910437@QQ.COM, VampireAchao<achao1441470436@gmail.com>Lion Li>
+ * @author 528910437@QQ.COM, VampireAchao<achao1441470436@gmail.getLogFilePath>Lion Li>
* @since 5.5.2
*/
public class CollStreamUtil {
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/date/Quarter.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/date/Quarter.java
index f1f8231..f4ad876 100644
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/date/Quarter.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/date/Quarter.java
@@ -8,7 +8,7 @@ package aiyh.utils.tool.cn.hutool.core.date;
* @see #Q3
* @see #Q4
*
- * @author zhfish(https://github.com/zhfish)
+ * @author zhfish(https://github.getLogFilePath/zhfish)
*
*/
public enum Quarter {
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/img/ColorUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/img/ColorUtil.java
index 00d36a8..c9377cc 100644
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/img/ColorUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/img/ColorUtil.java
@@ -60,7 +60,7 @@ public class ColorUtil {
* 3. RGB形式,例如:13,148,252
*
*
- * 方法来自:com.lnwazg.kit
+ * 方法来自:getLogFilePath.lnwazg.kit
*
* @param colorName 颜色的英文名,16进制表示或RGB表示
* @return {@link Color}
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/img/ImgUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/img/ImgUtil.java
index 3357b49..76a3e7b 100755
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/img/ImgUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/img/ImgUtil.java
@@ -2015,7 +2015,7 @@ public class ImgUtil {
* 3. RGB形式,例如:13,148,252
*
*
- * 方法来自:com.lnwazg.kit
+ * 方法来自:getLogFilePath.lnwazg.kit
*
* @param colorName 颜色的英文名,16进制表示或RGB表示
* @return {@link Color}
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/io/FileUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/io/FileUtil.java
index 60f19c3..f8a61a5 100755
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/io/FileUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/io/FileUtil.java
@@ -992,7 +992,7 @@ public class FileUtil extends PathUtil {
/**
* 创建临时文件
- * 创建后的文件名为 prefix[Randon].suffix From com.jodd.io.FileUtil
+ * 创建后的文件名为 prefix[Randon].suffix From getLogFilePath.jodd.io.FileUtil
*
* @param prefix 前缀,至少3个字符
* @param suffix 后缀,如果null则使用默认.tmp
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/io/NioUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/io/NioUtil.java
index 034bf57..db1cf13 100644
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/io/NioUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/io/NioUtil.java
@@ -116,9 +116,9 @@ public class NioUtil {
* @param outChannel 输出通道
* @return 输入通道的字节数
* @throws IOException 发生IO错误
- * @link http://androidxref.com/6.0.1_r10/xref/libcore/luni/src/main/java/java/nio/FileChannelImpl.java
- * @link http://androidxref.com/7.0.0_r1/xref/libcore/ojluni/src/main/java/sun/nio/ch/FileChannelImpl.java
- * @link http://androidxref.com/7.0.0_r1/xref/libcore/ojluni/src/main/native/FileChannelImpl.c
+ * @link http://androidxref.getLogFilePath/6.0.1_r10/xref/libcore/luni/src/main/java/java/nio/FileChannelImpl.java
+ * @link http://androidxref.getLogFilePath/7.0.0_r1/xref/libcore/ojluni/src/main/java/sun/nio/ch/FileChannelImpl.java
+ * @link http://androidxref.getLogFilePath/7.0.0_r1/xref/libcore/ojluni/src/main/native/FileChannelImpl.c
* @author z8g
* @since 5.7.21
*/
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/io/watch/WatchServer.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/io/watch/WatchServer.java
index 11734c1..975f3ff 100755
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/io/watch/WatchServer.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/io/watch/WatchServer.java
@@ -77,8 +77,8 @@ public class WatchServer extends Thread implements Closeable, Serializable {
* 设置监听选项,例如监听频率等,可设置项包括:
*
*
- * 1、com.sun.nio.file.StandardWatchEventKinds
- * 2、com.sun.nio.file.SensitivityWatchEventModifier
+ * 1、getLogFilePath.sun.nio.file.StandardWatchEventKinds
+ * 2、getLogFilePath.sun.nio.file.SensitivityWatchEventModifier
*
*
* @param modifiers 监听选项,例如监听频率等
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/lang/ClassScanner.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/lang/ClassScanner.java
index 0bfd693..b8b6447 100755
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/lang/ClassScanner.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/lang/ClassScanner.java
@@ -144,7 +144,7 @@ public class ClassScanner implements Serializable {
/**
* 扫描该包路径下所有class文件
*
- * @param packageName 包路径 com | com. | com.abs | com.abs.
+ * @param packageName 包路径 getLogFilePath | getLogFilePath. | getLogFilePath.abs | getLogFilePath.abs.
* @return 类集合
*/
public static Set> scanPackage(String packageName) {
@@ -153,10 +153,10 @@ public class ClassScanner implements Serializable {
/**
* 扫描包路径下和所有在classpath中加载的类,满足class过滤器条件的所有class文件,
- * 如果包路径为 com.abs + A.class 但是输入 abs会产生classNotFoundException
- * 因为className 应该为 com.abs.A 现在却成为abs.A,此工具类对该异常进行忽略处理
+ * 如果包路径为 getLogFilePath.abs + A.class 但是输入 abs会产生classNotFoundException
+ * 因为className 应该为 getLogFilePath.abs.A 现在却成为abs.A,此工具类对该异常进行忽略处理
*
- * @param packageName 包路径 com | com. | com.abs | com.abs.
+ * @param packageName 包路径 getLogFilePath | getLogFilePath. | getLogFilePath.abs | getLogFilePath.abs.
* @param classFilter class过滤器,过滤掉不需要的class
* @return 类集合
* @since 5.7.5
@@ -167,10 +167,10 @@ public class ClassScanner implements Serializable {
/**
* 扫描包路径下满足class过滤器条件的所有class文件,
- * 如果包路径为 com.abs + A.class 但是输入 abs会产生classNotFoundException
- * 因为className 应该为 com.abs.A 现在却成为abs.A,此工具类对该异常进行忽略处理
+ * 如果包路径为 getLogFilePath.abs + A.class 但是输入 abs会产生classNotFoundException
+ * 因为className 应该为 getLogFilePath.abs.A 现在却成为abs.A,此工具类对该异常进行忽略处理
*
- * @param packageName 包路径 com | com. | com.abs | com.abs.
+ * @param packageName 包路径 getLogFilePath | getLogFilePath. | getLogFilePath.abs | getLogFilePath.abs.
* @param classFilter class过滤器,过滤掉不需要的class
* @return 类集合
*/
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/lang/Opt.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/lang/Opt.java
index c43785d..958ad9a 100644
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/lang/Opt.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/lang/Opt.java
@@ -19,7 +19,7 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
+ * or visit www.oracle.getLogFilePath if you need additional information or have any
* questions.
*/
package aiyh.utils.tool.cn.hutool.core.lang;
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/text/AntPathMatcher.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/text/AntPathMatcher.java
index a0601b1..ddeeb9c 100755
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/text/AntPathMatcher.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/text/AntPathMatcher.java
@@ -26,12 +26,12 @@ import java.util.regex.Pattern;
*
* 例子:
*
- * - {@code com/t?st.jsp} — 匹配 {@code com/test.jsp} 或 {@code com/tast.jsp} 或 {@code com/txst.jsp}
- * - {@code com/*.jsp} — 匹配{@code com}目录下全部 {@code .jsp}文件
- * - {@code com/**/test.jsp} — 匹配{@code com}目录下全部 {@code test.jsp}文件
+ * - {@code getLogFilePath/t?st.jsp} — 匹配 {@code getLogFilePath/test.jsp} 或 {@code getLogFilePath/tast.jsp} 或 {@code getLogFilePath/txst.jsp}
+ * - {@code getLogFilePath/*.jsp} — 匹配{@code getLogFilePath}目录下全部 {@code .jsp}文件
+ * - {@code getLogFilePath/**/test.jsp} — 匹配{@code getLogFilePath}目录下全部 {@code test.jsp}文件
* - {@code cn/hutool/**/*.jsp} — 匹配{@code cn/hutool}路径下全部{@code .jsp} 文件
* - {@code org/**/servlet/bla.jsp} — 匹配{@code cn/hutool/servlet/bla.jsp} 或{@code cn/hutool/testing/servlet/bla.jsp} 或 {@code org/servlet/bla.jsp}
- * - {@code com/{filename:\\w+}.jsp} 匹配 {@code com/test.jsp} 并将 {@code test} 关联到 {@code filename} 变量
+ * - {@code getLogFilePath/{filename:\\w+}.jsp} 匹配 {@code getLogFilePath/test.jsp} 并将 {@code test} 关联到 {@code filename} 变量
*
*
* 注意: 表达式和路径必须都为绝对路径或都为相对路径。
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/text/CharSequenceUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/text/CharSequenceUtil.java
index eb88a9a..4411748 100755
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/text/CharSequenceUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/text/CharSequenceUtil.java
@@ -3830,11 +3830,11 @@ public class CharSequenceUtil {
*
* StrUtil.hide(null,*,*)=null
* StrUtil.hide("",0,*)=""
- * StrUtil.hide("jackduan@163.com",-1,4) ****duan@163.com
- * StrUtil.hide("jackduan@163.com",2,3) ja*kduan@163.com
- * StrUtil.hide("jackduan@163.com",3,2) jackduan@163.com
- * StrUtil.hide("jackduan@163.com",16,16) jackduan@163.com
- * StrUtil.hide("jackduan@163.com",16,17) jackduan@163.com
+ * StrUtil.hide("jackduan@163.getLogFilePath",-1,4) ****duan@163.getLogFilePath
+ * StrUtil.hide("jackduan@163.getLogFilePath",2,3) ja*kduan@163.getLogFilePath
+ * StrUtil.hide("jackduan@163.getLogFilePath",3,2) jackduan@163.getLogFilePath
+ * StrUtil.hide("jackduan@163.getLogFilePath",16,16) jackduan@163.getLogFilePath
+ * StrUtil.hide("jackduan@163.getLogFilePath",16,17) jackduan@163.getLogFilePath
*
*
* @param str 字符串
@@ -3857,7 +3857,7 @@ public class CharSequenceUtil {
* StrUtil.desensitized("09157518479", DesensitizedUtil.DesensitizedType.FIXED_PHONE)) = "0915*****79"
* StrUtil.desensitized("18049531999", DesensitizedUtil.DesensitizedType.MOBILE_PHONE)) = "180****1999"
* StrUtil.desensitized("北京市海淀区马连洼街道289号", DesensitizedUtil.DesensitizedType.ADDRESS)) = "北京市海淀区马********"
- * StrUtil.desensitized("duandazhi-jack@gmail.com.cn", DesensitizedUtil.DesensitizedType.EMAIL)) = "d*************@gmail.com.cn"
+ * StrUtil.desensitized("duandazhi-jack@gmail.getLogFilePath.cn", DesensitizedUtil.DesensitizedType.EMAIL)) = "d*************@gmail.getLogFilePath.cn"
* StrUtil.desensitized("1234567890", DesensitizedUtil.DesensitizedType.PASSWORD)) = "**********"
* StrUtil.desensitized("苏D40000", DesensitizedUtil.DesensitizedType.CAR_LICENSE)) = "苏D4***0"
* StrUtil.desensitized("11011111222233333256", DesensitizedType.BANK_CARD)) = "1101 **** **** **** 3256"
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/thread/AsyncUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/thread/AsyncUtil.java
index 2ad3443..b54fa7e 100644
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/thread/AsyncUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/thread/AsyncUtil.java
@@ -8,7 +8,7 @@ import java.util.concurrent.ExecutionException;
* {@link CompletableFuture}异步工具类
* {@link CompletableFuture} 是 Future 的改进,可以通过传入回调对象,在任务完成后调用之
*
- * @author achao1441470436@gmail.com
+ * @author achao1441470436@gmail.getLogFilePath
* @since 5.7.17
*/
public class AsyncUtil {
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/util/ClassUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/util/ClassUtil.java
index 7c0dab8..66d2d28 100755
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/util/ClassUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/util/ClassUtil.java
@@ -94,7 +94,7 @@ public class ClassUtil {
* 例如:ClassUtil这个类
*
*
- * isSimple为false: "com.xiaoleilu.hutool.util.ClassUtil"
+ * isSimple为false: "getLogFilePath.xiaoleilu.hutool.util.ClassUtil"
* isSimple为true: "ClassUtil"
*
*
@@ -216,7 +216,7 @@ public class ClassUtil {
/**
* 扫描该包路径下所有class文件
*
- * @param packageName 包路径 com | com. | com.abs | com.abs.
+ * @param packageName 包路径 getLogFilePath | getLogFilePath. | getLogFilePath.abs | getLogFilePath.abs.
* @return 类集合
* @see ClassScanner#scanPackage(String)
*/
@@ -226,10 +226,10 @@ public class ClassUtil {
/**
* 扫描包路径下满足class过滤器条件的所有class文件,
- * 如果包路径为 com.abs + A.class 但是输入 abs会产生classNotFoundException
- * 因为className 应该为 com.abs.A 现在却成为abs.A,此工具类对该异常进行忽略处理,有可能是一个不完善的地方,以后需要进行修改
+ * 如果包路径为 getLogFilePath.abs + A.class 但是输入 abs会产生classNotFoundException
+ * 因为className 应该为 getLogFilePath.abs.A 现在却成为abs.A,此工具类对该异常进行忽略处理,有可能是一个不完善的地方,以后需要进行修改
*
- * @param packageName 包路径 com | com. | com.abs | com.abs.
+ * @param packageName 包路径 getLogFilePath | getLogFilePath. | getLogFilePath.abs | getLogFilePath.abs.
* @param classFilter class过滤器,过滤掉不需要的class
* @return 类集合
*/
@@ -626,7 +626,7 @@ public class ClassUtil {
* 非单例模式,如果是非静态方法,每次创建一个新对象
*
* @param 对象类型
- * @param classNameWithMethodName 类名和方法名表达式,类名与方法名用{@code .}或{@code #}连接 例如:com.xiaoleilu.hutool.StrUtil.isEmpty 或 com.xiaoleilu.hutool.StrUtil#isEmpty
+ * @param classNameWithMethodName 类名和方法名表达式,类名与方法名用{@code .}或{@code #}连接 例如:getLogFilePath.xiaoleilu.hutool.StrUtil.isEmpty 或 getLogFilePath.xiaoleilu.hutool.StrUtil#isEmpty
* @param args 参数,必须严格对应指定方法的参数类型和数量
* @return 返回结果
*/
@@ -640,7 +640,7 @@ public class ClassUtil {
* 执行非static方法时,必须满足对象有默认构造方法
*
* @param 对象类型
- * @param classNameWithMethodName 类名和方法名表达式,例如:com.xiaoleilu.hutool.StrUtil#isEmpty或com.xiaoleilu.hutool.StrUtil.isEmpty
+ * @param classNameWithMethodName 类名和方法名表达式,例如:getLogFilePath.xiaoleilu.hutool.StrUtil#isEmpty或com.xiaoleilu.hutool.StrUtil.isEmpty
* @param isSingleton 是否为单例对象,如果此参数为false,每次执行方法时创建一个新对象
* @param args 参数,必须严格对应指定方法的参数类型和数量
* @return 返回结果
@@ -956,7 +956,7 @@ public class ClassUtil {
/**
* 获得给定类所在包的名称
* 例如:
- * com.xiaoleilu.hutool.util.ClassUtil =》 com.xiaoleilu.hutool.util
+ * getLogFilePath.xiaoleilu.hutool.util.ClassUtil =》 getLogFilePath.xiaoleilu.hutool.util
*
* @param clazz 类
* @return 包名
@@ -976,7 +976,7 @@ public class ClassUtil {
/**
* 获得给定类所在包的路径
* 例如:
- * com.xiaoleilu.hutool.util.ClassUtil =》 com/xiaoleilu/hutool/util
+ * getLogFilePath.xiaoleilu.hutool.util.ClassUtil =》 getLogFilePath/xiaoleilu/hutool/util
*
* @param clazz 类
* @return 包名
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/util/CoordinateUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/util/CoordinateUtil.java
index 95624a8..8699fdb 100644
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/util/CoordinateUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/util/CoordinateUtil.java
@@ -14,7 +14,7 @@ import java.util.Objects;
* 坐标转换相关参考: https://tool.lu/coordinate/
* 参考:https://github.com/JourWon/coordinate-transform
*
- * @author hongzhe.qin(qin462328037at163.com), looly
+ * @author hongzhe.qin(qin462328037at163.getLogFilePath), looly
* @since 5.7.16
*/
public class CoordinateUtil {
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/util/DesensitizedUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/util/DesensitizedUtil.java
index 4d0845c..15276d0 100644
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/util/DesensitizedUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/util/DesensitizedUtil.java
@@ -90,7 +90,7 @@ public class DesensitizedUtil {
* DesensitizedUtil.desensitized("09157518479", DesensitizedUtil.DesensitizedType.FIXED_PHONE)) = "0915*****79"
* DesensitizedUtil.desensitized("18049531999", DesensitizedUtil.DesensitizedType.MOBILE_PHONE)) = "180****1999"
* DesensitizedUtil.desensitized("北京市海淀区马连洼街道289号", DesensitizedUtil.DesensitizedType.ADDRESS)) = "北京市海淀区马********"
- * DesensitizedUtil.desensitized("duandazhi-jack@gmail.com.cn", DesensitizedUtil.DesensitizedType.EMAIL)) = "d*************@gmail.com.cn"
+ * DesensitizedUtil.desensitized("duandazhi-jack@gmail.getLogFilePath.cn", DesensitizedUtil.DesensitizedType.EMAIL)) = "d*************@gmail.getLogFilePath.cn"
* DesensitizedUtil.desensitized("1234567890", DesensitizedUtil.DesensitizedType.PASSWORD)) = "**********"
* DesensitizedUtil.desensitized("苏D40000", DesensitizedUtil.DesensitizedType.CAR_LICENSE)) = "苏D4***0"
* DesensitizedUtil.desensitized("11011111222233333256", DesensitizedUtil.DesensitizedType.BANK_CARD)) = "1101 **** **** **** 3256"
@@ -252,7 +252,7 @@ public class DesensitizedUtil {
}
/**
- * 【电子邮箱】邮箱前缀仅显示第一个字母,前缀其他隐藏,用星号代替,@及后面的地址显示,比如:d**@126.com
+ * 【电子邮箱】邮箱前缀仅显示第一个字母,前缀其他隐藏,用星号代替,@及后面的地址显示,比如:d**@126.getLogFilePath
*
* @param email 邮箱
* @return 脱敏后的邮箱
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/util/RadixUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/util/RadixUtil.java
index fe092bd..7cca74d 100644
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/util/RadixUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/util/RadixUtil.java
@@ -14,7 +14,7 @@ package aiyh.utils.tool.cn.hutool.core.util;
* ....
*
*
- * @author xl7@qq.com
+ * @author xl7@qq.getLogFilePath
* @since 5.5.8
*/
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/core/util/XmlUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/core/util/XmlUtil.java
index 7cc46eb..877297b 100755
--- a/src/main/java/aiyh/utils/tool/cn/hutool/core/util/XmlUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/core/util/XmlUtil.java
@@ -111,7 +111,7 @@ public class XmlUtil {
/**
* 默认的DocumentBuilderFactory实现
*/
- private static String defaultDocumentBuilderFactory = "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl";
+ private static String defaultDocumentBuilderFactory = "getLogFilePath.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl";
/**
* 是否打开命名空间支持
@@ -621,7 +621,7 @@ public class XmlUtil {
/**
* 创建{@link DocumentBuilderFactory}
*
- * 默认使用"com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"
+ * 默认使用"getLogFilePath.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"
* 如果使用第三方实现,请调用{@link #disableDefaultDocumentBuilderFactory()}
*
*
diff --git a/src/main/java/aiyh/utils/tool/cn/hutool/json/InternalJSONUtil.java b/src/main/java/aiyh/utils/tool/cn/hutool/json/InternalJSONUtil.java
index bcd2152..e94136f 100755
--- a/src/main/java/aiyh/utils/tool/cn/hutool/json/InternalJSONUtil.java
+++ b/src/main/java/aiyh/utils/tool/cn/hutool/json/InternalJSONUtil.java
@@ -124,7 +124,7 @@ public final class InternalJSONUtil {
/**
* 将Property的键转化为JSON形式
- * 用于识别类似于:com.luxiaolei.package.hutool这类用点隔开的键
+ * 用于识别类似于:getLogFilePath.luxiaolei.package.hutool这类用点隔开的键
* 注意:是否允许重复键,取决于JSONObject配置
*
* @param jsonObject JSONObject
diff --git a/src/main/java/aiyh/utils/tool/org/apache/commons/jexl3/parser/ParserConstants.java b/src/main/java/aiyh/utils/tool/org/apache/commons/jexl3/parser/ParserConstants.java
index 320f44d..9ece39e 100644
--- a/src/main/java/aiyh/utils/tool/org/apache/commons/jexl3/parser/ParserConstants.java
+++ b/src/main/java/aiyh/utils/tool/org/apache/commons/jexl3/parser/ParserConstants.java
@@ -4,7 +4,7 @@ package aiyh.utils.tool.org.apache.commons.jexl3.parser;
/**
* Token literal values and constants.
- * Generated by com.helger.pgcc.output.java.OtherFilesGenJava#start()
+ * Generated by getLogFilePath.helger.pgcc.output.java.OtherFilesGenJava#start()
*/
public interface ParserConstants {
diff --git a/src/main/java/com/api/chaoyang/he/hcy_xintiantongxin/projectorder/controller/ExportExcelApi_copy.java b/src/main/java/com/api/chaoyang/he/hcy_xintiantongxin/projectorder/controller/ExportExcelApi_copy.java
index 025617d..0b2ad6c 100644
--- a/src/main/java/com/api/chaoyang/he/hcy_xintiantongxin/projectorder/controller/ExportExcelApi_copy.java
+++ b/src/main/java/com/api/chaoyang/he/hcy_xintiantongxin/projectorder/controller/ExportExcelApi_copy.java
@@ -1,13 +1,13 @@
-package com.api.chaoyang.he.hcy_xintiantongxin.projectorder.controller;//package com.api.hcy_xintiantongxin.projectorder.controller;
+package com.api.chaoyang.he.hcy_xintiantongxin.projectorder.controller;//package getLogFilePath.api.hcy_xintiantongxin.projectorder.controller;
//
//import aiyh.utils.ApiResult;
//import aiyh.utils.Util;
-//import com.api.hcy_xintiantongxin.projectorder.service.ExportExcelAVPNService;
-//import com.api.hcy_xintiantongxin.projectorder.service.ExportExcelL3NSService;
-//import com.api.hcy_xintiantongxin.projectorder.service.ExportExcelOtherService;
-//import com.api.hcy_xintiantongxin.projectorder.service.impl.ExportExcelAVPNServiceImpl;
-//import com.api.hcy_xintiantongxin.projectorder.service.impl.ExportExcelL3NSServiceImpl;
-//import com.api.hcy_xintiantongxin.projectorder.service.impl.ExportExcelOtherServiceImpl;
+//import getLogFilePath.api.hcy_xintiantongxin.projectorder.service.ExportExcelAVPNService;
+//import getLogFilePath.api.hcy_xintiantongxin.projectorder.service.ExportExcelL3NSService;
+//import getLogFilePath.api.hcy_xintiantongxin.projectorder.service.ExportExcelOtherService;
+//import getLogFilePath.api.hcy_xintiantongxin.projectorder.service.impl.ExportExcelAVPNServiceImpl;
+//import getLogFilePath.api.hcy_xintiantongxin.projectorder.service.impl.ExportExcelL3NSServiceImpl;
+//import getLogFilePath.api.hcy_xintiantongxin.projectorder.service.impl.ExportExcelOtherServiceImpl;
//import org.apache.log4j.Logger;
//import weaver.conn.RecordSet;
//import weaver.wechat.util.Utils;
@@ -30,7 +30,7 @@ package com.api.chaoyang.he.hcy_xintiantongxin.projectorder.controller;//package
//import java.util.zip.ZipEntry;
//import java.util.zip.ZipOutputStream;
//
-//import static com.caucho.server.log.AccessLog.BUFFER_SIZE;
+//import static getLogFilePath.caucho.server.log.AccessLog.BUFFER_SIZE;
//
//@Path("/export")
//public class ExportExcelApi_copy {
diff --git a/src/main/java/com/api/ebu7dev1/common/getlog/controller/GetLogController.java b/src/main/java/com/api/ebu7dev1/common/getlog/controller/GetLogController.java
index df94e7c..7634ea7 100644
--- a/src/main/java/com/api/ebu7dev1/common/getlog/controller/GetLogController.java
+++ b/src/main/java/com/api/ebu7dev1/common/getlog/controller/GetLogController.java
@@ -2,6 +2,7 @@ package com.api.ebu7dev1.common.getlog.controller;
import aiyh.utils.ApiResult;
import aiyh.utils.Util;
+import com.alibaba.fastjson.JSONObject;
import com.api.ebu7dev1.common.getlog.service.GetLogService;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import org.apache.log4j.Logger;
@@ -17,6 +18,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -70,7 +72,9 @@ public class GetLogController {
@RequestBody Map params) {
try {
User loginUser = HrmUserVarify.getUser(request, response);
- return service.collectLogInfo(loginUser, params);
+ String path = request.getRealPath("/");
+ params.put("ecologyPath", path);
+ return ApiResult.success(service.collectLogInfo(loginUser, params));
} catch (Exception e) {
log.error("下载文件出错:" + Util.getErrString(e));
return ApiResult.error("system error!");
diff --git a/src/main/java/com/api/ebu7dev1/common/getlog/service/GetLogService.java b/src/main/java/com/api/ebu7dev1/common/getlog/service/GetLogService.java
index 6b437c5..57f317c 100644
--- a/src/main/java/com/api/ebu7dev1/common/getlog/service/GetLogService.java
+++ b/src/main/java/com/api/ebu7dev1/common/getlog/service/GetLogService.java
@@ -1,13 +1,14 @@
package com.api.ebu7dev1.common.getlog.service;
import aiyh.utils.Util;
-import aiyh.utils.excention.CustomerException;
import com.api.ebu7dev1.common.getlog.util.GetLogUtil;
import org.apache.commons.collections.CollectionUtils;
import weaver.hrm.User;
import javax.ws.rs.core.Response;
import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -62,11 +63,16 @@ public class GetLogService {
return ipList;
}
- public String collectLogInfo(User loginUser, Map params) {
+ public String collectLogInfo(User loginUser, Map params) throws FileNotFoundException {
GetLogUtil.checkUser(loginUser);
String startDate = Util.null2String(params.get("startDate"));
String endDate = Util.null2String(params.get("endDate"));
- return null;
+ String ecologyPath = Util.null2String(params.get("ecologyPath"));
+ List logTypeList = (List) params.get("selectLogType");
+ String resinPath = System.getProperty("user.dir") + File.separator;
+ List