diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index 067bb0213..afa9fac79 100755
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -46,7 +46,6 @@
0.1.55
0.39.0
2.14.0
- 3.5.3
3.11.1
5.1.1
2.7.18
@@ -254,15 +253,6 @@
sshd-core
${sshd.version}
-
-
-
- com.google.zxing
- core
- ${zxing.version}
- compile
- true
-
commons-net
diff --git a/hutool-swing/pom.xml b/hutool-swing/pom.xml
index 637c755b1..d6ae3385b 100755
--- a/hutool-swing/pom.xml
+++ b/hutool-swing/pom.xml
@@ -36,6 +36,7 @@
org.dromara.hutool.swing
1.4
2.19.0
+ 3.5.3
@@ -57,6 +58,14 @@
${metadata-extractor.version}
true
+
+
+ com.google.zxing
+ core
+ ${zxing.version}
+ compile
+ true
+
com.formdev
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/BufferedImageLuminanceSource.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/BufferedImageLuminanceSource.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/BufferedImageLuminanceSource.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/BufferedImageLuminanceSource.java
index 6402c8872..090e00c59 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/BufferedImageLuminanceSource.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/BufferedImageLuminanceSource.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import com.google.zxing.LuminanceSource;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrAsciiArt.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrAsciiArt.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrAsciiArt.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrAsciiArt.java
index 21964a0aa..5029f1081 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrAsciiArt.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrAsciiArt.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import org.dromara.hutool.core.lang.ansi.AnsiElement;
import org.dromara.hutool.core.lang.ansi.AnsiEncoder;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeException.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrCodeException.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeException.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrCodeException.java
index 06da980de..fabe55f6a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeException.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrCodeException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import org.dromara.hutool.core.exception.HutoolException;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrCodeUtil.java
similarity index 99%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeUtil.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrCodeUtil.java
index e73c096ae..5b8cf738d 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrCodeUtil.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.DecodeHintType;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrConfig.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrConfig.java
similarity index 99%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrConfig.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrConfig.java
index 70c04f6d3..2522a606f 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrConfig.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrConfig.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.util.CharsetUtil;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrDecoder.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrDecoder.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrDecoder.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrDecoder.java
index 5499c8a93..6726da364 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrDecoder.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrDecoder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import org.dromara.hutool.core.codec.Decoder;
import org.dromara.hutool.core.util.CharsetUtil;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrEncoder.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrEncoder.java
similarity index 97%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrEncoder.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrEncoder.java
index 8d670392e..0df1187e8 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrEncoder.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrEncoder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import org.dromara.hutool.core.codec.Encoder;
import org.dromara.hutool.core.text.StrUtil;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrImage.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrImage.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrImage.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrImage.java
index 81868e692..e2d0f3f71 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrImage.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrImage.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import org.dromara.hutool.swing.img.Img;
import com.google.zxing.BarcodeFormat;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrSVG.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrSVG.java
similarity index 98%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrSVG.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrSVG.java
index df771118f..9ff50442a 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrSVG.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/QrSVG.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.swing.img.ImgUtil;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/package-info.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/package-info.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/package-info.java
rename to hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/package-info.java
index 160fc13f2..94c8bdaed 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/package-info.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/qrcode/package-info.java
@@ -20,4 +20,4 @@
* @author Looly
*
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/Discussions3030Test.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/Discussions3030Test.java
similarity index 85%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/Discussions3030Test.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/Discussions3030Test.java
index 426738c52..7ed469660 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/Discussions3030Test.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/Discussions3030Test.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -26,7 +26,7 @@ public class Discussions3030Test {
@Disabled
public void name() {
//扫描二维码后 对应的链接正常
- String path = "https://juejin.cn/backend?name=%E5%BC%A0%E7%8F%8A&school=%E5%8E%A6%E9%97%A8%E5%A4%A7%E5%AD%A6";
+ final String path = "https://juejin.cn/backend?name=%E5%BC%A0%E7%8F%8A&school=%E5%8E%A6%E9%97%A8%E5%A4%A7%E5%AD%A6";
QrCodeUtil.generate(path, QrConfig.of(), file("d:/test/3030.png"));
}
}
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/Issue3146Test.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/Issue3146Test.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/Issue3146Test.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/Issue3146Test.java
index 1a0747f34..cd0f3803f
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/Issue3146Test.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/Issue3146Test.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/IssuesI76SZBTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/IssuesI76SZBTest.java
old mode 100755
new mode 100644
similarity index 96%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/IssuesI76SZBTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/IssuesI76SZBTest.java
index 5620ae6bd..f0b0f2802
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/IssuesI76SZBTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/IssuesI76SZBTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/QrCodeUtilTest.java b/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/QrCodeUtilTest.java
similarity index 99%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/QrCodeUtilTest.java
rename to hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/QrCodeUtilTest.java
index 19d7b2337..bb18c3fd5 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/qrcode/QrCodeUtilTest.java
+++ b/hutool-swing/src/test/java/org/dromara/hutool/swing/qrcode/QrCodeUtilTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.dromara.hutool.extra.qrcode;
+package org.dromara.hutool.swing.qrcode;
import org.dromara.hutool.core.codec.binary.Base64;
import org.dromara.hutool.core.io.IoUtil;