From 32afbd895b46801c135f8299792f8285d268d186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Fri, 4 Jun 2021 18:50:47 +0800
Subject: [PATCH] huohu1

---
 Host/Views.Mobile/User/AssignAddress.cshtml       |  2 +-
 Host/Views/LineList/Index.cshtml                  |  3 +++
 Host/Views/Product/Index.cshtml                   |  2 +-
 Host/Views/User/MyAccounts.cshtml                 |  2 +-
 .../Service/ProductAccountService.cs              |  4 ++--
 .../Service/ProductOrderService.cs                | 15 +++++++++++++++
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Host/Views.Mobile/User/AssignAddress.cshtml b/Host/Views.Mobile/User/AssignAddress.cshtml
index 64131b8..4e8ab48 100644
--- a/Host/Views.Mobile/User/AssignAddress.cshtml
+++ b/Host/Views.Mobile/User/AssignAddress.cshtml
@@ -158,7 +158,7 @@
                         dataType: "json",
                         contentType: "application/json",
                         success: function (res) {
-                            $("#huohu").html('<p style="font-size:30px;">统一服务器地址：1.hhip.vip </p><p>换地区时无需在设备上更换服务器，只需在此页面选择需要的地区即可，可实现任意城市组合的混拨。</p>');
+                            $("#huohu").html('<p style="font-size:30px;">统一服务器地址：1.hhip.vip <span style="color:red;">请不要选择剩余为0的地区</span></p><p>换地区时无需在设备上更换服务器，只需在此页面选择需要的地区即可，可实现任意城市组合的混拨。</p>');
                             $("#huohu").append(res.ipmodel);
                             $("#huohu").append("<hr>");
                             $("#huohu").append(res.city);
diff --git a/Host/Views/LineList/Index.cshtml b/Host/Views/LineList/Index.cshtml
index 76532ad..9312a04 100644
--- a/Host/Views/LineList/Index.cshtml
+++ b/Host/Views/LineList/Index.cshtml
@@ -72,6 +72,9 @@
                 <p v-if="product_id ==1">解决方法：IP账号后边输入：@@特征码，例如您的IP账号为zx1234，要用sstp直连温州的，那账号框就输入：zx1234@zjwz，服务器输入任意一个全国混拨的服务器，则会连接到温州。</p>
                 <p v-if="product_id==2">解决方法：IP账号后边输入：@@特征码，例如您的IP账号为zx1234，要用sstp直连三亚的，那账号框就输入：zx1234@hnsy，服务器输入任意一个全国混拨的服务器，则会连接到三亚。</p>
             </div>
+            <div style="color: #CC3333;line-height:50%;text-align:center;font-size:20px;" v-if="product_id ==19">
+                <p>该产品切记一定要指定一下地区，不然会没有网络</p>
+            </div>
     </div>
     <div class="row">
         <div class="col-lg-2 miyao">
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index 6a4324f..32f07d7 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -607,7 +607,7 @@
                         <p class="youhuiNew">月卡送10天，双月卡赠送1个月，活动截止时间2021年3月31日<br>（同一个IP账号不限次数，<span style="color:FF0033;background-color:#FFFF33;">您可对同一账号多次续费都有赠送</span>，每位会员不限账号数量，您可购买多个IP账号都有赠送））</p>
                     } *@
                     @if(item.Product.Id == 19){
-                        <p class="youhuiNew">本产品为独享，每个账号对应一个宽带拨号，永不超载，保证了网速及稳定性。<br>使用时只需设置这个唯一的服务器：1.hhip.vip，在账号列表中点击切换地区即可任意组合自己需要的地区。本产品灵活便捷，欢迎选购
+                        <p class="youhuiNew">本产品为独享，每个账号对应一个宽带拨号，永不超载，保证了网速及稳定性。<br>使用时只需设置这个唯一的服务器：1.hhip.vip，在账号列表中点击切换地区即可任意组合自己需要的地区<br><span style="color: #000000;">切记一定要指定一下地区，不然会没有网络</span>
                         <br>购买须知：本产品以下地区屏蔽微信和QQ：北上广深，江苏省全部地区，浙江省全部地区，广东省全部地区，其他地区不受限制</p>
                     }
                     
diff --git a/Host/Views/User/MyAccounts.cshtml b/Host/Views/User/MyAccounts.cshtml
index 11a81e2..6ebfb6c 100644
--- a/Host/Views/User/MyAccounts.cshtml
+++ b/Host/Views/User/MyAccounts.cshtml
@@ -717,7 +717,7 @@
                         dataType: "json",
                         contentType: "application/json",
                         success: function (res) {
-                            $("#huohu").html('<p style="font-size:30px;">统一服务器地址：1.hhip.vip </p><p>换地区时无需在设备上更换服务器，只需在此页面选择需要的地区即可，可实现任意城市组合的混拨。</p>');
+                            $("#huohu").html('<p style="font-size:30px;">统一服务器地址：1.hhip.vip <span style="color:red;">请不要选择剩余为0的地区</span></p><p>换地区时无需在设备上更换服务器，只需在此页面选择需要的地区即可，可实现任意城市组合的混拨。</p>');
                             $("#huohu").append(res.ipmodel);
                             $("#huohu").append("<hr>");
                             $("#huohu").append(res.city);
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs
index c0e8e18..1b61458 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs
@@ -156,7 +156,7 @@ namespace Hncore.Pass.Vpn.Service
             {
                 return new ApiResult(ResultCode.C_INVALID_ERROR, "账号不存在");
             }
-            if (request.Pwd.NotHas())
+            if (request.Pwd.NotHas()&&request.RePwd.NotHas())
             {
                 return new ApiResult(ResultCode.C_INVALID_ERROR, "密码不能为空");
             }
@@ -165,7 +165,7 @@ namespace Hncore.Pass.Vpn.Service
             {
                 return new ApiResult(ResultCode.C_INVALID_ERROR, "远程更新失败");
             }
-            entity.Pwd = request.Pwd;
+            entity.Pwd = request.RePwd;
             await this.Update(entity);
             return new ApiResult(1);
         }
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index a41f045..6383c19 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -19,6 +19,7 @@ using Hncore.Pass.BaseInfo.Models;
 using ScoreType = Hncore.Pass.BaseInfo.Models.ScoreType;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Internal;
+using Hncore.Infrastructure.SMS;
 
 namespace Hncore.Pass.Vpn.Service
 {
@@ -1026,6 +1027,20 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
                 var time = (accountInfo.EndTime - DateTime.Now).Value;
                 order.RefundRestTime = time.ToString(@"d\天hh\时mm\分");
 
+                //短信内容
+                var tpl_info = new Dictionary<string, string>(){
+                    {"product",accountInfo.ProductName},
+                    {"package",accountInfo.PackageName },
+                    {"connect",accountInfo.ConnectCount.ToString() },
+                    {"account",account },
+                    {"resttime",order.RefundRestTime},
+                };
+                
+
+                if(accountInfo.ProductId==13||accountInfo.ProductId==17){
+                    AliSmsService.Send( "SMS_218038707", tpl_info, "聚IP商城", "17626516016");
+                }
+
                 var againBuy = lastOrder.OrderType == OrderType.AgainBuy || lastOrder.OrderType == OrderType.AgainBuys;
 
                 var laoyingXunFei = againBuy && lastOrder.ProductId == 4;