Merge branch 'master' of http://git.ts.e57.cn/chfei/KJD
This commit is contained in:
commit
6b6bac5b1e
2 files changed
+14
-3
No files matched your search
@@ -31,7 +31,7 @@ namespace AllBase
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 版本ID
|
/// 版本ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static int VersionCount = 1360;
|
public static int VersionCount = 1361;
|
||||||
public static string MainPath = "29wx";
|
public static string MainPath = "29wx";
|
||||||
//public static string MainPath = "29wx";
|
//public static string MainPath = "29wx";
|
||||||
//public static string MainPath = "29pdd";
|
//public static string MainPath = "29pdd";
|
||||||
@@ -104,8 +104,8 @@ namespace AllBase
|
|||||||
public static string OriginUrl = "http://mobile.yangkeduo.com";
|
public static string OriginUrl = "http://mobile.yangkeduo.com";
|
||||||
public static string NewUrl = "https://yangkeduo.com";
|
public static string NewUrl = "https://yangkeduo.com";
|
||||||
//public static string ServerUrl = "http://localhost:9000";
|
//public static string ServerUrl = "http://localhost:9000";
|
||||||
//public static string ServerUrl = "http://1.13.195.131: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://119.45.29.75:9000";
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单监控延迟
|
/// 订单监控延迟
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -101,6 +101,17 @@ namespace Work
|
|||||||
BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id");
|
BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id");
|
||||||
BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name");
|
BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name");
|
||||||
BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner");
|
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)
|
if (BaseClass.GroupId != 3 && BaseClass.GroupId != 4 && BaseClass.GroupId != 9 && BaseClass.GroupId != 10 && BaseClass.GroupId != 11)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user