diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index 520726d6fb633156465ccaac9673651c5f557009..7c3fb2741175f6b0184fb750fe0f83a32bc60841 100644 --- a/.github/workflows/test-and-build.yml +++ b/.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 diff --git a/mica-laytpl/README.md b/mica-laytpl/README.md index d54f3a8f56105cbb7d9eecc68ac37fb3166718dd..f40f99ffd16856f5a5026eebd7b20a9123a8528f 100644 --- a/mica-laytpl/README.md +++ b/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 + + org.openjdk.nashorn + nashorn-core + ${version} + +``` + ## 添加依赖 ### maven ```xml diff --git a/mica-core/src/test/java/net/dreamlu/mica/test/script/JsonpTest.java b/mica-laytpl/src/test/java/net/dreamlu/mica/laytpl/JsonpTest.java similarity index 95% rename from mica-core/src/test/java/net/dreamlu/mica/test/script/JsonpTest.java rename to mica-laytpl/src/test/java/net/dreamlu/mica/laytpl/JsonpTest.java index 0748dcb3e45a6a31e9ff601b215be2c004d87e07..8ddfeb504ed99f54c870929e217ad5adedc2c810 100644 --- a/mica-core/src/test/java/net/dreamlu/mica/test/script/JsonpTest.java +++ b/mica-laytpl/src/test/java/net/dreamlu/mica/laytpl/JsonpTest.java @@ -1,4 +1,4 @@ -package net.dreamlu.mica.test.script; +package net.dreamlu.mica.laytpl; import org.junit.Assert; import org.junit.Test; diff --git a/mica-qrcode/src/main/java/net/dreamlu/mica/qrcode/QrCode.java b/mica-qrcode/src/main/java/net/dreamlu/mica/qrcode/QrCode.java index 8d9bd30bf441bb61970bf8ae078677f3fc3779aa..30b95ba7eb55f691c4756ef5510c96c932bee1b0 100644 --- a/mica-qrcode/src/main/java/net/dreamlu/mica/qrcode/QrCode.java +++ b/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,