diff --git a/README.md b/README.md index c31fe44..918ec2e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ![Java](https://img.shields.io/badge/Java-17+-blue.svg) ![License](https://img.shields.io/badge/License-MIT-yellow.svg) -![Version](https://img.shields.io/badge/Version-1.1.6-brightgreen.svg) +![Version](https://img.shields.io/badge/Version-1.1.7-brightgreen.svg) **一个用于获取JMComic(禁漫天堂)数据的Java API库** @@ -148,7 +148,7 @@ io.github.jukomu jmcomic-api - 1.1.6 + 1.1.7 ``` * 安装 jmcomic-core @@ -156,7 +156,7 @@ io.github.jukomu jmcomic-core - 1.1.6 + 1.1.7 ``` * Android平台额外安装 jmcomic-android-support @@ -164,7 +164,7 @@ io.github.jukomu jmcomic-android-support - 1.1.6 + 1.1.7 ``` diff --git a/README_en.md b/README_en.md index 6c6b1d9..58a35dd 100644 --- a/README_en.md +++ b/README_en.md @@ -8,7 +8,7 @@ ![Java](https://img.shields.io/badge/Java-17+-blue.svg) ![License](https://img.shields.io/badge/License-MIT-yellow.svg) -![Version](https://img.shields.io/badge/Version-1.1.6-brightgreen.svg) +![Version](https://img.shields.io/badge/Version-1.1.7-brightgreen.svg) **A Java API library for fetching data from JMComic** @@ -147,7 +147,7 @@ The core of this project is a **data acquisition and management tool**, not a ri io.github.jukomu jmcomic-api - 1.1.6 + 1.1.7 ``` * Install jmcomic-core @@ -155,7 +155,7 @@ The core of this project is a **data acquisition and management tool**, not a ri io.github.jukomu jmcomic-core - 1.1.6 + 1.1.7 ``` * (Android platform) Install jmcomic-android-support @@ -163,7 +163,7 @@ The core of this project is a **data acquisition and management tool**, not a ri io.github.jukomu jmcomic-android-support - 1.1.6 + 1.1.7 ``` diff --git a/docs/sources/advanced/modular-integration.md b/docs/sources/advanced/modular-integration.md index 70114c1..4948c90 100644 --- a/docs/sources/advanced/modular-integration.md +++ b/docs/sources/advanced/modular-integration.md @@ -18,7 +18,7 @@ jmcomic-sample jmcomic-android-support io.github.jukomu jmcomic-api - 1.1.6 + 1.1.7 ``` @@ -35,7 +35,7 @@ jmcomic-sample jmcomic-android-support io.github.jukomu jmcomic-core - 1.1.6 + 1.1.7 ``` @@ -49,7 +49,7 @@ jmcomic-sample jmcomic-android-support io.github.jukomu jmcomic-core - 1.1.6 + 1.1.7 org.jsoup diff --git a/docs/sources/android.md b/docs/sources/android.md index 426aac9..b6a201a 100644 --- a/docs/sources/android.md +++ b/docs/sources/android.md @@ -5,8 +5,8 @@ ```groovy // build.gradle (app) dependencies { - implementation 'io.github.jukomu:jmcomic-core:1.1.6' - implementation 'io.github.jukomu:jmcomic-android-support:1.1.6' + implementation 'io.github.jukomu:jmcomic-core:1.1.7' + implementation 'io.github.jukomu:jmcomic-android-support:1.1.7' } ``` diff --git a/docs/sources/index.md b/docs/sources/index.md index a5004f7..2f4aa3f 100644 --- a/docs/sources/index.md +++ b/docs/sources/index.md @@ -4,7 +4,7 @@ [![Java](https://img.shields.io/badge/Java-17+-blue.svg)](https://openjdk.org/) [![License](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -[![Version](https://img.shields.io/badge/Version-1.1.6-brightgreen.svg)](https://github.com/JUKOMU/JMComic-Api-Java) +[![Version](https://img.shields.io/badge/Version-1.1.7-brightgreen.svg)](https://github.com/JUKOMU/JMComic-Api-Java) --- @@ -43,7 +43,7 @@ jmcomic-android-support → Android 平台适配 io.github.jukomu jmcomic-core - 1.1.6 + 1.1.7 ``` diff --git a/docs/sources/quickstart/installation.md b/docs/sources/quickstart/installation.md index f3140bf..c72f4b5 100644 --- a/docs/sources/quickstart/installation.md +++ b/docs/sources/quickstart/installation.md @@ -15,7 +15,7 @@ io.github.jukomu jmcomic-core - 1.1.6 + 1.1.7 ``` @@ -27,7 +27,7 @@ io.github.jukomu jmcomic-api - 1.1.6 + 1.1.7 ``` @@ -39,7 +39,7 @@ io.github.jukomu jmcomic-android-support - 1.1.6 + 1.1.7 ``` diff --git a/jmcomic-android-support/pom.xml b/jmcomic-android-support/pom.xml index db142e2..48f59e8 100644 --- a/jmcomic-android-support/pom.xml +++ b/jmcomic-android-support/pom.xml @@ -6,7 +6,7 @@ io.github.jukomu jmcomic-api-java - 1.1.6 + 1.1.7 jmcomic-android-support diff --git a/jmcomic-api/pom.xml b/jmcomic-api/pom.xml index e777d0c..adbd13d 100644 --- a/jmcomic-api/pom.xml +++ b/jmcomic-api/pom.xml @@ -6,7 +6,7 @@ io.github.jukomu jmcomic-api-java - 1.1.6 + 1.1.7 jmcomic-api diff --git a/jmcomic-core/pom.xml b/jmcomic-core/pom.xml index 01e2c25..285c3db 100644 --- a/jmcomic-core/pom.xml +++ b/jmcomic-core/pom.xml @@ -6,7 +6,7 @@ io.github.jukomu jmcomic-api-java - 1.1.6 + 1.1.7 jmcomic-core diff --git a/jmcomic-core/src/main/java/io/github/jukomu/jmcomic/core/parser/ApiParser.java b/jmcomic-core/src/main/java/io/github/jukomu/jmcomic/core/parser/ApiParser.java index 0ebf3a3..c427ea7 100644 --- a/jmcomic-core/src/main/java/io/github/jukomu/jmcomic/core/parser/ApiParser.java +++ b/jmcomic-core/src/main/java/io/github/jukomu/jmcomic/core/parser/ApiParser.java @@ -445,7 +445,16 @@ private static List buildImageList(String photoId, String scrambleId, S List images = new ArrayList<>(); int sortOrder = 1; for (JsonElement item : imagesArray) { - String filename = ((JsonObject) item).get("image").getAsString(); + String filename; + if (item.isJsonPrimitive()) { + filename = item.getAsString(); + } else if (item.isJsonObject() + && item.getAsJsonObject().has("image") + && !item.getAsJsonObject().get("image").isJsonNull()) { + filename = item.getAsJsonObject().get("image").getAsString(); + } else { + throw new ParseResponseException("Unsupported image element format in images array: " + item); + } String url = String.format("%s%s/media/photos/%s/%s", JmConstants.PROTOCOL_HTTPS, imageDomain, photoId, filename); images.add(new JmImage( photoId, diff --git a/jmcomic-sample/pom.xml b/jmcomic-sample/pom.xml index 3b8f6df..459641b 100644 --- a/jmcomic-sample/pom.xml +++ b/jmcomic-sample/pom.xml @@ -6,7 +6,7 @@ io.github.jukomu jmcomic-api-java - 1.1.6 + 1.1.7 jmcomic-sample diff --git a/pom.xml b/pom.xml index b6bcce2..5618039 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.jukomu jmcomic-api-java - 1.1.6 + 1.1.7 pom jmcomic-api