From efa8c7180b38d0a72fc6abd3fbe08d2c412c74a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Mon, 27 Dec 2021 16:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BB=A3=E7=90=86=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/Product/Soft.cshtml         |  2 +-
 Host/Views/Product/Index.cshtml               | 40 ++++++++-----------
 Host/Views/Product/Soft.cshtml                |  2 +-
 .../Service/ProductOrderService.cs            |  6 +--
 4 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/Host/Views.Mobile/Product/Soft.cshtml b/Host/Views.Mobile/Product/Soft.cshtml
index 1eb5668..45dc335 100644
--- a/Host/Views.Mobile/Product/Soft.cshtml
+++ b/Host/Views.Mobile/Product/Soft.cshtml
@@ -43,7 +43,7 @@
         <p>代理商专用客户端</p>        
         <p><a href="http://wuxinxikehuduan.image.qiangzipptp.top/%E8%A5%BF%E7%93%9CIP%20-%20%E4%BB%A3%E7%90%86%E7%89%88.zip"> <button type="button" class="btnBlue">西瓜IP-电脑版</button></a></p>
         <p><a href="http://wuxinxikehuduan.image.qiangzipptp.top/%E8%A5%BF%E7%93%9CIP%E5%AE%89%E5%8D%93%E4%BB%A3%E7%90%86%E7%89%88.apk"> <button type="button" class="btnBlue">西瓜IP-安卓</button></a></p><br>
-        <p><a href="http://wuxinxikehuduan.image.qiangzipptp.top/%E6%9E%81%E5%AE%A2IP%20-%20%E4%BB%A3%E7%90%86%E7%89%88.zip"> <button type="button" class="btnBlue">极客IP-电脑版</button></a></p><br>
+        <p><a href="http://wuxinxikehuduan.image.qiangzipptp.top/%E6%9E%81%E5%AE%A2IP%E7%94%B5%E8%84%91%E4%BB%A3%E7%90%86%E7%89%88-12.13%E6%97%A5%E6%9B%B4%E6%96%B0.zip"> <button type="button" class="btnBlue">极客IP-电脑版</button></a></p><br>
         <p><a href="http://wuxinxikehuduan.image.qiangzipptp.top/%E6%9E%81%E5%AE%A2IP%E5%AE%89%E5%8D%93%E4%BB%A3%E7%90%86%E7%89%88.apk"> <button type="button" class="btnBlue">极客IP-安卓</button></a></p><br>
         
         <p><a href="http://wuxinxikehuduan.image.qiangzipptp.top/%E8%AE%AF%E8%BF%9EIP%E7%94%B5%E8%84%91%E7%AB%AF-%E4%BB%A3%E7%90%86%E7%89%88.rar"> <button type="button" class="btnBlue">迅连IP-电脑版</button></a></p>
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index 4868bce..59745c2 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -441,19 +441,18 @@
                     }
                     @if(item.Product.Id == 1){
                         <p class="youhuiNew" style="color: #0066CC;">本产品目前所有地区都屏蔽QQ微信</p>
-                        @* <div style="text-align:center;cursor:pointer;padding:5px;font-size:15px;font-weight:bold;color:red;" title="目前公布要停的地区为：
-北京,上海,广州,深圳,重庆，浙江全省，安徽全省,
-成都,徐州,南京,宿迁,福州,三明,南平,南昌,赣州,萍乡,
-鄂尔多斯,包头,呼和浩特,韶关,东莞,烟台,滨州，青岛,
-黄冈，武汉,邯郸，唐山，石家庄,曲靖，昆明,郑州,西安,
-长沙,长春,兰州,哈尔滨,太原，运城，晋中,南宁,西宁,中卫">购买须知：本产品以下地区屏蔽微信和QQ：北京,上海,广州,深圳,重庆，浙江全省，安徽全省...<span
+                        @* <div style="text-align:center;cursor:pointer;padding:5px;font-size:15px;font-weight:bold;color:red;" >购买须知：本产品域名出现问题，点击查看服务器ip地址<span
 			data-container="body" data-toggle="popover" data-placement="auto top" 
-			data-content="目前公布要停的地区为：
-北京,上海,广州,深圳,重庆，浙江全省，安徽全省,
-成都,徐州,南京,宿迁,福州,三明,南平,南昌,赣州,萍乡,
-鄂尔多斯,包头,呼和浩特,韶关,东莞,烟台,滨州，青岛,
-黄冈，武汉,邯郸，唐山，石家庄,曲靖，昆明,郑州,西安,
-长沙,长春,兰州,哈尔滨,太原，运城，晋中,南宁,西宁,中卫" style="color: #000000;">查看详细地区 </span>
+			data-content="强子1混播 122.228.64.103
+强子2混播  222.242.147.43
+强子3混播  61.187.241.67
+强子4混播  122.228.64.101
+强子5混播  61.187.241.67
+强子6混播  122.228.64.102
+强子7混播  61.187.240.176
+强子8混播  113.219.4.23
+单地区用以上混播ip + 特征码连接，如您的IP账号为zx1234，要直连温州的，那账号框就输入：zx1234@zjwz。
+" style="color: #000000;">查看详细地区 </span>
                     </div> *@
                     }
                     <script>
@@ -463,19 +462,12 @@
                     </script>
                     @if(item.Product.Id == 2){
                      <p class="youhuiNew" style="color: #0066CC;">本产品目前所有地区都屏蔽QQ微信</p>
-                       @* <div style="text-align:center;cursor:pointer;padding:5px;font-size:15px;font-weight:bold;color:red;" title="目前公布要停的地区为：
-北京,上海,广州,深圳,重庆，浙江全省，安徽全省,
-成都,徐州,南京,宿迁,福州,三明,南平,南昌,赣州,萍乡,
-鄂尔多斯,包头,呼和浩特,韶关,东莞,烟台,滨州，青岛,
-黄冈，武汉,邯郸，唐山，石家庄,曲靖，昆明,郑州,西安,
-长沙,长春,兰州,哈尔滨,太原，运城，晋中,南宁,西宁,中卫">购买须知：本产品以下地区屏蔽微信和QQ：北京,上海,广州,深圳,重庆，浙江全省，安徽全省...<span
+                       @* <div style="text-align:center;cursor:pointer;padding:5px;font-size:15px;font-weight:bold;color:red;" >购买须知：本产品域名出现问题，点击查看服务器ip地址<span
 			data-container="body" data-toggle="popover" data-placement="auto top" 
-			data-content="目前公布要停的地区为：
-北京,上海,广州,深圳,重庆，浙江全省，安徽全省,
-成都,徐州,南京,宿迁,福州,三明,南平,南昌,赣州,萍乡,
-鄂尔多斯,包头,呼和浩特,韶关,东莞,烟台,滨州，青岛,
-黄冈，武汉,邯郸，唐山，石家庄,曲靖，昆明,郑州,西安,
-长沙,长春,兰州,哈尔滨,太原，运城，晋中,南宁,西宁,中卫" style="color: #000000;">查看详细地区 </span>
+			data-content="讯连1混播 122.228.64.99
+讯连2混播  61.187.186.42
+单地区用以上混播ip + 特征码连接，如您的IP账号为zx1234，要直连温州的，那账号框就输入：zx1234@zjwz。
+" style="color: #000000;">查看详细地区 </span>
                     </div> *@
                     }
                     @if(item.Product.Id == 6){
diff --git a/Host/Views/Product/Soft.cshtml b/Host/Views/Product/Soft.cshtml
index 9a57c36..491f075 100644
--- a/Host/Views/Product/Soft.cshtml
+++ b/Host/Views/Product/Soft.cshtml
@@ -84,7 +84,7 @@
                     </div>
 
                     <div class="item" style="margin-bottom: 5px;">
-                        <a href="http://wuxinxikehuduan.image.qiangzipptp.top/%E6%9E%81%E5%AE%A2IP%20-%20%E4%BB%A3%E7%90%86%E7%89%88.zip"> <button type="button" class="btn btn-sdefault" style="width: auto;">极客IP-电脑版</button></a>
+                        <a href="http://wuxinxikehuduan.image.qiangzipptp.top/%E6%9E%81%E5%AE%A2IP%E7%94%B5%E8%84%91%E4%BB%A3%E7%90%86%E7%89%88-12.13%E6%97%A5%E6%9B%B4%E6%96%B0.zip"> <button type="button" class="btn btn-sdefault" style="width: auto;">极客IP-电脑版</button></a>
                     </div>
                     <div class="item" style="margin-bottom: 5px;">
                         <a href="http://wuxinxikehuduan.image.qiangzipptp.top/%E6%9E%81%E5%AE%A2IP%E5%AE%89%E5%8D%93%E4%BB%A3%E7%90%86%E7%89%88.apk"> <button type="button" class="btn btn-sdefault" style="width: auto;">极客IP-安卓</button></a>
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index 18b96fe..2d6ac03 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -362,9 +362,9 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
 
             if (request.OrderType == OrderType.AgainBuys)
             {
-                if (request.PackageId >1029 && request.PackageId <1034) {
-                    return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "不允许续费此套餐");
-                }
+                // if (request.PackageId >1029 && request.PackageId <1034) {
+                //     return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "不允许续费此套餐");
+                // }
                 int count = request.Account.Split(",").Length;
                 order.AccountCount = count;
                 order.OrderAmount = price * request.ConnectCount * count;