diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 2e5ccc6..946a214 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -31,7 +31,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1360; + public static int VersionCount = 1361; public static string MainPath = "29wx"; //public static string MainPath = "29wx"; //public static string MainPath = "29pdd"; @@ -104,8 +104,8 @@ namespace AllBase public static string OriginUrl = "http://mobile.yangkeduo.com"; public static string NewUrl = "https://yangkeduo.com"; //public static string ServerUrl = "http://localhost:9000"; - //public static string ServerUrl = "http://1.13.195.131:9000"; - public static string ServerUrl = "http://119.45.29.75:9000"; + public static string ServerUrl = "http://1.13.195.131:9000"; + //public static string ServerUrl = "http://119.45.29.75:9000"; /// /// 订单监控延迟 /// diff --git a/Work/UserLogin.cs b/Work/UserLogin.cs index 96d6dd9..5504f3b 100644 --- a/Work/UserLogin.cs +++ b/Work/UserLogin.cs @@ -101,6 +101,17 @@ namespace Work BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id"); BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name"); BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner"); +#if DEBUG + if (!string.IsNullOrEmpty(BaseRegex.GetStringJson(ref html, "prod_api_url")) && !BaseClass.LoginApiUrl.Contains("localhost") && !BaseClass.LoginApiUrl.Contains("127.0.0.1")) + { + BaseClass.LoginApiUrl = BaseRegex.GetStringJson(ref html, "prod_api_url").Split(';').FirstOrDefault(); + } +#else + if (!string.IsNullOrEmpty(BaseRegex.GetStringJson(ref html, "prod_api_url"))) + { + BaseClass.LoginApiUrl = BaseRegex.GetStringJson(ref html, "prod_api_url").Split(';').FirstOrDefault(); + } +#endif if (BaseClass.GroupId != 3 && BaseClass.GroupId != 4 && BaseClass.GroupId != 9 && BaseClass.GroupId != 10 && BaseClass.GroupId != 11) {