This commit is contained in:
“wanyongkang”
2021-01-26 14:48:05 +08:00
parent d5acdc9474
commit b7e8820693
5 changed files with 581 additions and 8 deletions

View File

@@ -59,6 +59,8 @@ namespace Hncore.Pass.Vpn.Service
agent = new AgentClient7Service(m_HttpClientFactory) { ClientName = product.GroupNO };
if (product.GroupNO == "g8")
agent = new AgentClient8Service(m_HttpClientFactory) { ClientName = product.GroupNO };
if (product.GroupNO == "g9")
agent = new AgentClient9Service(m_HttpClientFactory) { ClientName = product.GroupNO };
agent.Product = product;
return agent;
}
@@ -145,8 +147,8 @@ namespace Hncore.Pass.Vpn.Service
account = accountInfo.Raw;
}
var ret = await agent.GetAccountInfo(account);
if (ret.Code != ResultCode.C_SUCCESS) return new ApiResult<OriginAccountModel>(ResultCode.C_NOT_EXISTS_ERROR, "账号不存在");
if (pwd.Has()&&ret.Data.Pwd != pwd)
if (ret.Code != ResultCode.C_SUCCESS && product.Id!=17&& product.Id!=13) return new ApiResult<OriginAccountModel>(ResultCode.C_NOT_EXISTS_ERROR, "账号不存在");
if (pwd.Has()&&ret.Data.Pwd != pwd && product.Id!=17&& product.Id!=13)
return new ApiResult<OriginAccountModel>(ResultCode.C_NOT_EXISTS_ERROR, "密码不正确");
return ret;
}
@@ -190,10 +192,6 @@ namespace Hncore.Pass.Vpn.Service
var agent = GetAgent(product);
agent.Init(product.BaseUrl, product.Token);
Console.WriteLine("========================================================================");
Console.WriteLine(packageId);
Console.WriteLine(package.PackageType);
Console.WriteLine("========================================================================");
if (package.PackageType == PackageType.Base)
{
var ret = await agent.NewAccount(package.OriginKey, account, pwd, connCount, accountType,payCount);