From 8683c4747c8643791f6e01118d7020aab8983f9a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 15 八月 2022 19:04:07 +0800
Subject: [PATCH] app登录接口
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/Tools/LogHelper.cs | 10 ++
VueWebApi/bin/VueWebApi.dll.config | 2
VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config | 2
VueWebApi/Logs/2022-08-15.TXT | 9 ++
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 1
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 10 +-
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Tools/SeachEncode.cs | 4
VueWebApi/Web.config | 2
VueWebApi/obj/Release/TransformWebConfig/original/Web.config | 2
VueWebApi/bin/VueWebApi.xml | 26 +++++
VueWebApi/DLL/DAL/LoginDAL.cs | 42 ++++++++++
/dev/null | 0
VueWebApi/Tools/ChannelActionFilterAttribute.cs | 2
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/DLL/BLL/LoginBLL.cs | 9 ++
VueWebApi/obj/Release/Package/PackageTmp/Web.config | 2
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 26 +++++
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/Controllers/LoginController.cs | 83 ++++++++++++++++++--
21 files changed, 202 insertions(+), 30 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index b5b25a2..af85de7 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/LoginController.cs b/VueWebApi/Controllers/LoginController.cs
index 08efa30..5006a59 100644
--- a/VueWebApi/Controllers/LoginController.cs
+++ b/VueWebApi/Controllers/LoginController.cs
@@ -21,9 +21,9 @@
ToMessage mes = new ToMessage();
RedisHelper redis = new RedisHelper();
- #region[鐢ㄦ埛鐧诲綍]
+ #region[PC鐢ㄦ埛鐧诲綍]
/// <summary>
- /// 鐢ㄦ埛鐧诲綍
+ /// PC鐢ㄦ埛鐧诲綍
/// </summary>
/// <param name="username">鐢ㄦ埛缂栫爜</param>
/// <param name="password">瀵嗙爜</param>
@@ -31,7 +31,7 @@
/// <returns></returns>
[Route(template: "LoginSave")]
[HttpGet]
- public HttpResponseMessage LoginSave(string username, string password,string usertype)
+ public HttpResponseMessage LoginSave(string username, string password, string usertype)
{
try
{
@@ -70,7 +70,7 @@
//鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
User r_loginUser = redis.Get<User>("LoginUserID" + ms.usertype + ms.userid, 0);
//濡傛灉session涓殑鐢ㄦ埛usercode鍜宺edis涓殑鐢ㄦ埛usercode鍖归厤
- if (r_loginUser.usercode.Equals(loginUser.usercode))
+ if ((r_loginUser.usercode + r_loginUser.usertype).Equals(loginUser.usercode + loginUser.usertype))
{
mes.data = ms;
mes.code = "302";
@@ -149,14 +149,15 @@
/// 鏌ヨ鐧诲綍鑿滃崟
/// </summary>
/// <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
+ /// <param name="usercode">鐧诲綍鐢ㄦ埛缂栫爜</param>
/// <returns></returns>
[Route(template: "LoginMenu")]
[HttpGet]
- public HttpResponseMessage LoginMenu(string usertype)
+ public HttpResponseMessage LoginMenu(string usertype, string usercode)
{
try
{
- var usercode = HttpContext.Current.Request.Cookies["navTabId"].Value.ToString();
+ //var usercode = HttpContext.Current.Request.Cookies["navTabId"].Value.ToString();
mes = LoginBLL.LoginMenu(usercode, usertype);
}
catch (Exception e)
@@ -186,9 +187,9 @@
}
#endregion
- #region[鐧诲嚭]
+ #region[PC鐧诲嚭]
/// <summary>
- /// 鐧诲嚭
+ /// PC鐧诲嚭
/// </summary>
/// <param name="userid">鐢ㄦ埛id</param>
/// <param name="usercode">鐢ㄦ埛缂栫爜</param>
@@ -204,5 +205,71 @@
return mes.ResponseMess(mes);
}
#endregion
+
+
+ #region[APP鐢ㄦ埛鐧诲綍]
+ /// <summary>
+ /// APP鐢ㄦ埛鐧诲綍
+ /// </summary>
+ /// <param name="username">鐢ㄦ埛缂栫爜</param>
+ /// <param name="password">瀵嗙爜</param>
+ /// <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
+ /// <returns></returns>
+ [Route(template: "LoginAppSave")]
+ [HttpGet]
+ public HttpResponseMessage LoginAppSave(string username, string password, string usertype)
+ {
+ try
+ {
+ DataTable dt = LoginBLL.LoginSearch(username, password);
+ if (dt.Rows.Count > 0)
+ {
+ List<User> mss = new List<User>();
+ User ms = new User();
+ ms.guid = username + password + Guid.NewGuid().ToString();
+ ms.userid = Convert.ToInt32(dt.Rows[0]["ID"].ToString());
+ ms.usercode = dt.Rows[0]["USERCODE"].ToString();
+ ms.username = dt.Rows[0]["USERNAME"].ToString();
+ ms.password = dt.Rows[0]["PASSWORD"].ToString();
+ ms.usertype = usertype;
+ mss.Add(ms);
+
+ mes.code = "200";
+ mes.Message = "鐧诲綍鎴愬姛!";
+ mes.data = ms;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "璐﹀彿鎴栧瘑鐮佷笉姝ｇ‘!";
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.Message = e.Message;
+ }
+
+ return mes.ResponseMess(mes);
+ }
+ #endregion
+
+ #region[APP鐧诲嚭]
+ /// <summary>
+ /// APP鐧诲嚭
+ /// </summary>
+ /// <param name="userid">鐢ㄦ埛id</param>
+ /// <param name="usercode">鐢ㄦ埛缂栫爜</param>
+ /// <param name="username">鐢ㄦ埛鍚�</param>
+ /// <param name="usertype">鎿嶄綔绔疨C/APP</param>
+ /// <returns></returns>
+ [Route(template: "LoginAppOut")]
+ [HttpPost]
+ public HttpResponseMessage LoginAppOut(int userid, string usercode, string username, string usertype)
+ {
+ mes = LoginBLL.LoginAppOut(userid, usercode, username, usertype);
+ return mes.ResponseMess(mes);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/BLL/LoginBLL.cs b/VueWebApi/DLL/BLL/LoginBLL.cs
index 73a9574..feb9c8d 100644
--- a/VueWebApi/DLL/BLL/LoginBLL.cs
+++ b/VueWebApi/DLL/BLL/LoginBLL.cs
@@ -39,11 +39,18 @@
}
#endregion
- #region[鐧诲嚭]
+ #region[PC鐧诲嚭]
public static ToMessage LoginOut(int userid,string usercode, string username,string usertype)
{
return LoginDAL.LoginOut(userid,usercode, username, usertype);
}
#endregion
+
+ #region[App鐧诲嚭]
+ public static ToMessage LoginAppOut(int userid, string usercode, string username, string usertype)
+ {
+ return LoginDAL.LoginAppOut(userid, usercode, username, usertype);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/LoginDAL.cs b/VueWebApi/DLL/DAL/LoginDAL.cs
index c363236..5a91a31 100644
--- a/VueWebApi/DLL/DAL/LoginDAL.cs
+++ b/VueWebApi/DLL/DAL/LoginDAL.cs
@@ -223,7 +223,7 @@
}
#endregion
- #region[鐧诲嚭]
+ #region[PC鐧诲嚭]
public static ToMessage LoginOut(int userid, string usercode, string username, string usertype)
{
var sql = "";
@@ -263,5 +263,45 @@
return mes;
}
#endregion
+
+ #region[App鐧诲嚭]
+ public static ToMessage LoginAppOut(int userid, string usercode, string username, string usertype)
+ {
+ var sql = "";
+ var cont = 0;
+ var dynamicParams = new DynamicParameters();
+ RedisHelper redis = new RedisHelper();
+ try
+ {
+ sql = @"update T_Bas_Login set outdate=@outdate,status='N' where usercode=@usercode and origin=@usertype";
+ dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@outdate", DateTime.Now.ToString());
+ dynamicParams.Add("@usertype", usertype);
+ cont = DapperHelper.SQL(sql, dynamicParams);
+ if (cont > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鐧诲嚭鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鐧诲嚭澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/Logs/2022-08-15.TXT b/VueWebApi/Logs/2022-08-15.TXT
new file mode 100644
index 0000000..e94613c
--- /dev/null
+++ b/VueWebApi/Logs/2022-08-15.TXT
@@ -0,0 +1,9 @@
+ 【时间】:2022-08-15 17:05:46,191
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 10
+ 【文件地址】:D:\新凯迪MES\VueWebApi\VueWebApi\Tools\LogHelper.cs 第36行
+ 【日志内容】:"guid":"002123456e1c54164-5e7e-4682-bd36-e471eb826978","userid":33,"usercode":"002","username":"楼李俊","password":"123456","usertype":"APP"
+时间：2022-08-15 17:05:42
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index 01bae9c..fab97af 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\XKDMesApi</_PublishTargetUrl>
- <History>True|2022-08-12T09:15:09.2133281Z;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
+ <History>True|2022-08-15T09:58:16.1460123Z;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@@ -696,16 +696,16 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>08/12/2022 17:15:04</publishTime>
+ <publishTime>08/15/2022 17:58:07</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>08/12/2022 17:15:04</publishTime>
+ <publishTime>08/15/2022 17:58:07</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>08/12/2022 17:15:03</publishTime>
+ <publishTime>08/15/2022 17:58:07</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -1362,7 +1362,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/12/2022 17:15:08</publishTime>
+ <publishTime>08/15/2022 17:58:15</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/ChannelActionFilterAttribute.cs b/VueWebApi/Tools/ChannelActionFilterAttribute.cs
index a18f137..2ab8df9 100644
--- a/VueWebApi/Tools/ChannelActionFilterAttribute.cs
+++ b/VueWebApi/Tools/ChannelActionFilterAttribute.cs
@@ -29,7 +29,7 @@
try
{
var User = HttpContext.Current.Session["User"].ToString();
- User loginUser = JsonConvert.DeserializeObject<User>(User);
+ User loginUser = JsonConvert.DeserializeObject<User>(User);
base.OnActionExecuting(actionContext);
//濡傛灉瀛樺湪
if (redis.Get<User>("LoginUserID"+loginUser.usertype + loginUser.userid, 0).userid.ToString() != "")
diff --git a/VueWebApi/Tools/LogHelper.cs b/VueWebApi/Tools/LogHelper.cs
index 925f85d..13e47ea 100644
--- a/VueWebApi/Tools/LogHelper.cs
+++ b/VueWebApi/Tools/LogHelper.cs
@@ -36,5 +36,15 @@
log.Error(message);
}
#endregion
+
+ #region
+ public static void WriteLogData1(string aa)
+ {
+ var request = HttpContext.Current.Request;
+ string message = aa;
+ log4net.ILog log = log4net.LogManager.GetLogger("鏃ュ織璁板綍");
+ log.Error(message);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/Tools/SeachEncode.cs b/VueWebApi/Tools/SeachEncode.cs
index c265a5d..5172914 100644
--- a/VueWebApi/Tools/SeachEncode.cs
+++ b/VueWebApi/Tools/SeachEncode.cs
@@ -453,14 +453,14 @@
cmt.code = "APP";
cmt.name = "APP";
cmt.flag = "Y";
- cmt.is_delete = "1";
+ cmt.is_delete = "0";
}
else
{
cmt.code = "APP";
cmt.name = "APP";
cmt.flag = "N";
- cmt.is_delete = "1";
+ cmt.is_delete = "0";
}
cmt.children = new List<TreeDMOne>();
//绗簩灞�
diff --git a/VueWebApi/Web.config b/VueWebApi/Web.config
index ff7ce4e..bc0b1a5 100644
--- a/VueWebApi/Web.config
+++ b/VueWebApi/Web.config
@@ -21,7 +21,7 @@
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
<add key="RedisConnPort" value="6379" />
<!--key澶辨晥鏃堕棿30绉�-->
- <add key="RedisKeyTimeCont" value="30" />
+ <add key="RedisKeyTimeCont" value="120" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
diff --git a/VueWebApi/bin/VueWebApi.dll.config b/VueWebApi/bin/VueWebApi.dll.config
index ff7ce4e..bc0b1a5 100644
--- a/VueWebApi/bin/VueWebApi.dll.config
+++ b/VueWebApi/bin/VueWebApi.dll.config
@@ -21,7 +21,7 @@
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
<add key="RedisConnPort" value="6379" />
<!--key澶辨晥鏃堕棿30绉�-->
- <add key="RedisKeyTimeCont" value="30" />
+ <add key="RedisKeyTimeCont" value="120" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 04466f6..b4e9755 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index f1978ba..4ba0240 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -1046,7 +1046,7 @@
</member>
<member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)">
<summary>
- 鐢ㄦ埛鐧诲綍
+ PC鐢ㄦ埛鐧诲綍
</summary>
<param name="username">鐢ㄦ埛缂栫爜</param>
<param name="password">瀵嗙爜</param>
@@ -1063,11 +1063,12 @@
<param name="usertype">鎿嶄綔绔疨C/APP</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.LoginController.LoginMenu(System.String)">
+ <member name="M:VueWebApi.Controllers.LoginController.LoginMenu(System.String,System.String)">
<summary>
鏌ヨ鐧诲綍鑿滃崟
</summary>
<param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
+ <param name="usercode">鐧诲綍鐢ㄦ埛缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.UpdateUserPassword(System.String,System.String,System.String,System.String)">
@@ -1082,7 +1083,26 @@
</member>
<member name="M:VueWebApi.Controllers.LoginController.LoginOut(System.Int32,System.String,System.String,System.String)">
<summary>
- 鐧诲嚭
+ PC鐧诲嚭
+ </summary>
+ <param name="userid">鐢ㄦ埛id</param>
+ <param name="usercode">鐢ㄦ埛缂栫爜</param>
+ <param name="username">鐢ㄦ埛鍚�</param>
+ <param name="usertype">鎿嶄綔绔疨C/APP</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.LoginController.LoginAppSave(System.String,System.String,System.String)">
+ <summary>
+ APP鐢ㄦ埛鐧诲綍
+ </summary>
+ <param name="username">鐢ㄦ埛缂栫爜</param>
+ <param name="password">瀵嗙爜</param>
+ <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.LoginController.LoginAppOut(System.Int32,System.String,System.String,System.String)">
+ <summary>
+ APP鐧诲嚭
</summary>
<param name="userid">鐢ㄦ埛id</param>
<param name="usercode">鐢ㄦ埛缂栫爜</param>
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Web.config b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
index 15fb914..b4f2553 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/Web.config
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Web.config
@@ -21,7 +21,7 @@
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
<add key="RedisConnPort" value="6379" />
<!--key澶辨晥鏃堕棿30绉�-->
- <add key="RedisKeyTimeCont" value="30" />
+ <add key="RedisKeyTimeCont" value="120" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 04466f6..b4e9755 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index f1978ba..4ba0240 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -1046,7 +1046,7 @@
</member>
<member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)">
<summary>
- 鐢ㄦ埛鐧诲綍
+ PC鐢ㄦ埛鐧诲綍
</summary>
<param name="username">鐢ㄦ埛缂栫爜</param>
<param name="password">瀵嗙爜</param>
@@ -1063,11 +1063,12 @@
<param name="usertype">鎿嶄綔绔疨C/APP</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.LoginController.LoginMenu(System.String)">
+ <member name="M:VueWebApi.Controllers.LoginController.LoginMenu(System.String,System.String)">
<summary>
鏌ヨ鐧诲綍鑿滃崟
</summary>
<param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
+ <param name="usercode">鐧诲綍鐢ㄦ埛缂栫爜</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.UpdateUserPassword(System.String,System.String,System.String,System.String)">
@@ -1082,7 +1083,26 @@
</member>
<member name="M:VueWebApi.Controllers.LoginController.LoginOut(System.Int32,System.String,System.String,System.String)">
<summary>
- 鐧诲嚭
+ PC鐧诲嚭
+ </summary>
+ <param name="userid">鐢ㄦ埛id</param>
+ <param name="usercode">鐢ㄦ埛缂栫爜</param>
+ <param name="username">鐢ㄦ埛鍚�</param>
+ <param name="usertype">鎿嶄綔绔疨C/APP</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.LoginController.LoginAppSave(System.String,System.String,System.String)">
+ <summary>
+ APP鐢ㄦ埛鐧诲綍
+ </summary>
+ <param name="username">鐢ㄦ埛缂栫爜</param>
+ <param name="password">瀵嗙爜</param>
+ <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.LoginController.LoginAppOut(System.Int32,System.String,System.String,System.String)">
+ <summary>
+ APP鐧诲嚭
</summary>
<param name="userid">鐢ㄦ埛id</param>
<param name="usercode">鐢ㄦ埛缂栫爜</param>
diff --git a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
index ff7ce4e..bc0b1a5 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/original/Web.config
@@ -21,7 +21,7 @@
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
<add key="RedisConnPort" value="6379" />
<!--key澶辨晥鏃堕棿30绉�-->
- <add key="RedisKeyTimeCont" value="30" />
+ <add key="RedisKeyTimeCont" value="120" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
diff --git a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
index 15fb914..b4f2553 100644
--- a/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
+++ b/VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config
@@ -21,7 +21,7 @@
<!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿-->
<add key="RedisConnPort" value="6379" />
<!--key澶辨晥鏃堕棿30绉�-->
- <add key="RedisKeyTimeCont" value="30" />
+ <add key="RedisKeyTimeCont" value="120" />
<!--Excel瀵煎嚭妯℃澘閰嶇疆IP-->
<add key="FileIP" value="http://121.196.36.24:8001/" />
<add key="webpages:Version" value="3.0.0.0" />
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
deleted file mode 100644
index f5e894a..0000000
--- a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
index c64ac13..9c1a6fd 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -265,7 +265,6 @@
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
-D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 04466f6..b4e9755 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3