qrcode move to swing

hutool-extra/pom.xml

@@ -46,7 +46,6 @@
 		<jsch.version>0.1.55</jsch.version>
 		<sshj.version>0.39.0</sshj.version>
 		<sshd.version>2.14.0</sshd.version>
-		<zxing.version>3.5.3</zxing.version>
 		<net.version>3.11.1</net.version>
 		<emoji-java.version>5.1.1</emoji-java.version>
 		<spring-boot.version>2.7.18</spring-boot.version>
@@ -254,15 +253,6 @@
 			<artifactId>sshd-core</artifactId>
 			<version>${sshd.version}</version>
 		</dependency>
-
-		<!-- 二维码 -->
-		<dependency>
-			<groupId>com.google.zxing</groupId>
-			<artifactId>core</artifactId>
-			<version>${zxing.version}</version>
-			<scope>compile</scope>
-			<optional>true</optional>
-		</dependency>
 		<!-- FTP工具 -->
 		<dependency>
 			<groupId>commons-net</groupId>

hutool-swing/pom.xml

@@ -36,6 +36,7 @@
 		<Automatic-Module-Name>org.dromara.hutool.swing</Automatic-Module-Name>
 		<animated-gif-lib.version>1.4</animated-gif-lib.version>
 		<metadata-extractor.version>2.19.0</metadata-extractor.version>
+		<zxing.version>3.5.3</zxing.version>
 	</properties>
 
 	<dependencies>
@@ -57,6 +58,14 @@
 			<version>${metadata-extractor.version}</version>
 			<optional>true</optional>
 		</dependency>
+		<!-- 二维码 -->
+		<dependency>
+			<groupId>com.google.zxing</groupId>
+			<artifactId>core</artifactId>
+			<version>${zxing.version}</version>
+			<scope>compile</scope>
+			<optional>true</optional>
+		</dependency>
 		<!-- UI主题库 -->
 		<dependency>
 			<groupId>com.formdev</groupId>

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;
 

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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"));
 	}
 }

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;

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;

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;