Merge branch 'mica-v2.4.x'

.github/workflows/test-and-build.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup java
         uses: actions/setup-java@v2
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: ${{ matrix.java }}
       - name: Cache Gradle packages
         uses: actions/cache@v2

mica-laytpl/README.md

@@ -6,6 +6,15 @@
 - jmh 实测性能不是很出色，约为 `Thymeleaf` 的 `1/2` 适合用于对性能不是特别高的场景。例如：代码生成等。
 - java15 中会移除 Nashorn（[JEP 372:Remove the Nashorn JavaScript Engine](https://openjdk.java.net/projects/jdk/15/)）
 
+### java15 之后需要添加 nashorn-core
+```xml
+<dependency>
+  <groupId>org.openjdk.nashorn</groupId>
+  <artifactId>nashorn-core</artifactId>
+  <version>${version}</version>
+</dependency>
+```
+
 ## 添加依赖
 ### maven
 ```xml

mica-core/src/test/java/net/dreamlu/mica/test/script/JsonpTest.java → mica-laytpl/src/test/java/net/dreamlu/mica/laytpl/JsonpTest.java

-package net.dreamlu.mica.test.script;
+package net.dreamlu.mica.laytpl;
 
 import org.junit.Assert;
 import org.junit.Test;

mica-qrcode/src/main/java/net/dreamlu/mica/qrcode/QrCode.java

@@ -403,7 +403,7 @@ public final class QrCode {
 	 * @return QRCode 的图像对象
 	 */
 	public BufferedImage toImage() {
-		String text = new String(content.getBytes(this.encode));
+		String text = new String(content.getBytes(this.encode), this.encode);
 		BitMatrix matrix;
 		try {
 			matrix = new QRCodeWriter().encode(text,