From b342c64fdb47582f1a6d4b36c022799a190e8c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Wed, 17 Jan 2024 14:21:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BA=92=E9=BA=9F=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Controllers/ProductController.cs         |  63 ++-
 Host/Views.Mobile/Product/Index.cshtml        |  88 ++++
 Host/Views.Mobile/Product/Test.cshtml         |   5 +
 Host/Views.Mobile/Product/buy.cshtml          |  10 +-
 Host/Views/Product/Index.cshtml               |  98 +++-
 Host/Views/Product/Test.cshtml                |   4 +
 Host/Views/Product/buy.cshtml                 |  14 +-
 Host/Views/User/HttpPackageList.cshtml        |  31 +-
 Host/Views/User/MyAccounts.cshtml             |   5 +-
 .../Service/AgentClient4Service.cs            | 430 ++++++++----------
 10 files changed, 494 insertions(+), 254 deletions(-)

diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs
index d35eee1..4024e92 100644
--- a/Host/Controllers/ProductController.cs
+++ b/Host/Controllers/ProductController.cs
@@ -739,7 +739,7 @@ namespace Home.Controllers
         {
             var product = new ProductEntity();
             var package = new ProductPackageEntity();
-            if (id==1034||id==1040||id==89||id==1094||id==1103||id==1097||id==60||id==1114){
+            if (id==1034||id==1040||id==89||id==1094||id==1103||id==1097||id==60||id==1114||id==1115||id==1121||id==1127||id==1133){
                 package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync();
                 product = await m_ProductService.GetById(package.ProductId);
             } else {
@@ -927,6 +927,41 @@ namespace Home.Controllers
                     return View(model);
                 }
             }
+            //0 无状态 1：1m 5m 3：10m 4：20m
+            var pro_type_flag_qilindongtai = 0;
+            var pro_type_temp_qilindongtai = 0;
+            if (productId == 27) {
+
+                accountList.ForEach(m => {
+                    
+                    
+                    if (m.PackageId<1121) {
+                        pro_type_flag_qilindongtai = 1;
+                    }
+                    if (m.PackageId>1121&&m.PackageId<1127) {
+                        pro_type_flag_qilindongtai = 2;
+                    }
+                    if (m.PackageId>1127&&m.PackageId<1133) {
+                        pro_type_flag_qilindongtai = 3;
+                    }
+                    if (m.PackageId>1133&&m.PackageId<1139) {
+                        pro_type_flag_qilindongtai = 4;
+                    }
+                    
+                    
+                    if (pro_type_temp_qilindongtai==0){
+                        pro_type_temp_qilindongtai = pro_type_flag_qilindongtai;
+                    }
+                    if (pro_type_temp_qilindongtai!=pro_type_flag_qilindongtai){
+                        ViewBag.errorTip = "麒麟不同类型不能同时续费";
+                    }
+
+                });
+                
+                if (ViewBag.errorTip == "麒麟不同类型不能同时续费"){
+                    return View(model);
+                }
+            }
 
             //0 无状态 1：尊享 2：高级 3：普通
             var pro_type_flag_xianfeng = 0;
@@ -1035,6 +1070,19 @@ namespace Home.Controllers
                                 if (pro_type_temp_liebao ==3 && m.Id>1103&&m.Id<1109) {
                                     package_temp.Add(m);
                                 }
+                            }else if(m.ProductId == 27){
+                                if (pro_type_temp_qilindongtai ==1 && m.Id<1121) {
+                                    package_temp.Add(m);
+                                }
+                                if (pro_type_temp_qilindongtai ==2 && m.Id>1121&&m.Id<1127) {
+                                    package_temp.Add(m);
+                                }
+                                if (pro_type_temp_qilindongtai ==3 && m.Id>1127&&m.Id<1133) {
+                                    package_temp.Add(m);
+                                }
+                                if (pro_type_temp_qilindongtai ==4 && m.Id>1133&&m.Id<1139) {
+                                    package_temp.Add(m);
+                                }
                             }else if(m.ProductId == 6){
                                 if (pro_type_temp_xianfeng ==1 && m.Id<61) {
                                     package_temp.Add(m);
@@ -1094,6 +1142,19 @@ namespace Home.Controllers
                             if (pro_type_temp_liebao ==3 && m.Id>1103&&m.Id<1109) {
                                 package_temp.Add(m);
                             }
+                        }else if(m.ProductId == 27){
+                            if (pro_type_temp_qilindongtai ==1 && m.Id<1121) {
+                                package_temp.Add(m);
+                            }
+                            if (pro_type_temp_qilindongtai ==2 && m.Id>1121&&m.Id<1127) {
+                                package_temp.Add(m);
+                            }
+                            if (pro_type_temp_qilindongtai ==3 && m.Id>1127&&m.Id<1133) {
+                                package_temp.Add(m);
+                            }
+                            if (pro_type_temp_qilindongtai ==4 && m.Id>1133&&m.Id<1139) {
+                                package_temp.Add(m);
+                            }
                         }else if(m.ProductId == 6){
                             if (pro_type_temp_xianfeng ==1 && m.Id<61) {
                                 package_temp.Add(m);
diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml
index edf1589..26ad25a 100644
--- a/Host/Views.Mobile/Product/Index.cshtml
+++ b/Host/Views.Mobile/Product/Index.cshtml
@@ -175,6 +175,10 @@
                     <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
                         <a href="#@item.Product.Id" id="p26" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">新</span></a>
                     </li>
+                }else if(item.Product.Id == 27) {
+                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
+                        <a href="#@item.Product.Id" id="p27" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">新</span></a>
+                    </li>
                 }else if(item.Product.Id == 6) {
                     <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
                         <a href="#@item.Product.Id" id="p6" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">新</span></a>
@@ -239,6 +243,14 @@
                     <button type="button" onclick="lbputong()" class="btn btn-default btn-lg lbpt" style="background-color: white;font-size:1.3em;margin-top:10px;">普通版-限速2M</button>
                 </div>
                 }
+                @if (item.Product.Id == 27){
+                <div class="p_type @("type"+item.Product.Id)" style="padding-top: 10px;">
+                    <button type="button" onclick="qldt1()" class="btn btn-default btn-lg qldt1" style="background-color: #FF9900;font-size:1.3em;float:left;margin:5px;">1M</button>
+                    <button type="button" onclick="qldt5()" class="btn btn-default btn-lg qldt5" style="background-color: white;font-size:1.3em;float:left;margin:5px;">5M</button><br>
+                    <button type="button" onclick="qldt10()" class="btn btn-default btn-lg qldt10" style="background-color: white;font-size:1.3em;float:left;margin:5px;">10M</button><br>
+                    <button type="button" onclick="qldt20()" class="btn btn-default btn-lg qldt20" style="background-color: white;font-size:1.3em;float:left;margin:5px;">20M</button>
+                </div>
+                }
                 @if (item.Product.Id == 6){
                 <div class="p_type @("type"+item.Product.Id)" style="padding-top: 10px;">
                     <button type="button" onclick="xfgaoji()" class="btn btn-default btn-lg xfgj" style="background-color: #FF9900;font-size:1.3em;">高级-6M</button>
@@ -359,6 +371,7 @@
         $(".type14").show();
         $(".type26").hide();
         $(".type6").hide();
+        $(".type27").hide();
         $("#package-89").show();
         $("#package-69").show();
         $("#package-70").show();
@@ -377,6 +390,7 @@
         $(".type14").hide();
         $(".type26").show();
         $(".type6").hide();
+        $(".type27").hide();
         
         for (var i=1090;i<1097;i++){
             $("#package-"+i).show();
@@ -388,10 +402,28 @@
         $(".lbgj").css('background-color','white');
         $(".lbpt").css('background-color','white');
     });
+    $("#p27").click(function () {
+        $(".type14").hide();
+        $(".type26").hide();
+        $(".type27").show();
+        $(".type6").hide();
+        
+       for (var i=1115;i<1121;i++){
+            $("#package-"+i).show();
+        }
+        for (var i=1121;i<1139;i++){
+            $("#package-"+i).hide();
+        }
+        $(".qldt1").css('background-color','#FF9900');
+        $(".qldt5").css('background-color','white');
+        $(".qldt10").css('background-color','white');
+        $(".qldt20").css('background-color','white');
+    });
     $("#p6").click(function () {
         $(".type14").hide();
         $(".type26").hide();
         $(".type6").show();
+        $(".type27").hide();
         
         $("#package-60").show();
         for (var i=22;i<27;i++){
@@ -494,6 +526,62 @@
             $("#package-"+i).hide();
         }
     }
+    
+    function qldt1() {
+        $(".qldt1").css('background-color','#FF9900');
+        $(".qldt5").css('background-color','white');
+        $(".qldt10").css('background-color','white');
+        $(".qldt20").css('background-color','white');
+        for (var i=1115;i<1121;i++){
+            $("#package-"+i).show();
+        }
+        for (var i=1121;i<1139;i++){
+            $("#package-"+i).hide();
+        }
+    }
+    
+    function qldt5() {
+        $(".qldt1").css('background-color','white');
+        $(".qldt5").css('background-color','#FF9900');
+        $(".qldt10").css('background-color','white');
+        $(".qldt20").css('background-color','white');
+        for (var i=1115;i<1121;i++){
+            $("#package-"+i).hide();
+        }
+        for (var i=1121;i<1127;i++){
+            $("#package-"+i).show();
+        }
+        for (var i=1127;i<1139;i++){
+            $("#package-"+i).hide();
+        }
+    }
+    function qldt10() {
+        $(".qldt1").css('background-color','white');
+        $(".qldt5").css('background-color','white');
+        $(".qldt10").css('background-color','#FF9900');
+        $(".qldt20").css('background-color','white');
+        for (var i=1115;i<1127;i++){
+            $("#package-"+i).hide();
+        }
+        for (var i=1127;i<1133;i++){
+            $("#package-"+i).show();
+        }
+        for (var i=1133;i<1139;i++){
+            $("#package-"+i).hide();
+        }
+    }
+    function qldt20() {
+        $(".qldt1").css('background-color','white');
+        $(".qldt5").css('background-color','white');
+        $(".qldt10").css('background-color','white');
+        $(".qldt20").css('background-color','#FF9900');
+        for (var i=1115;i<1133;i++){
+            $("#package-"+i).hide();
+        }
+        for (var i=1133;i<1139;i++){
+            $("#package-"+i).show();
+        }
+    }
     function xfgaoji() {
         $(".xfgj").css('background-color','#FF9900');
         $(".xfdx").css('background-color','white');
diff --git a/Host/Views.Mobile/Product/Test.cshtml b/Host/Views.Mobile/Product/Test.cshtml
index b165524..eebdb37 100644
--- a/Host/Views.Mobile/Product/Test.cshtml
+++ b/Host/Views.Mobile/Product/Test.cshtml
@@ -16,6 +16,11 @@
     {
         randomAccount = ValidateCodeHelper.MakeCharCode(2).ToLower() + ValidateCodeHelper.MakeNumCode(4).ToLower();
     }
+    
+    var product_id = Model.Product.Id;
+    if (product_id == 27) {
+        randomPwd = ValidateCodeHelper.MakeNumCode(6).ToLower();
+    }
 }
 <vc:redirecct-login></vc:redirecct-login>
 
diff --git a/Host/Views.Mobile/Product/buy.cshtml b/Host/Views.Mobile/Product/buy.cshtml
index 91f2cb7..78296fd 100644
--- a/Host/Views.Mobile/Product/buy.cshtml
+++ b/Host/Views.Mobile/Product/buy.cshtml
@@ -25,10 +25,12 @@
 
     var randomAccountMutil = ValidateCodeHelper.MakeCharCode(3).ToLower();
 
-    @* while (m_AccountService.Exist(m => m.Account.StartsWith(randomAccountMutil)))
-    {
-        randomAccountMutil = ValidateCodeHelper.MakeCharCode(3).ToLower();
-    } *@
+    var product_id = Model.Product.Id;
+    if (product_id == 20 ||product_id == 21||product_id == 27) {
+        randomAccount1 = ValidateCodeHelper.MakeCharCode(2).ToLower() + ValidateCodeHelper.MakeNumCode(5).ToLower();
+        randomAccountMutil = ValidateCodeHelper.MakeCharCode(6).ToLower();
+        randomPwd = ValidateCodeHelper.MakeNumCode(6).ToLower();
+    }
 }
 <script src="~/js/vue.js"></script>
 <script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index f71fef6..78015be 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -265,6 +265,12 @@
                         
                     </div>
                 }
+                else if(item.Product.Id == 27) {
+                    <div class="dropdown">
+                        <div style="font-size: 18px;" class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">新 </span>@item.Product.Name</div>
+                        
+                    </div>
+                }
                 else if(item.Product.Id == 6) {
                     <div class="dropdown">
                         <div style="font-size: 18px;" class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">新 </span>@item.Product.Name</div>
@@ -398,6 +404,24 @@
                             </ul>
                         </div>
                     }
+                    @if(item.Product.Id == 27) { //不限速
+                        <div style="padding:10px 10px;">
+                            <ul class="nav nav-tabs nav-justified" style="margin:0 0 0 50px;cursor: pointer;">
+                                <li id="qldt1" style="border:1px solid #ccc" class="active">
+                                    <a onclick="qldt1()" style="color: #009966;width:250px;background:rgba(0,0,0,0)">1M</a>
+                                </li>
+                                <li style="border:1px solid #ccc" id="qldt5">
+                                    <a onclick="qldt5()"  style="color: #009966;width:250px;background:rgba(0,0,0,0)">5M</a>
+                                </li>
+                                <li style="border:1px solid #ccc" id="qldt10">
+                                    <a onclick="qldt10()"  style="color: #009966;width:250px;background:rgba(0,0,0,0)">10M</a>
+                                </li>
+                                <li style="border:1px solid #ccc" id="qldt20">
+                                    <a onclick="qldt20()"  style="color: #009966;width:250px;background:rgba(0,0,0,0)">20M</a>
+                                </li>
+                            </ul>
+                        </div>
+                    }
 
                     
                     @* @if(item.Product.Id == 18){
@@ -483,7 +507,7 @@
                     <div class="card" style="margin-top:30px;">
                         <div style="display: flex;margin: 0 auto;">
 
-                            @if(item.Product.TenantId == 1157 && item.Product.Content=="0" && item.Product.Id != 14&& item.Product.Id != 26&& item.Product.Id != 6){
+                            @if(item.Product.TenantId == 1157 && item.Product.Content=="0" && item.Product.Id != 14&& item.Product.Id != 26&& item.Product.Id != 6&& item.Product.Id != 27){
                                 <div class="item packageitem" a-test="true" id="@("pkgtest"+item.Product.Id)" a-pkg-id="@item.Product.Id">
                                     <p><span class="price">免费</span></p>
                                     <p class="yuanjia" style="color: #FF9900;text-decoration:none;"><span>@restStatus</span></p>
@@ -496,7 +520,7 @@
                                 </div>
                             }
 
-                            @foreach (var package in item.Packages.Where(m => (m.IsTest == 0 && m.Status == 1) || (m.ProductId==14 && m.Status == 1) || (m.ProductId==26 && m.Status == 1)|| (m.ProductId==6 && m.Status == 1) ).OrderBy(m => m.TenantId))
+                            @foreach (var package in item.Packages.Where(m => (m.IsTest == 0 && m.Status == 1) || (m.ProductId==14 && m.Status == 1) || (m.ProductId==26 && m.Status == 1)|| (m.ProductId==6 && m.Status == 1)|| (m.ProductId==27 && m.Status == 1) ).OrderBy(m => m.TenantId))
                             {
                                 @if(package.Title != "0"){
                                     <style>
@@ -559,7 +583,7 @@
                                         </div>
                                         <img src="~/img/check.png" class="cardCheck">
                                     </div>
-                                } else if((package.Id == 89||package.Id == 1034||package.Id == 1040||package.Id == 1097||package.Id == 1094||package.Id == 1103||package.Id == 60||package.Id == 1114)&&package.IsTest==1){
+                                } else if((package.Id == 89||package.Id == 1034||package.Id == 1115||package.Id == 1121||package.Id == 1127||package.Id == 1133||package.Id == 1040||package.Id == 1097||package.Id == 1094||package.Id == 1103||package.Id == 60||package.Id == 1114)&&package.IsTest==1){
 
                                     <div class="item packageitem" a-test="true" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
                                         <p><span class="price">@package.Price</span>元</p>
@@ -829,6 +853,62 @@
                 $("#pkg"+i).show();
             }
         }
+        
+        function qldt1() {
+            $("#qldt1").addClass("active");
+            $("#qldt5").removeClass("active");
+            $("#qldt10").removeClass("active");
+            $("#qldt20").removeClass("active");
+            for (var i=1115;i<1121;i++){
+                $("#pkg"+i).show();
+            }
+            for (var i=1121;i<1139;i++){
+                $("#pkg"+i).hide();
+            }
+        }
+        
+        function qldt5() {
+            $("#qldt1").removeClass("active");
+            $("#qldt5").addClass("active");
+            $("#qldt10").removeClass("active");
+            $("#qldt20").removeClass("active");
+            for (var i=1115;i<1121;i++){
+                $("#pkg"+i).hide();
+            }
+            for (var i=1121;i<1127;i++){
+                $("#pkg"+i).show();
+            }
+            for (var i=1127;i<1139;i++){
+                $("#pkg"+i).hide();
+            }
+        }
+        function qldt10() {
+            $("#qldt1").removeClass("active");
+            $("#qldt5").removeClass("active");
+            $("#qldt10").addClass("active");
+            $("#qldt20").removeClass("active");
+            for (var i=1115;i<1127;i++){
+                $("#pkg"+i).hide();
+            }
+            for (var i=1127;i<1133;i++){
+                $("#pkg"+i).show();
+            }
+            for (var i=1133;i<1139;i++){
+                $("#pkg"+i).hide();
+            }
+        }
+        function qldt20() {
+            $("#qldt1").removeClass("active");
+            $("#qldt5").removeClass("active");
+            $("#qldt10").removeClass("active");
+            $("#qldt20").addClass("active");
+            for (var i=1115;i<1133;i++){
+                $("#pkg"+i).hide();
+            }
+            for (var i=1133;i<1139;i++){
+                $("#pkg"+i).show();
+            }
+        }
 
         //1 安卓、苹果 2 pc
         var wjdxtype = 1;
@@ -1031,6 +1111,16 @@
                 for (var i=1;i<30;i++){
                     $("#p"+i).removeClass("on");
                 }
+            }  else if (pid == 27) {
+                for (var i=1115;i<1121;i++){
+                    $("#pkg"+i).show();
+                }
+                for (var i=1121;i<1139;i++){
+                    $("#pkg"+i).hide();
+                }
+                for (var i=1;i<30;i++){
+                    $("#p"+i).removeClass("on");
+                }
             } else if (pid == 20||pid == 21){
                 if (pid ==20) {
                     $("#wjdxgd").removeClass("active");
@@ -1069,6 +1159,8 @@
                 $("#p26").removeClass("on");
                 $("#p20").removeClass("on");
                 $("#p21").removeClass("on");
+                $("#p6").removeClass("on");
+                $("#p27").removeClass("on");
             }
             select(pid);
         });
diff --git a/Host/Views/Product/Test.cshtml b/Host/Views/Product/Test.cshtml
index 675dde6..29ae236 100644
--- a/Host/Views/Product/Test.cshtml
+++ b/Host/Views/Product/Test.cshtml
@@ -12,6 +12,10 @@
     {
         randomAccount = ValidateCodeHelper.MakeCharCode(2).ToLower() + ValidateCodeHelper.MakeNumCode(4).ToLower();
     }
+    var product_id = Model.Product.Id;
+    if (product_id == 27) {
+        randomPwd = ValidateCodeHelper.MakeNumCode(6).ToLower();
+    }
 }
 <script type="text/javascript">
     let realverify = {
diff --git a/Host/Views/Product/buy.cshtml b/Host/Views/Product/buy.cshtml
index c91a251..2275c1a 100644
--- a/Host/Views/Product/buy.cshtml
+++ b/Host/Views/Product/buy.cshtml
@@ -28,7 +28,7 @@
     var randomAccountMutil = ValidateCodeHelper.MakeCharCode(3).ToLower();
 
     var product_id = Model.Product.Id;
-    if (product_id == 20 ||product_id == 21) {
+    if (product_id == 20 ||product_id == 21||product_id == 27) {
         randomAccount1 = ValidateCodeHelper.MakeCharCode(2).ToLower() + ValidateCodeHelper.MakeNumCode(5).ToLower();
         randomAccountMutil = ValidateCodeHelper.MakeCharCode(6).ToLower();
         randomPwd = ValidateCodeHelper.MakeNumCode(6).ToLower();
@@ -149,7 +149,7 @@
                 </div>
                 <div class="col-lg-4 regDan">
                     <input type="text" name="Account" value="" v-model="OneBuyModel.Account" v-on:blur="checkOneAccount" />
-                    @if (Model.Package.ProductId !=20 && Model.Package.ProductId !=21) {
+                    @if (Model.Package.ProductId !=20 && Model.Package.ProductId !=21 && Model.Package.ProductId !=27) {
                         <p class="jinggao" v-if="!OneChecker.AccountOk">4至10位字母或数字或组合</p>
                     } else {
                         <p class="jinggao" v-if="!OneChecker.AccountOk">7至10位字母或数字或组合</p>
@@ -157,7 +157,7 @@
                 </div>
                 <div class="col-lg-4 text-left warnText">
                     
-                    @if (Model.Package.ProductId !=20 && Model.Package.ProductId !=21) {
+                    @if (Model.Package.ProductId !=20 && Model.Package.ProductId !=21 && Model.Package.ProductId !=27) {
                         <sapn class="grayText">4至10位字母或数字或组合</sapn>
                     } else {
                         <sapn class="grayText">7至10位字母或数字或组合</sapn>
@@ -295,14 +295,14 @@
                 </div>
                 <div class="col-lg-4 regDan">
                     <input type="text" name="Account" value="" v-on:input="changeAccountCount()" v-model="MoreBuyModel.Account" />
-                    @if (Model.Package.ProductId !=20 && Model.Package.ProductId !=21) {
+                    @if (Model.Package.ProductId !=20 && Model.Package.ProductId !=21&& Model.Package.ProductId !=27) {
                         <p class="jinggao" v-if="!OneChecker.AccountOk">3至8位字母或数字或组合</p>
                     } else {
                         <p class="jinggao" v-if="!OneChecker.AccountOk">6至8位字母或数字或组合</p>
                     }
                 </div>
                 <div class="col-lg-4 text-left warnText">
-                    @if (Model.Package.ProductId !=20 && Model.Package.ProductId !=21) {
+                    @if (Model.Package.ProductId !=20 && Model.Package.ProductId !=21&& Model.Package.ProductId !=27) {
                         <sapn class="grayText">3至8位字母或数字或组合</sapn>
                     } else {
                         <sapn class="grayText">6至8位字母或数字或组合</sapn>
@@ -758,7 +758,7 @@
                     } 
                 },
                 checkOneAccount() {
-                    if (productId == 20||productId == 21) {
+                    if (productId == 20||productId == 21||productId == 27) {
                         if (this.OneBuyModel.Account.length > 10 || this.OneBuyModel.Account.length < 7 || !this.hasNumAndChar(this.OneBuyModel.Account)) {
                             alert("此产品账号必须大于6位");
                             this.OneChecker.AccountOk = false;
@@ -784,7 +784,7 @@
                     return true;
                 },
                 checkMoreAccount() {
-                    if (productId == 20||productId == 21) {
+                    if (productId == 20||productId == 21||productId == 27) {
                         if (this.MoreBuyModel.Account.length < 6 || this.MoreBuyModel.Account.length > 8 || !this.hasNumAndChar(this.MoreBuyModel.Account)) {
                             alert("此产品账号必须大于6位");
                             this.MoreChecker.AccountOk = false;
diff --git a/Host/Views/User/HttpPackageList.cshtml b/Host/Views/User/HttpPackageList.cshtml
index cfcf10e..5aea478 100644
--- a/Host/Views/User/HttpPackageList.cshtml
+++ b/Host/Views/User/HttpPackageList.cshtml
@@ -19,7 +19,7 @@
             <a href="#all" v-on:click="get_package_list()" data-toggle="tab">全部套餐</a>
         </li>
         <li><a href="#order" v-on:click="get_order_list()" data-toggle="tab">购买记录</a></li>
-        <li><a href="#getapi"  data-toggle="tab">提取短效</a></li>
+        <li><a href="#getapi" v-on:click="get_ip()"  data-toggle="tab">提取短效</a></li>
     </ul>
     <br>
     <div id="myTabContent" class="tab-content">
@@ -322,7 +322,7 @@
                     <label class="radio-inline">
                         <input v-model="api_link_item.aw" type="radio" name="aw" value="0">不自动
                     </label>
-                    <label class="radio-inline">
+                    <label class="radio-inline" v-on:click="autowhiteip()">
                         <input v-model="api_link_item.aw" type="radio" name="aw" value="1"> 自动
                     </label>
                 </div>
@@ -487,6 +487,7 @@
                 num:1
             },
             regions:[],
+            user_detail:{},
 	    },
         created:function(){
             this.get_package_list();
@@ -513,6 +514,32 @@
                     }
                 });
             },
+            get_ip() {
+                let data = {
+                    cookie:document.cookie,
+                }
+                var that = this; 
+               
+                $.ajax({
+                    type: 'POST',
+                    url: 'http://php-api.juip.com/http/user/get_user_token',
+                    dataType: "json",
+                    contentType: "application/json",
+                    data: JSON.stringify(data),
+                    beforeSend: function(xhr) {
+                        xhr.withCredentials = true;
+                    },
+                    crossDomain: true,
+                    success: function (res) {
+                        that.user_detail.u = res.data.uid
+                        that.user_detail.t = res.data.token
+                    }
+                });
+            },
+            autowhiteip(){
+                this.api_link_item.u = this.user_detail.u
+                this.api_link_item.t = this.user_detail.t
+            },
             get_order_list() {
                 let data = {
                     cookie:document.cookie,
diff --git a/Host/Views/User/MyAccounts.cshtml b/Host/Views/User/MyAccounts.cshtml
index 6a24003..0026f13 100644
--- a/Host/Views/User/MyAccounts.cshtml
+++ b/Host/Views/User/MyAccounts.cshtml
@@ -267,9 +267,10 @@
             <h4 v-if="productId==13">请点击☞<a style="cursor:pointer" v-on:click="checkLine(1)">入口一</a> <a style="cursor:pointer" v-on:click="checkLine(2)">入口二</a></h4>
             <h4><span style="color:#FF6666">{{line_text}}</span>统一服务器地址为：<span style="color:#FF6666">{{address_url}}</span> 换地区时无需在设备上更换服务器，只需在此页面选择需要的地区即可，可实现任意城市组合的混拨。<span style="color: red;">标红</span>为此线路正在维护中，最多可选择20个线路</h4>
             <div style="overflow-y: auto;width:950px;height:530px;">
-                <div class="checkbox">
+            
+                <div class="checkboxs">
                     <label style="width: 25%;"  v-for="(item,index) in assign_add_list">
-                        <input type="checkbox" v-model="assign_list" :value="item.name+'-'+item.id"/><span v-if="item.status ==2">{{item.name}}</span><span v-if="item.status ==1" style="color: red;">{{item.name}}</span>
+                        <input type="checkbox" v-model="assign_list" :value="item.name+'-'+item.id"/><span v-if="item.status ==2">{{item.name}}</span><span v-if="item.status ==1" style="color: red;">123{{item.name}}</span>
                     </label>
                 </div>
             </div>  
diff --git a/Services/Hncore.Pass.Vpn/Service/AgentClient4Service.cs b/Services/Hncore.Pass.Vpn/Service/AgentClient4Service.cs
index 4938c4c..3892178 100644
--- a/Services/Hncore.Pass.Vpn/Service/AgentClient4Service.cs
+++ b/Services/Hncore.Pass.Vpn/Service/AgentClient4Service.cs
@@ -14,6 +14,9 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using System.Security.Cryptography;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 namespace Hncore.Pass.Vpn.Service
 {
     //金桥
@@ -112,35 +115,39 @@ namespace Hncore.Pass.Vpn.Service
         /// <returns></returns>
         public override async Task<ApiResult> NewAccount(string packageKey, string account, string pwd, int connCount = 1, int accountType = 1, int payCount = 1)
         {
-            var client = CreateHttpClient();
-            var map = new Dictionary<string, string>(){
-                {"taocanName",packageKey },
-                {"username",account },
-                {"password",pwd },
-                {"maxonline",connCount.ToString()},
-                {"type",accountType.ToString()}
-            };
-            var title = GetOpTitle("NewAccount", account);
-            LogHelper.Info(title, map.ToJson());
-            try
-            {
-                var resp = await client.PostAsForm(this.SingleAddUrl, map);
-                var content = await resp.Content.ReadAsStringAsync();
-                if (content.Has() && content.IndexOf("{alert(\"成功\")") != -1)
-                {
-                    return new ApiResult(ResultCode.C_SUCCESS);
-                }
-                else
-                {
-                    LogHelper.Error(title, content);
-                    return new ApiResult(ResultCode.C_INVALID_ERROR, "开户失败");
-                }
+            var width = "";
+            var combos = "";
+            if(packageKey.Contains("-")){
+                string[] arrStr = packageKey.Split('-');
+                width = arrStr[0];
+                combos = arrStr[1];
             }
-            catch (Exception ex)
+            Dictionary<string, string> map = new Dictionary<string, string>(){
+                {"width",width },
+                {"combos",combos },              
+                {"account",account },              
+                {"password",pwd },              
+                {"conn_max",connCount.ToString() },              
+                {"t_id","666" },              
+            };
+
+            map = signAct(map);
+            
+            var client = CreateHttpClient();   
+            var resp = await client.PostAsForm("https://www.ip6b.com/openapi/Create_Dynamic", map);
+            var content = await resp.Content.ReadAsStringAsync();
+            JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+            var status = jo["code"].ToString();
+
+            if (status == "200")
+            {
+                return new ApiResult(ResultCode.C_SUCCESS);
+            }
+            else
             {
-                LogHelper.Error(title, ex.Message);
                 return new ApiResult(ResultCode.C_INVALID_ERROR, "开户失败");
             }
+           
         }
 
         /// <summary>
@@ -194,31 +201,32 @@ namespace Hncore.Pass.Vpn.Service
         /// <returns></returns>
         public override async Task<ApiResult> NewReAccount(string packageKey, string account, int connCount, int payCount = 1)
         {
-            var client = CreateHttpClient();
-            var map = new Dictionary<string, string>(){
-                {"taocanName",packageKey },
-                {"username",account },
-                {"iscz","3" },
-            };
-            var title = GetOpTitle("NewReAccount", account);
-            LogHelper.Info(title, map.ToJson());
-            try
-            {
-                var resp = await client.PostAsForm(this.SingleReAddUrl, map);
-                var content = await resp.Content.ReadAsStringAsync();
-                if (content.Has() && content.IndexOf("alert(\"成功\")") != -1)
-                {
-                    return new ApiResult(1);
-                }
-                else
-                {
-                    LogHelper.Error(title, content);
-                    return new ApiResult(ResultCode.C_INVALID_ERROR, "续费失败");
-                }
+            var width = "";
+            var combos = "";
+            if(packageKey.Contains("-")){
+                string[] arrStr = packageKey.Split('-');
+                width = arrStr[0];
+                combos = arrStr[1];
             }
-            catch (Exception ex)
+            Dictionary<string, string> map = new Dictionary<string, string>(){
+                {"combos",combos },              
+                {"account",account },       
+            };
+
+            map = signAct(map);
+            
+            var client = CreateHttpClient();   
+            var resp = await client.PostAsForm("https://www.ip6b.com/openapi/Renew_Dynamic", map);
+            var content = await resp.Content.ReadAsStringAsync();
+            JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+            var status = jo["code"].ToString();
+
+            if (status == "200")
+            {
+                return new ApiResult(1);
+            }
+            else
             {
-                LogHelper.Error(title, ex.Message);
                 return new ApiResult(ResultCode.C_INVALID_ERROR, "续费失败");
             }
         }
@@ -266,86 +274,21 @@ namespace Hncore.Pass.Vpn.Service
         /// <returns></returns>
         public override async Task<ApiResult<OriginAccountModel>> GetAccountInfo(string account,bool isTest=false)
         {
-            var client = CreateHttpClient();           
-            var title = GetOpTitle("GetAccountInfo", account);
-            var info = "";
-            try
-            {
-                var url = this.searchAccountUrl + account;
-                if (isTest)
+            var trData = new OriginAccountModel
                 {
-                    url = this.searchTestAccountUrl + account;
-                }
-                var resp = await client.GetAsync(url);
-                var content = await resp.Content.ReadAsStringAsync();
-
-                var parser = new HtmlParser();
-                var document = await parser.ParseDocumentAsync(content);
-                ////table class="table table-bordered"
-                var trs = document.QuerySelectorAll("table.table tr").ToList();
-                // var trs= table.QuerySelectorAll("tr").ToList();
-                var retData = new List<OriginAccountModel>();
-                if (trs.Count() > 1)
-                {
-                   //var  tr = trs.Skip(1).FirstOrDefault();
-                    foreach(var tr in trs.Skip(1))
-                    {
-                        var tds = tr.QuerySelectorAll("td").ToList();                   
-                        var tdAccount = tds[1].FirstChild.TextContent;
-                        if (tdAccount != account)
-                            continue;
-                        info = string.Join("", tds.Select(m => m.OuterHtml)); 
-                        //<td >会员账号</td><td >类型</td><td >套餐</td><td >注册日期 过期日期</td><td>专线IP  </td><td >连接数</td><td >余额</td><td >激活</td><td >备注</td>
-
-                        var dateText = tds[4].InnerHtml;
-                        var endtext = dateText.Split("<br>")[1].Split('\n');
-                        var trData = new OriginAccountModel
-                        {
-                            Account = account,
-                            Pwd = tds[1].QuerySelector("font").TextContent,
-                            AccountType = tds[2].TextContent,
-                            Package = tds[3].TextContent,
-                            RegistTime = dateText.Split("<br>")[0],
-                            EndTime = endtext[0].Replace("\n", "").Replace("\t", ""),
-                            RestTime = endtext[1].Replace("\n", "").Replace("\t", ""),
-                            ConnectCount = tds[6].TextContent,
-                            Amount = tds[7].TextContent,
-                            IsActive = tds[8].TextContent,
-                            Remark = tds[9].TextContent,
-                        };
-
-                        trData.RealEndTime = DateTime.Parse(trData.EndTime);
-                        if (trData.RestTime.Contains("已过期"))
-                        {
-                            trData.RestTime = "已过期";
-                        }else
-                        {
-                            // "6.14:32"
-                            var timeStr = trData.RestTime.Replace("天", ".").Replace("时", ":").Replace("分", "");
-                            var restTime = TimeSpan.Parse(timeStr);
-                            trData.RealEndTime = DateTime.Now.Add(restTime);
-                        }
-
-                        var href = tr.LastElementChild.QuerySelector("a")?.Attributes["href"]?.Value;
-                        if (href.Has())
-                        {
-                            var start = href.LastIndexOf('/');
-                            var end = href.IndexOf(".html");
-                            if (start != -1 && end != -1)
-                            {
-                                trData.Id = href.Substring(start + 1, end - start).TrimEnd('.');
-                            }
-                        }
-                        return new ApiResult<OriginAccountModel>(trData);
-                    }
-                   
-                }           
-            }
-            catch (Exception ex)
-            {
-                LogHelper.Error(title, ex.Message+"-->info:"+ info);
-                return new ApiResult<OriginAccountModel>(ResultCode.C_INVALID_ERROR, "查询失败");
-            }
+                    Id = "",
+                    Account = account,
+                    Pwd = "",
+                    AccountType = "",
+                    Package = "",
+                    ConnectCount = "",
+                    RegistTime = "",
+                    EndTime = "",
+                    RestTime = "",
+                    Amount = "",
+                    Remark = "",
+                };
+                return new ApiResult<OriginAccountModel>(trData);
 
             return new ApiResult<OriginAccountModel>(ResultCode.C_INVALID_ERROR, "没有查询到信息");
 
@@ -359,41 +302,27 @@ namespace Hncore.Pass.Vpn.Service
         /// <returns></returns>
         public override async Task<bool> UpdateAccountPwd(string account, string pwd)
         {
-            var ret = await this.GetAccountInfo(account);
-            if (ret.Code != ResultCode.C_SUCCESS)
-            {
-                return false;
-            }
-            var accountModel = ret.Data;            
-            if (accountModel == null)
-            {
-                return false;
-            }
-            var client = CreateHttpClient();
-            var map = new Dictionary<string, string>(){
-                   {"username",account },
-                   {"password",pwd },
-                   {"submit","提交" },
+            Dictionary<string, string> map = new Dictionary<string, string>(){
+                {"password",pwd },              
+                {"account",account },       
             };
-            LogHelper.Info(GetOpTitle("UpdateAccountPwd", account), map.ToJson());
-            try
+
+            map = signAct(map);
+            
+            var client = CreateHttpClient();   
+            var resp = await client.PostAsForm("https://www.ip6b.com/openapi/Reset_Password_Dynamic", map);
+            var content = await resp.Content.ReadAsStringAsync();
+            JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+            var status = jo["code"].ToString();
+
+            if (status == "200")
             {
-                var resp = await client.PostAsForm(this.UpdateUrl + accountModel.Id + ".html", map);
-                var content = await resp.Content.ReadAsStringAsync();
-                if (content.Has() && content.IndexOf("更新成功") != -1)
-                {
-                    return true;
-                }
-                else
-                {
-                    LogHelper.Error(GetOpTitle("UpdateAccountPwd", account), content);
-                }
+                return true;
             }
-            catch (Exception ex)
+            else
             {
-                LogHelper.Error(GetOpTitle("UpdateAccountPwd", account), ex);
+                return false;
             }
-            return false;
         }
         /// <summary>
         /// 退款
@@ -403,30 +332,24 @@ namespace Hncore.Pass.Vpn.Service
         /// <returns></returns>
         public override async Task<ApiResult> Refund(string account, string packageKey, int days)
         {
-            var client = CreateHttpClient();
-            var map = new Dictionary<string, string>(){
-                {"refundUser",account },
-                {"refundReason","hl" },              
+            Dictionary<string, string> map = new Dictionary<string, string>(){         
+                {"account",account },       
             };
-            var title = GetOpTitle("Refund", account);
-            LogHelper.Info(title, map.ToJson());
-            try
+
+            map = signAct(map);
+            
+            var client = CreateHttpClient();   
+            var resp = await client.PostAsForm("https://www.ip6b.com/openapi/Refount_Account_Order", map);
+            var content = await resp.Content.ReadAsStringAsync();
+            JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+            var status = jo["code"].ToString();
+
+            if (status == "200")
             {
-                var resp = await client.PostAsForm(this.RefundUrl, map);
-                var content = await resp.Content.ReadAsStringAsync();
-                if (content.Has() && content.IndexOf("alert(\"退款成功\")") != -1)
-                {
-                    return new ApiResult(1);
-                }
-                else
-                {
-                    LogHelper.Error(title, content);
-                    return new ApiResult(ResultCode.C_INVALID_ERROR, "退款失败");
-                }
+                return new ApiResult(1);
             }
-            catch (Exception ex)
+            else
             {
-                LogHelper.Error(title, ex.Message);
                 return new ApiResult(ResultCode.C_INVALID_ERROR, "退款失败");
             }
         }
@@ -438,50 +361,50 @@ namespace Hncore.Pass.Vpn.Service
         /// <returns></returns>
         public override async Task<ApiResult<List<OriginAccountOnlineModel>>> OnLine(string account)
         {
-            //虚拟在线
-            var onlines = await base.OnLine(account);
+            Dictionary<string, string> map = new Dictionary<string, string>(){         
+                {"account",account },       
+                {"page","1" },       
+                {"page_count","100" },       
+            };
 
-            if (onlines.Code == ResultCode.C_SUCCESS && onlines.Data.Count > 0)
-                return onlines;
-            var retData = new List<OriginAccountOnlineModel>();
-            var client = CreateHttpClient();
-            int page = 1;
-            var url = string.Format(this.ClientOnlineUrl, page);
-            var resp = await client.GetAsync(url);
+            map = signAct(map);
+            
+            var client = CreateHttpClient();   
+            var resp = await client.PostAsForm("https://www.ip6b.com/openapi/Get_Dynamic_Online", map);
             var content = await resp.Content.ReadAsStringAsync();
+            JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+            var status = jo["code"].ToString();
 
-            var parser = new HtmlParser();
-            var document = await parser.ParseDocumentAsync(content);
-            var table = document.QuerySelectorAll("table");
-            var pageP = table?.Next("p")?.FirstOrDefault();
-            if (pageP != null)
+
+            var retData = new List<OriginAccountOnlineModel>();
+            
+            if (status == "200")
             {
-                var total = 0;
-                if (pageP.TextContent.Has())
+                foreach (var tr in jo["res"]["data"])
                 {
-                    var start = pageP.TextContent.IndexOf('(');
-                    var end = pageP.TextContent.IndexOf("页)");
-                    var pageStr = pageP.TextContent.Substring(start + 2, end - start - 1);
-                    int.TryParse(pageStr, out total);
-                }
-                if (total > 1)
-                {
-                    await Enumerable.Range(1, total).ForEachAsync(async (int i) =>
+                    JObject jsondata = (JObject)JsonConvert.DeserializeObject(tr.ToJson());
+
+                    var trData = new OriginAccountOnlineModel
                     {
-                        var ret = await ClientOnLine(account, i);
-                        retData.AddRange(ret);
-                    });
-                }
-                else
-                {
-                    retData = await ClientOnLine(account, 1);
+                        Account = account,
+                        ServerIP = "",
+                        LoginTime = "",
+                        OnlineTime = "",
+                        LoginIP = jsondata["user_ip"].ToString(),
+                        UpStream = "",
+                        DownStream = "",
+                        Id= jsondata["id"].ToString(),
+                    
+                    };
+                    
+                    retData.Add(trData);
                 }
+                return new ApiResult<List<OriginAccountOnlineModel>>(retData);
             }
             else
             {
-                retData = await ClientOnLine(account, 1);
+                 return new ApiResult<List<OriginAccountOnlineModel>>(ResultCode.C_INVALID_ERROR, "查询失败");
             }
-            return new ApiResult<List<OriginAccountOnlineModel>>(retData);
         }
 
         public  async Task<List<OriginAccountOnlineModel>> ClientOnLine(string account,int page=1)
@@ -546,25 +469,24 @@ namespace Hncore.Pass.Vpn.Service
         /// <returns></returns>
         public override async Task<bool> KillOut( string id)
         {
-            var flag = await base.KillOut(id);
-            if (flag) return true;
+            Dictionary<string, string> map = new Dictionary<string, string>(){         
+                {"sid",id },       
+            };
 
-            var client = CreateHttpClient();
-            var title = GetOpTitle("KillOut", id);
-            var info = "";
-            try
+            map = signAct(map);
+            
+            var client = CreateHttpClient();   
+            var resp = await client.PostAsForm("https://www.ip6b.com/openapi/Kick_Off_Dynamic_Line", map);
+            var content = await resp.Content.ReadAsStringAsync();
+            JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+            var status = jo["code"].ToString();
+
+
+            var retData = new List<OriginAccountOnlineModel>();
+            
+            if (status == "200")
             {
-                var url = string.Format(this.KillUrlClient, id);
-                var resp = await client.GetAsync(url);
-                var content = await resp.Content.ReadAsStringAsync();
-                if (content.Has() && content.IndexOf("已经向客户端发送断开消息") != -1)
-                {
-                    return true;
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.Error(title, ex.Message + "-->info:" + info);
+                return true;
             }
             return false;          
         }
@@ -576,16 +498,54 @@ namespace Hncore.Pass.Vpn.Service
         /// <returns></returns>
         public override async Task<bool> Exist(string account)
         {
-            var client = CreateHttpClient();           
-            var title = GetOpTitle("Exist", account);
-            LogHelper.Info(title, account);
-            var testRet = await this.NewAccount("free", account, "1234", 1, 0);
-            if (testRet.Code == ResultCode.C_SUCCESS)
-            {
-                await DeleteAccount(account);
+            Dictionary<string, string> map = new Dictionary<string, string>();
+            map.Add("account", account);
+            map = signAct(map);
+            
+            var client = CreateHttpClient();   
+            var resp = await client.PostAsForm("https://www.ip6b.com/openapi/Dynamic_Account_Exists", map);
+            var content = await resp.Content.ReadAsStringAsync();
+            JObject jo = (JObject)JsonConvert.DeserializeObject(content);
+
+
+            if (jo["code"].ToString() == "404") {
                 return false;
-            }              
+            }
             return true;
         }
+
+
+        private static Dictionary<string, string> signAct(Dictionary<string, string> body)
+        {
+            var authStr="";
+            body.Add("st",DateTime.Now.GetUnixTimeStamp().ToString());
+            body.Add("appid","49330ae23dad78f9");
+            body = body.OrderBy(kv => kv.Key).ToDictionary(kv => kv.Key, p => p.Value);
+            
+            
+            foreach (var item in body)
+            {
+                    authStr=authStr+item.Value;
+            }
+
+            body.Add("sign",Md5(Md5(authStr)+"ddb4311a227fb118cacd63cc68416ab5"));
+            return body;
+        }
+        
+        //Md5摘要
+        private static string Md5(string text)
+        {
+            MD5 md5 = new MD5CryptoServiceProvider();
+            byte[] fromData = System.Text.Encoding.UTF8.GetBytes(text);
+            byte[] targetData = md5.ComputeHash(fromData);
+            string byte2String = null;
+
+            for (int i = 0; i < targetData.Length; i++)
+            {
+                byte2String += targetData[i].ToString("x2");
+            }
+
+            return byte2String;
+        }
     }
 }