From e9731d700b65d07464ac130c29cae395c74cd1f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Sun, 16 Jul 2023 16:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E6=9C=9F=E7=9F=AD=E4=BF=A1=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=92=8C=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/Article/Index.cshtml             |  8 ++++++++
 Host/Views.Mobile/User/FindPwd.cshtml              |  2 +-
 Host/Views/Home/Index.cshtml                       | 14 ++++++++------
 Host/Views/Shared/_Layout.cshtml                   | 13 +++++++------
 Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs       |  2 +-
 .../Service/ProductAccountService.cs               |  3 ++-
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/Host/Views.Mobile/Article/Index.cshtml b/Host/Views.Mobile/Article/Index.cshtml
index a7a155d..006fa5c 100644
--- a/Host/Views.Mobile/Article/Index.cshtml
+++ b/Host/Views.Mobile/Article/Index.cshtml
@@ -30,6 +30,14 @@
         <p><a asp-action="info" asp-controller="article" asp-route-id="6"><img src="~/m/img/pc.png"></a></p>
         <p>windows电脑教程</p>
     </div>
+    <div class="item">
+        <p><a asp-action="info" asp-controller="article" asp-route-id="21"><img src="~/img/pc.png"></a></p>
+        <p>MAC电脑教程</p>
+    </div>
+    <div class="item">
+        <p><a asp-action="info" asp-controller="article" asp-route-id="10"><img src="~/img/pc.png"></a></p>
+        <p>软路由教程</p>
+    </div>
 </div>
 
 <div class="newsList">
diff --git a/Host/Views.Mobile/User/FindPwd.cshtml b/Host/Views.Mobile/User/FindPwd.cshtml
index ea84dd7..1cdc61a 100644
--- a/Host/Views.Mobile/User/FindPwd.cshtml
+++ b/Host/Views.Mobile/User/FindPwd.cshtml
@@ -13,7 +13,7 @@
 
         <div class="loginCenter">
             <p><img src="~/m/img/phone.png"><input type="text" name="" id="username" value="" placeholder="手机号" /></p>
-            <p><img src="~/m/img/password.png"><input type="text" name="" id="password" value="" placeholder="密码" /></p>
+            <p><img src="~/m/img/password.png"><input type="text" name="" id="password" value="" placeholder="请输入新密码" /></p>
             <p class="yzm"><img src="~/m/img/yanzhengma.png"><input type="text" name="" id="yanzhengma" value="" placeholder="验证码" /><button type="button" class="btnBlue" onclick="getCode(this)">获取验证码</button></p>
         </div>
         <p><button type="button" class="btnLogin" onclick="reg()">找回密码</button></p>
diff --git a/Host/Views/Home/Index.cshtml b/Host/Views/Home/Index.cshtml
index 56711e9..cf586e6 100644
--- a/Host/Views/Home/Index.cshtml
+++ b/Host/Views/Home/Index.cshtml
@@ -88,6 +88,7 @@
             $(".regClose").click(function () {
                 $(".main_reg").addClass("animated bounceOutDown");
                 $(".mask").hide();
+                $(".main_find").hide();
                 setTimeout(function () {
                     $(".main_reg").removeClass("animated bounceOutDown");
                     $(".main_reg").hide();
@@ -240,25 +241,25 @@
             <img src="~/img/award.png">
         </div>
         <div class="user">
-            <img src="~/img/phone.png"><input type="text" name="" id="username" value="" placeholder="请输入手机号码" />
+            <img src="~/img/phone.png"><span style="color: red;">*</span><input type="text" name="" id="username" value="" placeholder="请输入手机号码" />
         </div>
         <div class="pwd">
-            <img src="~/img/password.png"><input type="password" name="" id="password" value="" placeholder="请输入密码" />
+            <img src="~/img/password.png"><span style="color: red;">*</span><input type="password" name="" id="password" value="" placeholder="请输入密码" />
         </div>
         <div class="yzm">
-            <img src="~/img/yanzhengma.png"><input type="text" name="" id="yanzhengma" value="" placeholder="请输入验证码" /><button class="btn btn-primary" onclick="getCode(this)">获取验证码</button>
+            <img src="~/img/yanzhengma.png"><span style="color: red;">*</span><input type="text" name="" id="yanzhengma" value="" placeholder="请输入验证码" /><button class="btn btn-primary" onclick="getCode(this)">获取验证码</button>
         </div>
         <div class="user">
-            <img src="~/img/phone.png"><input type="text" name="" id="wxhao" value="" placeholder="请输入微信号" />
+            <img src="~/img/phone.png"><input type="text" name="" id="wxhao" value="" placeholder="请输入微信号(选填)" />
         </div>
         <div class="user">
-            <img src="~/img/phone.png"><input type="text" name="" id="qqhao" value="" placeholder="请输入QQ" />
+            <img src="~/img/phone.png"><input type="text" name="" id="qqhao" value="" placeholder="请输入QQ(选填)" />
         </div>
 
         <p class="tixing">*手机号不是IP账号，请登录后开通IP账号*</p>
         <p class="tixing"><input type="checkbox" name="" id="xieyi" value="" />我同意<a href="/LineList/xieyi" target="_blank">《聚IP JUIP.COM用户注册协议》</a></p>
         <p class="denglu"><button type="button" class="btn btn-login" onclick="reg()">注册</button></p>
-        <p class="zhiyin grayText">已有账号？<a href="#" class="loginLink">立即登录</a></p>
+        <p class="zhiyin grayText">已有账号？<a href="/User/WebLogin" class="loginLink">立即登录</a></p>
     </div>
     <!-- login -->
     <div class="mask"></div>
@@ -820,6 +821,7 @@
                     console.log(res);
                     if (res.Code == 10000) {
                         alert("重置成功,请登录");
+                        window.location.href = "/User/WebLogin";
                     } else {
                         alert(res.Message)
                     }
diff --git a/Host/Views/Shared/_Layout.cshtml b/Host/Views/Shared/_Layout.cshtml
index 540ceff..6cef212 100644
--- a/Host/Views/Shared/_Layout.cshtml
+++ b/Host/Views/Shared/_Layout.cshtml
@@ -317,25 +317,25 @@
             <img src="~/img/award.png">
         </div>
         <div class="user">
-            <img src="~/img/phone.png"><input type="text" id="username" value="" placeholder="请输入手机号码" />
+            <img src="~/img/phone.png"><span style="color: red;">*</span><input type="text" id="username" value="" placeholder="请输入手机号码" />
         </div>
         <div class="pwd">
-            <img src="~/img/password.png"><input type="password" id="password" value="" placeholder="请输入密码" />
+            <img src="~/img/password.png"><span style="color: red;">*</span><input type="password" id="password" value="" placeholder="请输入密码" />
         </div>
         <div class="yzm">
-            <img src="~/img/yanzhengma.png"><input type="text" id="yanzhengma" value="" placeholder="请输入验证码" /><button class="btn btn-primary" onclick="getCode(this)">获取验证码</button>
+            <img src="~/img/yanzhengma.png"><span style="color: red;">*</span><input type="text" id="yanzhengma" value="" placeholder="请输入验证码" /><button class="btn btn-primary" onclick="getCode(this)">获取验证码</button>
         </div>
         <div class="user">
-            <img src="~/img/phone.png"><input type="text" name="" id="wxhao" value="" placeholder="请输入微信号" />
+            <img src="~/img/phone.png"><input type="text" name="" id="wxhao" value="" placeholder="请输入微信号(选填)" />
         </div>
         <div class="user">
-            <img src="~/img/phone.png"><input type="text" name="" id="qqhao" value="" placeholder="请输入QQ" />
+            <img src="~/img/phone.png"><input type="text" name="" id="qqhao" value="" placeholder="请输入QQ(选填)" />
         </div>
 
         <p class="tixing">*手机号不是IP账号，请登录后开通IP账号*</p>
         <p class="tixing"><input type="checkbox" name="" id="xieyi" value="" />我同意<a href="/LineList/xieyi" target="_blank">《聚IP JUIP.COM用户注册协议》</a></p>
         <p class="denglu"><button type="button" class="btn btn-reg">注册</button></p>
-        <p class="zhiyin grayText">已有账号？<a href="#" class="loginLink">立即登录</a></p>
+        <p class="zhiyin grayText">已有账号？<a href="/User/WebLogin" class="loginLink">立即登录</a></p>
     </div>
     <!-- login -->
     <div class="mask"></div>
@@ -503,6 +503,7 @@
                     console.log(res);
                     if (res.Code == 10000) {
                         alert("重置成功,请登录");
+                        window.location.href = "/User/WebLogin";
                     } else {
                         alert(res.Message)
                     }
diff --git a/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs b/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs
index 8d5dd7a..81cf80b 100644
--- a/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs
+++ b/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs
@@ -110,7 +110,7 @@ namespace Hncore.Pass.Vpn.Job
                     } else if(tip=="还有一天过期"){
                         ret = AliSmsService.Send("SMS_199222107", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone);
                     } else {
-                        ret = AliSmsService.Send("SMS_202820825", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone);
+                        ret = AliSmsService.Send("SMS_462015488", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone);
                     }
                     // var ret = AliSmsService.Send("SMS_193505090", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone);
                 }
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs
index cf3e1d4..ed494eb 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs
@@ -124,7 +124,8 @@ namespace Hncore.Pass.Vpn.Service
         //主要是用来定时执行的
         public async Task<List<ProductAccountEntity>> GetExpireingAccountsTime(int day)
         {
-            var sql = $"select * from product_account where DATEDIFF(EndTime,now())={day} AND PackageName!='测试卡' AND PackageName!='天卡' GROUP BY UserId";
+            var sql = $"select * from product_account WHERE DATEDIFF(EndTime,now())=1 AND `PackageName` NOT LIKE '天卡' AND `PackageName` NOT LIKE '测试卡' GROUP BY UserId";
+            // var sql = $"select * from product_account where DATEDIFF(EndTime,now())={day} AND PackageName!='测试卡' AND PackageName!='天卡' GROUP BY UserId";
             return this.m_DbContext.SqlQuery<ProductAccountEntity>(sql);
         }