diff --git a/webpagesources/build.properties b/webpagesources/build.properties index ccfbc3a..b364f47 100644 --- a/webpagesources/build.properties +++ b/webpagesources/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Jun 11 18:44:24 GMT 2025 +#Fri Jun 13 01:36:29 GMT 2025 stageCount=5 libraryProject= baseVersion=15.0 publishVersion=15.0.4 -buildCount=18 +buildCount=34 baseBetaVersion=15.0.5 diff --git a/webpagesources/src/main/java/cc/winboll/studio/webpagesources/common/AuthenticationUtils.java b/webpagesources/src/main/java/cc/winboll/studio/webpagesources/common/AuthenticationUtils.java index ff6ac3a..47f272d 100644 --- a/webpagesources/src/main/java/cc/winboll/studio/webpagesources/common/AuthenticationUtils.java +++ b/webpagesources/src/main/java/cc/winboll/studio/webpagesources/common/AuthenticationUtils.java @@ -6,6 +6,7 @@ package cc.winboll.studio.webpagesources.common; * @Describe 网站登录验证工具类 */ import android.content.Context; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog; import cc.winboll.studio.webpagesources.models.AuthenticationBean; import java.io.File; @@ -22,10 +23,11 @@ public class AuthenticationUtils { AuthenticationUtils(Context context) { mContext = context; - File beanDir = new File(context.getDataDir(), TAG); + File beanDir = new File(context.getFilesDir(), "home" + File.separator + TAG); if (!beanDir.exists()) { beanDir.mkdirs(); } + LogUtils.d(TAG, String.format("beanDir %s", beanDir.toString())); _mBeanPath = beanDir.getPath() + "/" + AuthenticationBean.class.getName() + ".json"; mData = new ArrayList(); AuthenticationBean.loadBeanListFromFile(_mBeanPath, mData, AuthenticationBean.class); diff --git a/webpagesources/src/main/java/cc/winboll/studio/webpagesources/common/BaseWebView.java b/webpagesources/src/main/java/cc/winboll/studio/webpagesources/common/BaseWebView.java index 74189ad..4284646 100644 --- a/webpagesources/src/main/java/cc/winboll/studio/webpagesources/common/BaseWebView.java +++ b/webpagesources/src/main/java/cc/winboll/studio/webpagesources/common/BaseWebView.java @@ -37,6 +37,7 @@ import cc.winboll.studio.webpagesources.R; import cc.winboll.studio.webpagesources.thread.LinkDownLoadThread; import cc.winboll.studio.webpagesources.util.UIUtil; import cc.winboll.studio.webpagesources.view.ItemLongClickedPopWindow; +import com.hjq.toast.ToastUtils; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -309,7 +310,13 @@ public class BaseWebView extends WebView { @Override public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) { - LogUtils.d(TAG, "onReceivedSslError 0\nerror : " + error.toString()); + //SSL证书错误修复方法: + //网站证书下载网站是https://www.ssleye.com/ssltool/certs_down.html + //使用该网站访问要获取证书的主机 + //获取证书后导出证书到 res/raw/<标识名称>.cer + //再在res/xml/network_security_config.xml配置网站证书设置。 + ToastUtils.show("SSL证书错误!"); + LogUtils.d(TAG, "SSL证书错误! onReceivedSslError 0\nerror : " + error.toString()); } @Override diff --git a/webpagesources/src/main/res/raw/globalsign_ca.cer b/webpagesources/src/main/res/raw/globalsign_ca.cer new file mode 100644 index 0000000..c31155d --- /dev/null +++ b/webpagesources/src/main/res/raw/globalsign_ca.cer @@ -0,0 +1,37 @@ +-----BEGIN CERTIFICATE----- +MIIGZDCCBUygAwIBAgIMOwCrRmG0Wi0jBsKXMA0GCSqGSIb3DQEBCwUAMFUxCzAJ +BgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJH +bG9iYWxTaWduIEdDQyBSNiBBbHBoYVNTTCBDQSAyMDIzMB4XDTI0MDkxNTA2NTY1 +NVoXDTI1MTAxNzA2NTY1NFowGzEZMBcGA1UEAwwQKi5zdGF0aWNmaWxlLm9yZzCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALydYBhogMuljWzzVydKnNXd +1QgbSsTM72cf+bhEZT8achjVkiPgrekfXQEMaVcdSeicDjFpC/PmNQnJStWnCr4a +nybDu65PV2uk0eDpcGDDBeExf7O4I8i9C/yzm5nvhFQQrlr9iWK2pW+ytiUefsSA +Yq8r+e63UNafv2ShaeKx/APiD5CfD4e2fQJzQkodbPiReaZaG3tTj+gZw1iME1wF +3Fd1WFgn3E7d93iy4LR45073pt+W/qD899iOc+o6kic+xFG+UjsBsfwKmzYZO75A +qad3TxtNkwHM3LWxttyQbckOQRlLjEMN0hZ2GpJ36sHeC/WyVGsDogitvllJ+KUC +AwEAAaOCA2wwggNoMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMIGZBggr +BgEFBQcBAQSBjDCBiTBJBggrBgEFBQcwAoY9aHR0cDovL3NlY3VyZS5nbG9iYWxz +aWduLmNvbS9jYWNlcnQvZ3NnY2NyNmFscGhhc3NsY2EyMDIzLmNydDA8BggrBgEF +BQcwAYYwaHR0cDovL29jc3AuZ2xvYmFsc2lnbi5jb20vZ3NnY2NyNmFscGhhc3Ns +Y2EyMDIzMFcGA1UdIARQME4wCAYGZ4EMAQIBMEIGCisGAQQBoDIKAQMwNDAyBggr +BgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8w +RAYDVR0fBD0wOzA5oDegNYYzaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9nc2dj +Y3I2YWxwaGFzc2xjYTIwMjMuY3JsMCsGA1UdEQQkMCKCECouc3RhdGljZmlsZS5v +cmeCDnN0YXRpY2ZpbGUub3JnMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD +AjAfBgNVHSMEGDAWgBS9BbfzipM8c8t5+g+FEqF3lhiRdDAdBgNVHQ4EFgQUduaF +/hF7hb1ofiF58NiodcpFJjgwggF/BgorBgEEAdZ5AgQCBIIBbwSCAWsBaQB3AK8Y +GijWjKPgqYpMnGerCfi7vCK6rryxOKOhndP5tgMNAAABkfR4Z+gAAAQDAEgwRgIh +AOpyIQTSOF1422Dn64GHE59XsbVeeThUgCqpiE60BjKQAiEA0FJlalS44WJg82+P +4PuZijKkTY99/YG8Ut79TjHafGMAdgAaBP9J0FQdQK/2oMO/8djEZy9O7O4jQGiY +axdALtyJfQAAAZH0eGidAAAEAwBHMEUCIFkh8nff1OVMNzA/by8c3ERjHgwdo7jm +6DYJUaY2EJ78AiEAwJFOCANEUNl6nGNSTxzkQGUEAcfDNayztyhqFwJ4TUYAdgAS +8U40vVNyTIQGGcOPP3oT+Oe1YoeInG0wBYTr5YYmOgAAAZH0eGjLAAAEAwBHMEUC +IGDdjzgfLgdHzXYEWKfEEvNmiLPS1I/3N6IQF9SwVQ7pAiEAp+6BQtg8OUgwWwWh +CBZh2Bnna5/RMOU8avlVXn/besgwDQYJKoZIhvcNAQELBQADggEBAJaNrbJ5ArwZ +9oI2mu9I0pfZGhCFB3v6T8YTDNMnEq4JR0tngbrbrP5zbpbhNJwwvEA8uzbYClan +axEOf4f3besEyPwKAq8yZUqYDLSTNjT+f0xnVNxOBElA5r5zo18Pw0nqATdfrezC +U+CoejR8lk4RRvg0zPda8f+OhYP3ERbZ0Cm2YDJtVT59+Idyp2BbzCpsRJPLvjlt +yWKkfcx/41tbcdKhNZFM3xszCz8vfy23yLv8zotY00rCT3F+NwMh2Kuqg9p+htCE +/9SLNPLlBgkHK6wzQBTJoWWXKWTk3A1iPP/+MeBcN1OlKt/Zurbrka4DoEqRAyBn +v0FDEHbg0oU= +-----END CERTIFICATE----- diff --git a/webpagesources/src/main/res/xml/network_security_config.xml b/webpagesources/src/main/res/xml/network_security_config.xml index b9d9135..2f8bb5a 100644 --- a/webpagesources/src/main/res/xml/network_security_config.xml +++ b/webpagesources/src/main/res/xml/network_security_config.xml @@ -1,31 +1,21 @@ - - - provider.winboll.cc - - winboll.cc - - - - 10.8.0.* - - - - - 192.168.*.* - - - + 10.8.0.250 - 10.8.0.250:456 + 8.217.250.205 + + + staticfile.org + + +