fix: add configuration for whether to open the portal web page

Use local detection for the portal network and decide whether to open the portal network based on the configuration.

Log: add configuration for whether to open the portal web page

Influence: open portal network
PMS: BUG-262229

fix: 增加是否打开portal网页的配置

使用本地检测portal网络，根据配置来决定是否打开portal网络

Log: 增加是否打开portal网页的配置
Influence: 打开portal网络

Author: ut003640

config/org.deepin.dde.network.json

@@ -100,17 +100,15 @@
         "enableConnectivity": {
             "value": true,
             "serial": 0,
-            "flags": [
-                "global"
-            ],
-            "name": "enableConnectivity",
-            "name[zh_CN]": "检查网络连接标记",
-            "description[zh_CN]": "当设置为true时，使用前端检测网络连接，false，则使用NetworkManager自身的检测连接流程",
-            "description": "ture: use dde-network-core to check connectivity",
-            "permissions": "readwrite",
-            "visibility": "private"
-        },
-        "checkPortal": {
+            "flags":["global"],
+            "name":"enableConnectivity",
+            "name[zh_CN]":"检查网络连接标记",
+            "description[zh_CN]":"当设置为true时，使用前端检测网络连接，false，则使用NetworkManager自身的检测连接流程",
+            "description":"ture: use dde-network-core to check connectivity",
+            "permissions":"readwrite",
+            "visibility":"private"
+         },
+         "enableOpenPortal":{
             "value": true,
             "serial": 0,
             "flags": [

network-service-plugin/src/session/sessioncontainer.cpp

@@ -6,6 +6,8 @@
 #include "sessionipconfilct.h"
 #include "constants.h"
 #include "desktopmonitor.h"
+#include "settingconfig.h"
+#include "urlhelper.h"
 
 #include <QDBusConnection>
 #include <QDBusInterface>
@@ -79,15 +81,15 @@ void SessionContainer::leaveDesktop()
 
 void SessionContainer::openPortalUrl(const QString &url)
 {
-    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    QString displayEnvironment = m_desktopMonitor->displayEnvironment();
-    if (!displayEnvironment.isEmpty())
-        env.insert("DISPLAY", displayEnvironment);
-
-    QProcess process;
-    process.setProcessEnvironment(env);
-    process.start("xdg-open", QStringList() << url);
-    process.waitForFinished();
+    // 如果没有配置，则无需打开网页
+    if (!SettingConfig::instance()->enableOpenPortal()) {
+        qCDebug(DSM) << "open portal is disabled";
+        return;
+    }
+
+    // 打开portal网页
+    UrlHelper urlHelper(m_desktopMonitor);
+    urlHelper.openUrl(url);
 }
 
 void SessionContainer::onIPConflictChanged(const QString &devicePath, const QString &ip, bool conflicted)

network-service-plugin/src/session/urlhelper.cpp

@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#include "urlhelper.h"
+#include "desktopmonitor.h"
+#include "constants.h"
+#include "settingconfig.h"
+
+#include <QProcessEnvironment>
+#include <QProcess>
+#include <QUrl>
+#include <QDebug>
+
+using namespace network::sessionservice;
+
+UrlHelper::UrlHelper(DesktopMonitor *desktopMonitor, QObject *parent)
+    : QObject(parent)
+    , m_desktopMonitor(desktopMonitor)
+{
+}
+
+UrlHelper::~UrlHelper()
+{
+}
+
+void UrlHelper::openUrl(const QString &url)
+{
+    QString displayEnvironment = m_desktopMonitor->displayEnvironment();
+
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    if (!displayEnvironment.isEmpty())
+        env.insert("DISPLAY", displayEnvironment);
+
+    QProcess process;
+    process.setProcessEnvironment(env);
+    process.start("xdg-open", QStringList() << url);
+    process.waitForFinished();
+}

network-service-plugin/src/session/urlhelper.h

@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#ifndef URLHELPER_H
+#define URLHELPER_H
+
+#include <QObject>
+
+#include <NetworkManagerQt/VpnConnection>
+
+class QTimer;
+
+namespace network {
+namespace sessionservice {
+
+class DesktopMonitor;
+
+class UrlHelper : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit UrlHelper(DesktopMonitor *desktopMonitor, QObject *parent = nullptr);
+    ~UrlHelper() override;
+    void openUrl(const QString &url);
+
+private:
+    DesktopMonitor *m_desktopMonitor;
+};
+
+}
+}
+
+#endif // SERVICE_H

network-service-plugin/src/utils/settingconfig.cpp

@@ -8,6 +8,11 @@
 
 static Dtk::Core::DConfig *dConfig = nullptr;
 
+// 当没有进行配置的时候, 则访问我们官网
+static const QStringList CheckUrls{
+    "https://www.uniontech.com",
+};
+
 SettingConfig *SettingConfig::instance()
 {
     static SettingConfig inst;
@@ -39,9 +44,9 @@ QStringList SettingConfig::networkCheckerUrls() const
     return m_networkUrls;
 }
 
-bool SettingConfig::checkPortal() const
+bool SettingConfig::enableOpenPortal() const
 {
-    return m_checkPortal;
+    return m_enableOpenPortal;
 }
 
 bool SettingConfig::disableNetwork() const
@@ -88,10 +93,9 @@ void SettingConfig::onValueChanged(const QString &key)
         emit connectivityCheckIntervalChanged(m_connectivityCheckInterval);
     } else if (key == QString("NetworkCheckerUrls")) {
         m_networkUrls = dConfig->value("NetworkCheckerUrls").toStringList();
+        if (m_networkUrls.isEmpty())
+            m_networkUrls = CheckUrls;
         emit checkUrlsChanged(m_networkUrls);
-    } else if (key == QString("checkPortal")) {
-        m_checkPortal = dConfig->value("checkPortal").toBool();
-        emit checkPortalChanged(m_checkPortal);
     } else if (key == QString("disableFailureNotify")) {
         m_disableFailureNotify = dConfig->value("disableFailureNotify").toBool();
         emit disableFailureNotifyChanged(m_disableFailureNotify);
@@ -102,6 +106,8 @@ void SettingConfig::onValueChanged(const QString &key)
         m_httpRequestTimeout = dConfig->value("httpRequestTimeout").toInt();
     } else if (key == QString("httpConnectTimeout")) {
         m_httpConnectTimeout = dConfig->value("httpConnectTimeout").toInt();
+    } else if (key == QString("enableOpenPortal")) {
+        m_enableOpenPortal = dConfig->value("enableOpenPortal").toBool();
     }
 }
 
@@ -110,7 +116,7 @@ SettingConfig::SettingConfig(QObject *parent)
     , m_reconnectIfIpConflicted(false)
     , m_enableConnectivity(true)
     , m_connectivityCheckInterval(30000)
-    , m_checkPortal(false)
+    , m_enableOpenPortal(false)
     , m_disabledNetwork(false)
     , m_enableAccountNetwork(false)
     , m_disableFailureNotify(false)
@@ -138,8 +144,8 @@ SettingConfig::SettingConfig(QObject *parent)
         if (keys.contains("NetworkCheckerUrls"))
             m_networkUrls = dConfig->value("NetworkCheckerUrls").toStringList();
 
-        if (keys.contains("checkPortal"))
-            m_checkPortal = dConfig->value("checkPortal").toBool();
+        if (keys.contains("enableOpenPortal"))
+            m_enableOpenPortal = dConfig->value("enableOpenPortal").toBool();
 
         if (keys.contains("disabledNetwork"))
             m_disabledNetwork = dConfig->value("disabledNetwork").toBool();
@@ -158,4 +164,6 @@ SettingConfig::SettingConfig(QObject *parent)
 
         m_disableFailureNotify = dConfig->value("disableFailureNotify", false).toBool();
     }
+    if (m_networkUrls.isEmpty())
+        m_networkUrls = CheckUrls;
 }

network-service-plugin/src/utils/settingconfig.h

@@ -18,7 +18,7 @@ class SettingConfig : public QObject
     int connectivityIntervalWhenLimit() const;
     int connectivityCheckInterval() const;
     QStringList networkCheckerUrls() const; // 网络检测地址，用于检测网络连通性
-    bool checkPortal() const;               // 是否检测网络认证信息
+    bool enableOpenPortal() const;               // 是否检测网络认证信息
     bool disableNetwork() const;            // 是否禁用无线网络和蓝牙
     bool enableAccountNetwork() const;      // 是否开启用户私有网络(工银瑞信定制)
     bool disableFailureNotify() const;      // 当网络连接失败后,true:不弹出消息,false:弹出消息
@@ -30,7 +30,6 @@ class SettingConfig : public QObject
     void enableConnectivityChanged(bool);
     void connectivityCheckIntervalChanged(int);
     void checkUrlsChanged(QStringList);
-    void checkPortalChanged(bool);
     void disableFailureNotifyChanged(bool);
     void resetWifiOSDEnableTimeoutChanged(int);
 
@@ -46,7 +45,7 @@ private slots:
     int m_connectivityIntervalWhenLimit;
     int m_connectivityCheckInterval;
     QStringList m_networkUrls;
-    bool m_checkPortal;
+    bool m_enableOpenPortal;
     bool m_disabledNetwork;
     bool m_enableAccountNetwork;
     bool m_disableFailureNotify;

src/configsetting.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -18,7 +18,6 @@ ConfigSetting::ConfigSetting(QObject *parent)
     , m_alwaysFromNM(true)
     , m_loadServiceFromNM(false)
     , m_enableConnectivity(false)
-    , m_checkPortal(false)
     , m_supportCertifiedEscape(false)
     , m_showUnAuthorizeSwitch(true)
     , m_connectivityCheckInterval(30000)
@@ -67,9 +66,6 @@ void ConfigSetting::onValueChanged(const QString &key)
     } else if (key == QString("enableConnectivity")) {
         m_enableConnectivity = dConfig->value("enableConnectivity").toBool();
         emit enableConnectivityChanged(m_enableConnectivity);
-    } else if (key == QString("checkPortal")) {
-        m_checkPortal = dConfig->value("checkPortal").toBool();
-        emit checkPortalChanged(m_checkPortal);
     } else if (key == QString("ConnectivityCheckInterval")) {
         m_connectivityCheckInterval = dConfig->value("ConnectivityCheckInterval").toInt() * 1000;
         emit connectivityCheckIntervalChanged(m_connectivityCheckInterval);
@@ -135,11 +131,6 @@ bool ConfigSetting::enableConnectivity() const
     return m_enableConnectivity;
 }
 
-bool ConfigSetting::checkPortal() const
-{
-    return m_checkPortal;
-}
-
 bool ConfigSetting::supportCertifiedEscape() const
 {
     return m_supportCertifiedEscape;

src/configsetting.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -21,7 +21,6 @@ class ConfigSetting : public QObject
 
     QStringList networkCheckerUrls() const; // 网络检测地址，用于检测网络连通性
     bool enableConnectivity() const;        // 是否开启或者禁用前端检测网络连通性的功能
-    bool checkPortal() const;               // 是否检测网络认证信息
     bool supportCertifiedEscape() const;    // 默认是否支持是否回退到未经授权的网络
     bool showUnAuthorizeSwitch() const;     // 是否显示回退到未经授权的网络的开关
     int connectivityCheckInterval() const;  // 网络连通性检测时间间隔
@@ -61,7 +60,6 @@ private slots:
     bool m_alwaysFromNM;
     bool m_loadServiceFromNM;
     bool m_enableConnectivity;
-    bool m_checkPortal;
     bool m_supportCertifiedEscape;
     bool m_showUnAuthorizeSwitch;
     int m_connectivityCheckInterval;