chore: prepare repository for submodule split

2026-07-09 09:00:51 +00:00
parent 9e545cb328
commit e9a2400c48
33 changed files with 4175 additions and 1545 deletions
@@ -4,6 +4,8 @@
 #include <QMessageBox>
 #include <QProcess>
 #include <QProgressDialog>
+#include <QInputDialog>
+#include <QLineEdit>
 #include <QTextCodec>
 #include "UpdateLogic.h"
 #include "../Common/ConfigHelper.h"
@@ -13,6 +15,7 @@
 #include "../Common/DeviceIdentityHelper.h"
 #include <QFile>
 #include <QFileDialog>
+#include <QDir>

 int main(int argc, char* argv[])
 {
@@ -30,16 +33,81 @@ int main(int argc, char* argv[])
    progress.show();
    QApplication::processEvents();

+    const QString appDir = QApplication::applicationDirPath();
    ConfigHelper& config = ConfigHelper::instance();
-    DeviceIdentityHelper identity(QApplication::applicationDirPath());
-    if (!identity.ensureIssued(config.getValue("Server", "api_base_url"),
-                               config.getValue("Server", "client_token"),
-                               config.getValue("App", "app_id"),
-                               config.getValue("App", "channel"),
-                               config.getValue("License", "license_key"))) {
-        progress.close();
-        QMessageBox::critical(nullptr, "设备身份验证失败", identity.errorString());
-        return -1;
+    const auto isLicenseError = [](const QString& errorText) {
+        const QString text = errorText.toLower();
+        return text.contains("license")
+            || errorText.contains("授权")
+            || errorText.contains("过期")
+            || errorText.contains("设备数量已达到上限")
+            || errorText.contains("已绑定其他授权");
+    };
+    const auto clearDeviceCredential = [&]() {
+        QFile::remove(QDir(appDir).filePath("config/client_identity.dat"));
+        config.setValue("Update", "device_id", QString());
+    };
+    QString licenseKey = config.getValue("License", "license_key").trimmed();
+    auto promptAndSaveLicense = [&](const QString& reason) -> QString {
+        QString promptReason = reason;
+        while (true) {
+            progress.close();
+            bool accepted = false;
+            const QString appName = config.getValue("App", "app_name").trimmed();
+            const QString prompt = promptReason.trimmed().isEmpty()
+                ? QString("请输入%1授权 License：").arg(appName.isEmpty() ? "软件" : appName)
+                : QString("%1\n\n请重新输入%2授权 License：").arg(promptReason, appName.isEmpty() ? "软件" : appName);
+            licenseKey = QInputDialog::getText(
+                nullptr,
+                "输入 License",
+                prompt,
+                QLineEdit::Normal,
+                QString(),
+                &accepted
+            ).trimmed();
+            if (!accepted) {
+                QMessageBox::information(nullptr, "需要 License", "首次启动需要输入管理员提供的 License。");
+                return QString();
+            }
+            if (licenseKey.isEmpty()) {
+                QMessageBox::warning(nullptr, "License 不能为空", "请粘贴管理员在后台创建的 License。");
+                promptReason.clear();
+                continue;
+            }
+            if (!config.setValue("License", "license_key", licenseKey)) {
+                QMessageBox::critical(nullptr, "保存 License 失败",
+                    QString("无法写入配置文件：%1\n%2").arg(config.configPath(), config.lastError()));
+                return QString();
+            }
+            progress.show();
+            progress.setLabelText("正在验证 License...");
+            QApplication::processEvents();
+            return licenseKey;
+        }
+    };
+
+    while (true) {
+        if (licenseKey.isEmpty()) {
+            licenseKey = promptAndSaveLicense(QString());
+            if (licenseKey.isEmpty()) return 0;
+        }
+        DeviceIdentityHelper identity(appDir);
+        if (identity.ensureIssued(config.getValue("Server", "api_base_url"),
+                                  config.getValue("Server", "client_token"),
+                                  config.getValue("App", "app_id"),
+                                  config.getValue("App", "channel"),
+                                  licenseKey)) {
+            break;
+        }
+        const QString error = identity.errorString();
+        if (!isLicenseError(error)) {
+            progress.close();
+            QMessageBox::critical(nullptr, "设备身份验证失败", error);
+            return -1;
+        }
+        clearDeviceCredential();
+        licenseKey = promptAndSaveLicense(QString("当前 License 无法使用：%1").arg(error));
+        if (licenseKey.isEmpty()) return 0;
    }

    UpdateLogic logic;
@@ -57,13 +125,22 @@ int main(int argc, char* argv[])
        progress.close();
        const QJsonValue detail = response.value("detail");
        const QString message = detail.isObject() ? detail.toObject().value("msg").toString() : detail.toString();
-        QMessageBox::critical(nullptr, "授权被拒绝", message.isEmpty() ? "设备或 License 授权无效。" : message);
+        const QString displayMessage = message.isEmpty() ? "设备或 License 授权无效。" : message;
+        if (isLicenseError(displayMessage)) {
+            clearDeviceCredential();
+            const QString newLicense = promptAndSaveLicense(QString("当前授权被服务端拒绝：%1").arg(displayMessage));
+            if (!newLicense.isEmpty()) {
+                progress.close();
+                QMessageBox::information(nullptr, "License 已保存", "请重新启动 Launcher 完成设备授权和更新检查。");
+            }
+            return 0;
+        }
+        QMessageBox::critical(nullptr, "授权被拒绝", displayMessage);
        return -1;
    }

    const QString launchToken = config.getValue("App", "launch_token");
    const QString currentVersion = config.getValue("App", "current_version");
-    const QString appDir = QApplication::applicationDirPath();
    const auto configuredName = [&](const QString& key, const QString& fallback) {
        const QString value = config.getValue("Runtime", key).trimmed();
        return value.isEmpty() ? fallback : value;