diff --git a/configs/login_server/grd_login.properties b/configs/login_server/grd_login.properties index eccde7fb8..2bbde59db 100644 --- a/configs/login_server/grd_login.properties +++ b/configs/login_server/grd_login.properties @@ -22,6 +22,8 @@ loginServer.db.user = root loginServer.db.password = loginServer.db.port = 3306 +frontend.checkEmailPath = http://localhost/account/checkEmail + email.disable = true #email.username = #email.sender = diff --git a/login_server/src/cpp/ServerConfig.cpp b/login_server/src/cpp/ServerConfig.cpp index f319ea460..89b5e1a2f 100644 --- a/login_server/src/cpp/ServerConfig.cpp +++ b/login_server/src/cpp/ServerConfig.cpp @@ -48,6 +48,7 @@ namespace ServerConfig { Languages g_default_locale; std::string g_php_serverPath; std::string g_php_serverHost; + std::string g_frontend_checkEmailPath; int g_phpServerPort; Poco::Mutex g_TimeMutex; int g_FakeLoginSleepTime = 820; @@ -210,7 +211,7 @@ namespace ServerConfig { DISASM_FALSERET; g_SessionTimeout = cfg.getInt("session.timeout", SESSION_TIMEOUT_DEFAULT); - g_serverPath = cfg.getString("loginServer.path", ""); + g_serverPath = cfg.getString("loginServer.path", "http://localhost/account"); replaceZeroIPWithLocalhostIP(g_serverPath); g_default_locale = LanguageManager::languageFromString(cfg.getString("loginServer.default_locale")); g_serverPort = cfg.getInt("loginServer.port", 0); @@ -231,6 +232,8 @@ namespace ServerConfig { if ("" != app_secret_string) { g_CryptoAppSecret = DataTypeConverter::hexToBin(app_secret_string); } + std::string defaultCheckEmailPath = g_serverPath + "/checkEmail"; + g_frontend_checkEmailPath = cfg.getString("frontend.checkEmailPath", defaultCheckEmailPath); //g_CryptoAppSecret g_gRPCRelayServerFullURL = cfg.getString("grpc.server", ""); diff --git a/login_server/src/cpp/ServerConfig.h b/login_server/src/cpp/ServerConfig.h index aef4ea28d..f74f506a1 100644 --- a/login_server/src/cpp/ServerConfig.h +++ b/login_server/src/cpp/ServerConfig.h @@ -66,6 +66,7 @@ namespace ServerConfig { extern Languages g_default_locale; extern std::string g_php_serverPath; extern std::string g_php_serverHost; + extern std::string g_frontend_checkEmailPath; extern int g_phpServerPort; extern Poco::Mutex g_TimeMutex; extern int g_FakeLoginSleepTime; diff --git a/login_server/src/cpp/controller/EmailVerificationCode.cpp b/login_server/src/cpp/controller/EmailVerificationCode.cpp index 375d80f06..45c38bf70 100644 --- a/login_server/src/cpp/controller/EmailVerificationCode.cpp +++ b/login_server/src/cpp/controller/EmailVerificationCode.cpp @@ -120,8 +120,10 @@ namespace controller { std::string EmailVerificationCode::getLink() { - std::string link = ServerConfig::g_serverPath; - link += "/checkEmail/"; + std::string link = ServerConfig::g_frontend_checkEmailPath; + if (link.data()[link.size() - 1] != '/') { + link += '/'; + } link += std::to_string(getModel()->getCode()); return link; }