diff --git a/Host/Views.Mobile/LineList/Index.cshtml b/Host/Views.Mobile/LineList/Index.cshtml
index 5a0b54e..dd18740 100644
--- a/Host/Views.Mobile/LineList/Index.cshtml
+++ b/Host/Views.Mobile/LineList/Index.cshtml
@@ -186,7 +186,7 @@
case 5:
this.l2tp = '123';
this.search_field = '老鹰IP';
- this.sstp = '1443';
+ this.sstp = '4430';
break;
case 6:
this.l2tp = '123';
diff --git a/Host/Views/LineList/Index.cshtml b/Host/Views/LineList/Index.cshtml
index c5963d5..920399d 100644
--- a/Host/Views/LineList/Index.cshtml
+++ b/Host/Views/LineList/Index.cshtml
@@ -180,7 +180,7 @@
case 5:
this.l2tp = '123';
this.search_field = '老鹰IP';
- this.sstp = '1443';
+ this.sstp = '4430';
break;
case 6:
this.l2tp = '123';
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index 1c250b1..fa0b527 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -645,7 +645,7 @@
购买须知：本产品山东，山西，湖南，甘肃，四川，安徽，江苏，江西，福建，陕西不屏蔽，其余地区屏蔽QQ、微信
}
@if(item.Product.Id == 5){
- 购买须知：本产品所有地区全部屏蔽微信和QQ
+ 购买须知：本产品部分服务器屏蔽微信和QQ
}
@if(item.Product.Id == 7){
购买须知：本产品所有地区全部屏蔽微信和QQ
diff --git a/Services/Hncore.Pass.Vpn/Service/AgentClient10Service.cs b/Services/Hncore.Pass.Vpn/Service/AgentClient10Service.cs
index a55d6f7..3f3da3f 100644
--- a/Services/Hncore.Pass.Vpn/Service/AgentClient10Service.cs
+++ b/Services/Hncore.Pass.Vpn/Service/AgentClient10Service.cs
@@ -206,31 +206,35 @@ namespace Hncore.Pass.Vpn.Service
///
public override async Task DeleteAccount(string account)
{
- var client = CreateHttpClient();
- var infoRet = await this.GetAccountInfo(account, true);
- if (infoRet.Code != ResultCode.C_SUCCESS)
- return false;
+ Random rd = new Random(Guid.NewGuid().GetHashCode());
+ int i = rd.Next();
- var title = GetOpTitle("DeleteAccount", account);
- LogHelper.Info(title, account);
- try
+ var time_s = DateTime.Now.GetUnixTimeStamp();
+ var agentid = "admin2";
+ var nonce = MD5(time_s.ToString()) + i.ToString();
+ var apikey = "osoa917321hdjw";
+ var sign = MD5(time_s+nonce+apikey);
+
+
+
+ var url = "/api/raduserRefund?agentid="+agentid+"&ti="+time_s+"&nonce="+nonce+"&sign="+sign+"&username="+account;
+
+ var client = CreateHttpClient();
+
+ var resp = await client.GetAsync(url);
+ var content = await resp.Content.ReadAsStringAsync();
+ Console.WriteLine("==============================================================");
+ Console.WriteLine(content);
+ Console.WriteLine("==============================================================");
+ JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+ var status = jo["errcode"].ToString();
+
+ if (status =="0")
{
- var delete = this.DeleteUrl + infoRet.Data.Id + ".html";
- var resp = await client.GetAsync(delete);
- var content = await resp.Content.ReadAsStringAsync();
- if (content.Has() && content.IndexOf("alert(\"删除成功\")") != -1)
- {
- return true;
- }
- else
- {
- LogHelper.Error(title, content);
- return false;
- }
+ return true;
}
- catch (Exception ex)
+ else
{
- LogHelper.Error(title, ex.Message);
return false;
}
}
@@ -333,9 +337,34 @@ namespace Hncore.Pass.Vpn.Service
public override async Task Refund(string account, string packageKey, int days)
{
-
+ Random rd = new Random(Guid.NewGuid().GetHashCode());
+ int i = rd.Next();
- return new ApiResult(1);
+ var time_s = DateTime.Now.GetUnixTimeStamp();
+ var agentid = "admin2";
+ var nonce = MD5(time_s.ToString()) + i.ToString();
+ var apikey = "osoa917321hdjw";
+ var sign = MD5(time_s+nonce+apikey);
+
+
+
+ var url = "/api/raduserRefund?agentid="+agentid+"&ti="+time_s+"&nonce="+nonce+"&sign="+sign+"&username="+account;
+
+ var client = CreateHttpClient();
+
+ var resp = await client.GetAsync(url);
+ var content = await resp.Content.ReadAsStringAsync();
+ Console.WriteLine("==============================================================");
+ Console.WriteLine(content);
+ Console.WriteLine("==============================================================");
+ JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+ var status = jo["errcode"].ToString();
+
+ if (status =="0")
+ {
+ return new ApiResult(1);
+ }
+ return new ApiResult(ResultCode.C_INVALID_ERROR, "退款失败");
}
///
diff --git a/Services/Hncore.Pass.Vpn/Service/AgentClient12Service.cs b/Services/Hncore.Pass.Vpn/Service/AgentClient12Service.cs
index 82f7610..392d8af 100644
--- a/Services/Hncore.Pass.Vpn/Service/AgentClient12Service.cs
+++ b/Services/Hncore.Pass.Vpn/Service/AgentClient12Service.cs
@@ -206,33 +206,39 @@ namespace Hncore.Pass.Vpn.Service
///
public override async Task DeleteAccount(string account)
{
- var client = CreateHttpClient();
- var infoRet = await this.GetAccountInfo(account, true);
- if (infoRet.Code != ResultCode.C_SUCCESS)
- return false;
- var title = GetOpTitle("DeleteAccount", account);
- LogHelper.Info(title, account);
- try
+ Random rd = new Random(Guid.NewGuid().GetHashCode());
+ int i = rd.Next();
+
+ var time_s = DateTime.Now.GetUnixTimeStamp();
+ var agentid = "admin1";
+ var nonce = MD5(time_s.ToString()) + i.ToString();
+ var apikey = "a478ad5aa3079bbbef3cd45e2d55d61e";
+ var sign = MD5(time_s+nonce+apikey);
+
+
+
+ var url = "/api/raduserRefund?agentid="+agentid+"&ti="+time_s+"&nonce="+nonce+"&sign="+sign+"&username="+account;
+
+ var client = CreateHttpClient();
+
+ var resp = await client.GetAsync(url);
+ var content = await resp.Content.ReadAsStringAsync();
+ Console.WriteLine("==============================================================");
+ Console.WriteLine(content);
+ Console.WriteLine("==============================================================");
+ JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+ var status = jo["errcode"].ToString();
+
+ if (status =="0")
{
- var delete = this.DeleteUrl + infoRet.Data.Id + ".html";
- var resp = await client.GetAsync(delete);
- var content = await resp.Content.ReadAsStringAsync();
- if (content.Has() && content.IndexOf("alert(\"删除成功\")") != -1)
- {
- return true;
- }
- else
- {
- LogHelper.Error(title, content);
- return false;
- }
+ return true;
}
- catch (Exception ex)
+ else
{
- LogHelper.Error(title, ex.Message);
return false;
}
+
}
///
/// 得到账号信息
@@ -334,8 +340,37 @@ namespace Hncore.Pass.Vpn.Service
{
+ Random rd = new Random(Guid.NewGuid().GetHashCode());
+ int i = rd.Next();
- return new ApiResult(1);
+ var time_s = DateTime.Now.GetUnixTimeStamp();
+ var agentid = "admin1";
+ var nonce = MD5(time_s.ToString()) + i.ToString();
+ var apikey = "a478ad5aa3079bbbef3cd45e2d55d61e";
+ var sign = MD5(time_s+nonce+apikey);
+
+
+
+ var url = "/api/raduserRefund?agentid="+agentid+"&ti="+time_s+"&nonce="+nonce+"&sign="+sign+"&username="+account;
+
+ var client = CreateHttpClient();
+
+ var resp = await client.GetAsync(url);
+ var content = await resp.Content.ReadAsStringAsync();
+ Console.WriteLine("==========================tui====================================");
+ Console.WriteLine(content);
+ Console.WriteLine("==============================================================");
+ JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+ Console.WriteLine("===========================kuan===================================");
+ Console.WriteLine(jo);
+ Console.WriteLine("==============================================================");
+ var status = jo["errcode"].ToString();
+
+ if (status =="0")
+ {
+ return new ApiResult(1);
+ }
+ return new ApiResult(ResultCode.C_INVALID_ERROR, "退款失败");
}
///
diff --git a/Services/Hncore.Pass.Vpn/Service/AgentClient14Service.cs b/Services/Hncore.Pass.Vpn/Service/AgentClient14Service.cs
index 7d0e8af..ec70008 100644
--- a/Services/Hncore.Pass.Vpn/Service/AgentClient14Service.cs
+++ b/Services/Hncore.Pass.Vpn/Service/AgentClient14Service.cs
@@ -200,31 +200,34 @@ namespace Hncore.Pass.Vpn.Service
///
public override async Task DeleteAccount(string account)
{
- var client = CreateHttpClient();
- var infoRet = await this.GetAccountInfo(account, true);
- if (infoRet.Code != ResultCode.C_SUCCESS)
- return false;
+ Random rd = new Random(Guid.NewGuid().GetHashCode());
+ int i = rd.Next();
- var title = GetOpTitle("DeleteAccount", account);
- LogHelper.Info(title, account);
- try
+ var time_s = DateTime.Now.GetUnixTimeStamp();
+ var agentid = "admin1";
+ var nonce = MD5(time_s.ToString()) + i.ToString();
+ var apikey = "b220b83508db57f44e5ce86a7b34cae9";
+ var sign = MD5(time_s+nonce+apikey);
+
+
+ var url = "/api/raduserRefund?agentid="+agentid+"&ti="+time_s+"&nonce="+nonce+"&sign="+sign+"&username="+account;
+
+ var client = CreateHttpClient();
+
+ var resp = await client.GetAsync(url);
+ var content = await resp.Content.ReadAsStringAsync();
+ Console.WriteLine("==============================================================");
+ Console.WriteLine(content);
+ Console.WriteLine("==============================================================");
+ JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+ var status = jo["errcode"].ToString();
+
+ if (status =="0")
{
- var delete = this.DeleteUrl + infoRet.Data.Id + ".html";
- var resp = await client.GetAsync(delete);
- var content = await resp.Content.ReadAsStringAsync();
- if (content.Has() && content.IndexOf("alert(\"删除成功\")") != -1)
- {
- return true;
- }
- else
- {
- LogHelper.Error(title, content);
- return false;
- }
+ return true;
}
- catch (Exception ex)
+ else
{
- LogHelper.Error(title, ex.Message);
return false;
}
}
@@ -326,10 +329,34 @@ namespace Hncore.Pass.Vpn.Service
///
public override async Task Refund(string account, string packageKey, int days)
{
+ Random rd = new Random(Guid.NewGuid().GetHashCode());
+ int i = rd.Next();
-
+ var time_s = DateTime.Now.GetUnixTimeStamp();
+ var agentid = "admin1";
+ var nonce = MD5(time_s.ToString()) + i.ToString();
+ var apikey = "b220b83508db57f44e5ce86a7b34cae9";
+ var sign = MD5(time_s+nonce+apikey);
- return new ApiResult(1);
+
+
+ var url = "/api/raduserRefund?agentid="+agentid+"&ti="+time_s+"&nonce="+nonce+"&sign="+sign+"&username="+account;
+
+ var client = CreateHttpClient();
+
+ var resp = await client.GetAsync(url);
+ var content = await resp.Content.ReadAsStringAsync();
+ Console.WriteLine("==============================================================");
+ Console.WriteLine(content);
+ Console.WriteLine("==============================================================");
+ JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+ var status = jo["errcode"].ToString();
+
+ if (status =="0")
+ {
+ return new ApiResult(1);
+ }
+ return new ApiResult(ResultCode.C_INVALID_ERROR, "退款失败");
}
///
diff --git a/Services/Hncore.Pass.Vpn/Service/AgentClient3Service.cs b/Services/Hncore.Pass.Vpn/Service/AgentClient3Service.cs
index 8113bb1..dee16b0 100644
--- a/Services/Hncore.Pass.Vpn/Service/AgentClient3Service.cs
+++ b/Services/Hncore.Pass.Vpn/Service/AgentClient3Service.cs
@@ -95,6 +95,9 @@ namespace Hncore.Pass.Vpn.Service
var resp = await client.GetAsync(url);
var content = await resp.Content.ReadAsStringAsync();
JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+ Console.WriteLine("=====================================新开================================================");
+ Console.WriteLine(jo);
+ Console.WriteLine("=====================================================================================");
var status = jo["code"].ToString();
if (status == "1")
{
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index 880bd5a..d2c56c2 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -673,30 +673,10 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
if (ret.Code != ResultCode.C_SUCCESS)
{
- var ret_exit = await m_AgentService.Exist(accountEntity.ProductId.ToInt(), accountEntity.Account);
- await Task.Delay(50);
- if (ret_exit != true){
- if(accountEntity.PackageId.Value == 86 || accountEntity.PackageId.Value == 88){
- ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, accountEntity.Account, accountEntity.Pwd, accountEntity.ConnectCount,1,2);
- } else if(accountEntity.ProductId.Value == 8 || accountEntity.ProductId.Value == 7){
- var account_remark = accountEntity.Account + "-" + user_remark;
- ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, account_remark, accountEntity.Pwd, accountEntity.ConnectCount,1,2);
- } else {
- ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, accountEntity.Account, accountEntity.Pwd, accountEntity.ConnectCount);
- }
- if (ret.Code != ResultCode.C_SUCCESS)
- {
- accountEntity.ChargeStatus = AccountChargeStatus.Exception;
- accountEntity.Remark = ret.Message;
- await m_ProductAccountService.Update(accountEntity);
- accountError += $"{accountEntity.Account}{accountEntity.Remark},";
- }
- else if (ret.Data != null && ret.Data.ToString().Has())
- {
- accountEntity.Raw = ret.Data.ToString();
- await m_ProductAccountService.Update(accountEntity);
- }
- }
+ accountEntity.ChargeStatus = AccountChargeStatus.Exception;
+ accountEntity.Remark = ret.Message;
+ await m_ProductAccountService.Update(accountEntity);
+
}
else if (ret.Data != null && ret.Data.ToString().Has())
{
@@ -768,22 +748,10 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
}
if (ret.Code != ResultCode.C_SUCCESS)
{
-
- var accountInfo = await m_AgentService.GetOriginAccountInfo(accountEntity.ProductId.ToInt(), accountEntity.Account);
- if(accountEntity.EndTime > accountInfo.Data.RealEndTime.AddMinutes(1)){
- if (order.PackageId == 86){
- ret = await m_AgentService.ReNewAccount(order.Id, order.PackageId, account, order.ConnectCount,2);
- } else {
- ret = await m_AgentService.ReNewAccount(order.Id, order.PackageId, account, order.ConnectCount);
- }
- if (ret.Code != ResultCode.C_SUCCESS)
- {
- accountEntity.ChargeStatus = AccountChargeStatus.Exception;
- accountEntity.Remark = ret.Message;
- await m_ProductAccountService.Update(accountEntity);
- accountError += $"{accountEntity.Account}{accountEntity.Remark},";
- }
- }
+ accountEntity.ChargeStatus = AccountChargeStatus.Exception;
+ accountEntity.Remark = ret.Message;
+ await m_ProductAccountService.Update(accountEntity);
+ accountError += $"{accountEntity.Account}{accountEntity.Remark},";
}
});
if (accountError.Has())