Merge branch 'CeuiLiSA:master' into master

CeuiLiSA · Dec 4, 2024 · 992ab23 · 992ab23
2 parents 3bd24f9 + 59d7327
commit 992ab23
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -55,7 +55,7 @@ jobs:
           configuration-cache-enabled: true
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: ${{ !github.head_ref }}
         with:
           name: apk-debug

diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentWebView.java b/app/src/main/java/ceui/lisa/fragments/FragmentWebView.java
@@ -478,7 +478,7 @@ public URLConnection recursiveRequest(String path, Map<String, String> headers,
             url = new URL(path);
             conn = (HttpURLConnection) url.openConnection();
             // 异步接口获取IP
-            String ip = "210.140.131.188";
+            String ip = "210.140.139.157";
             if (ip != null) {
                 // 通过HTTPDNS获取IP成功，进行URL替换和HOST头设置
                 Log.d(TAG, "Get IP: " + ip + " for host: " + url.getHost() + " from HTTPDNS successfully!");

diff --git a/app/src/main/java/ceui/lisa/http/CloudFlareDns.kt b/app/src/main/java/ceui/lisa/http/CloudFlareDns.kt
@@ -10,14 +10,14 @@ class CloudFlareDns(private val service: CloudFlareDNSService) : Dns {
 
         when (hostname) {
             "oauth.secure.pixiv.net" -> addresses.addAll(
-                listOf("210.140.131.209").map {
+                listOf("210.140.139.156").map {
                     InetAddress.getByName(
                         it
                     )
                 }
             )
             "app-api.pixiv.net" -> addresses.addAll(
-                listOf("210.140.131.208").map {
+                listOf("210.140.139.155").map {
                     InetAddress.getByName(
                         it
                     )

diff --git a/app/src/main/java/ceui/lisa/http/HttpDns.java b/app/src/main/java/ceui/lisa/http/HttpDns.java
@@ -19,10 +19,10 @@ public class HttpDns implements Dns {
      */
 
     private static final String[] addresses = {
-            "210.140.131.188",
-            "210.140.131.218",
-            "210.140.131.187",
-            "210.140.131.189"
+            "210.140.139.155",
+            "210.140.139.156",
+            "210.140.139.157",
+            "210.140.139.158"
     };
     public static List<InetAddress> newDns = new ArrayList<>();
     private static HttpDns sHttpDns = null;

diff --git a/processor/src/main/java/ceui/lisa/processor/AnnotationProcessor.kt b/processor/src/main/java/ceui/lisa/processor/AnnotationProcessor.kt
@@ -69,7 +69,7 @@ class FileGenerator : AbstractProcessor() {
             processingEnv.elementUtils.getPackageOf(it).toString() + ".*"
         }
 
-        val packageName = (packages.first().split(".").subList(0, 3) + listOf("viewholdermap")).joinToString(".")
+        val packageName = "ceui.pixiv.ui.viewholdermap"
 
         val holderEntries = holderElements.map {
             val itemHolderFullName = getClassName {