diff --git a/pom.xml b/pom.xml
index 9ae8f8b..b4488f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.aohe
twain-service
- 0.1.6.1
+ 0.1.6.2
8
diff --git a/src/main/java/org/aohe/show/IconUtil.java b/src/main/java/org/aohe/show/IconUtil.java
index 932d065..5b412fe 100644
--- a/src/main/java/org/aohe/show/IconUtil.java
+++ b/src/main/java/org/aohe/show/IconUtil.java
@@ -1,6 +1,7 @@
package org.aohe.show;
import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.resource.ClassPathResource;
import cn.hutool.core.io.resource.ResourceUtil;
import lombok.extern.slf4j.Slf4j;
@@ -9,11 +10,18 @@ import java.awt.*;
@Slf4j
public class IconUtil {
public static Image getIcon() {
- String iconPath = "ah.png";
+ ClassPathResource resource = new ClassPathResource("ah.png");
+ if(FileUtil.exist(resource.getFile())){
+ return Toolkit.getDefaultToolkit().getImage(resource.getPath());
+ }
+ String iconPath = "..\\ah.png";
+ log.info("当前查找路径为外部:{}", FileUtil.getAbsolutePath(iconPath));
if(!FileUtil.exist("ah.png")){
iconPath = ResourceUtil.getResource("ah.png").getFile();
+ log.info("当前查找路径为内部:{}", FileUtil.getAbsolutePath(iconPath));
}
- log.info("当前查找路径为:{}", FileUtil.getAbsolutePath(iconPath));
- return Toolkit.getDefaultToolkit().getImage(FileUtil.getAbsolutePath(iconPath));
+
+
+ return Toolkit.getDefaultToolkit().getImage(iconPath);
}
}