From f692cf7b41027664c9a3bf405d3c70cf123a76dd Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 11 八月 2022 18:37:32 +0800
Subject: [PATCH] app图标
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Image/6.png | 0
VueWebApi/Image/app_8.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_8.png | 0
VueWebApi/DLL/DAL/LoginDAL.cs | 25 ++++++--
VueWebApi/Image/5.png | 0
VueWebApi/Tools/ChannelActionFilterAttribute.cs | 6 +-
VueWebApi/VueWebApi.csproj | 24 ++++++++
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_1.png | 0
VueWebApi/Image/app_7.png | 0
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_9.png | 0
VueWebApi/Image/4.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_2.png | 0
VueWebApi/Image/app_1.png | 0
VueWebApi/Image/app_2.png | 0
VueWebApi/Logs/2022-08-11.TXT | 0
VueWebApi/bin/VueWebApi.xml | 8 +-
VueWebApi/obj/Release/Package/PackageTmp/Image/app_3.png | 0
VueWebApi/Image/app_3_1.png | 0
VueWebApi/DLL/BLL/LoginBLL.cs | 4
VueWebApi/Image/3.png | 0
VueWebApi/Image/app_9.png | 0
VueWebApi/Image/app_4.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_4.png | 0
VueWebApi/Image/1.png | 0
VueWebApi/Image/app_3_2.png | 0
VueWebApi/Image/2.png | 0
VueWebApi/Image/app_3.png | 0
VueWebApi/Models/TreeObejct.cs | 2
VueWebApi/obj/Release/Package/PackageTmp/Image/app_5.png | 0
VueWebApi/Image/9.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_6.png | 0
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 1
VueWebApi/Image/app_6.png | 0
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 37 ++++++++++-
VueWebApi/Image/8.png | 0
VueWebApi/Image/app_4_1.png | 0
/dev/null | 0
VueWebApi/Image/app_5.png | 0
VueWebApi/Image/app_1_2.png | 0
VueWebApi/Image/app_1_1.png | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 8 +-
VueWebApi/Image/app_4_2.png | 0
VueWebApi/obj/Release/Package/PackageTmp/Image/app_7.png | 0
VueWebApi/Controllers/LoginController.cs | 12 ++-
VueWebApi/Image/7.png | 0
50 files changed, 98 insertions(+), 29 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 6b316ec..55275c9 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 ee81776..08efa30 100644
--- a/VueWebApi/Controllers/LoginController.cs
+++ b/VueWebApi/Controllers/LoginController.cs
@@ -27,10 +27,11 @@
/// </summary>
/// <param name="username">鐢ㄦ埛缂栫爜</param>
/// <param name="password">瀵嗙爜</param>
+ /// <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
/// <returns></returns>
[Route(template: "LoginSave")]
[HttpGet]
- public HttpResponseMessage LoginSave(string username, string password)
+ public HttpResponseMessage LoginSave(string username, string password,string usertype)
{
try
{
@@ -44,7 +45,7 @@
ms.usercode = dt.Rows[0]["USERCODE"].ToString();
ms.username = dt.Rows[0]["USERNAME"].ToString();
ms.password = dt.Rows[0]["PASSWORD"].ToString();
- ms.usertype = "PC";
+ ms.usertype = usertype;
mss.Add(ms);
HttpContext.Current.Session.Clear(); //浠庝細璇濈姸鎬侀泦鍚堜腑鍒犻櫎鎵�鏈夌殑閿��
//HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
@@ -145,17 +146,18 @@
#region[鏌ヨ鐧诲綍鑿滃崟]
/// <summary>
- /// 鏌ヨ鍔熻兘鑿滃崟
+ /// 鏌ヨ鐧诲綍鑿滃崟
/// </summary>
+ /// <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
/// <returns></returns>
[Route(template: "LoginMenu")]
[HttpGet]
- public HttpResponseMessage LoginMenu()
+ public HttpResponseMessage LoginMenu(string usertype)
{
try
{
var usercode = HttpContext.Current.Request.Cookies["navTabId"].Value.ToString();
- mes = LoginBLL.LoginMenu(usercode);
+ mes = LoginBLL.LoginMenu(usercode, usertype);
}
catch (Exception e)
{
diff --git a/VueWebApi/DLL/BLL/LoginBLL.cs b/VueWebApi/DLL/BLL/LoginBLL.cs
index 85a4f28..73a9574 100644
--- a/VueWebApi/DLL/BLL/LoginBLL.cs
+++ b/VueWebApi/DLL/BLL/LoginBLL.cs
@@ -25,9 +25,9 @@
#endregion
#region[鏌ヨ鑿滃崟鍔熻兘]
- public static ToMessage LoginMenu(string usercode)
+ public static ToMessage LoginMenu(string usercode,string usertype)
{
- return LoginDAL.LoginMenu(usercode);
+ return LoginDAL.LoginMenu(usercode, usertype);
}
#endregion
diff --git a/VueWebApi/DLL/DAL/LoginDAL.cs b/VueWebApi/DLL/DAL/LoginDAL.cs
index 4d96c4f..c363236 100644
--- a/VueWebApi/DLL/DAL/LoginDAL.cs
+++ b/VueWebApi/DLL/DAL/LoginDAL.cs
@@ -18,7 +18,7 @@
public static string strProcName = ""; //瀹氫箟鍏ㄥ眬sql鍙橀噺
public static List<SqlParameter> listStr = new List<SqlParameter>(); //瀹氫箟鍏ㄥ眬鍙傛暟闆嗗悎
public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
-
+ public static string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
#region [鐧诲綍鏌ヨ]
public static DataTable LoginSearch(string username, string password)
@@ -106,7 +106,7 @@
#endregion
#region[鏌ヨ鑿滃崟鍔熻兘]
- public static ToMessage LoginMenu(string usercode)
+ public static ToMessage LoginMenu(string usercode, string usertype)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -114,28 +114,39 @@
try
{
//鑾峰彇鑿滃崟闆嗗悎(鏍规嵁鐧诲綍鐢ㄦ埛缂栫爜鏌ヨ鏉冮檺鍙嶆帹鑿滃崟)
- sql = @"select distinct rt.right_code as code,rt.right_name as name,rt.right_seq,rt.is_delete as flag from TRight rt where rt.right_code in(
+ sql = @"select distinct rt.right_code as code,rt.right_name as name,rt.right_seq,rt.is_delete as flag,imgurl from TRight rt where rt.right_code in(
select A.parent_id from TRight A
left join TRoleRightRelation B on B.right_code=A.right_code
left join TRole C on C.role_code=B.role_code
left join TUserRoleRelation D on D.role_code=C.role_code
left join TUser E on E.usercode=D.user_code
- where E.usercode=@usercode) and rt.Type='PC' order by rt.right_seq";
+ where E.usercode=@usercode) and rt.Type=@usertype order by rt.right_seq";
dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@usertype", usertype);
var data = DapperHelper.select<TreeObejct>(sql, dynamicParams);
+ data = data.Select(c =>
+ {
+ c.imgurl = fileip + c.imgurl;
+ return c;
+ }).ToList();
for (int i = 0; i < data.Count; i++)
{
- sql = @"select distinct mu.right_code as code,mu.right_name as name,mu.right_seq,mu.is_delete as flag
+ sql = @"select distinct mu.right_code as code,mu.right_name as name,mu.right_seq,mu.is_delete as flag,imgurl
from TRight mu
inner join TRoleRightRelation rl on mu.right_code=rl.right_code
inner join TUserRoleRelation ro on rl.role_code=ro.role_code
- where mu.type='PC' and ro.user_code=@usercode and mu.parent_id=@paent_id
+ where mu.type=@usertype and ro.user_code=@usercode and mu.parent_id=@paent_id
order by mu.right_seq, mu.right_code";
dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@usertype", usertype);
dynamicParams.Add("@paent_id", data[i].code);
var data0 = DapperHelper.select<TreeObejctCn>(sql, dynamicParams);
+ data0 = data0.Select(c =>
+ {
+ c.imgurl = fileip + c.imgurl;
+ return c;
+ }).ToList();
data[i].children = data0;
-
}
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
diff --git a/VueWebApi/Image/1.png b/VueWebApi/Image/1.png
new file mode 100644
index 0000000..bdf667e
--- /dev/null
+++ b/VueWebApi/Image/1.png
Binary files differ
diff --git a/VueWebApi/Image/2.png b/VueWebApi/Image/2.png
new file mode 100644
index 0000000..7d24ace
--- /dev/null
+++ b/VueWebApi/Image/2.png
Binary files differ
diff --git a/VueWebApi/Image/3.png b/VueWebApi/Image/3.png
new file mode 100644
index 0000000..baef482
--- /dev/null
+++ b/VueWebApi/Image/3.png
Binary files differ
diff --git a/VueWebApi/Image/4.png b/VueWebApi/Image/4.png
new file mode 100644
index 0000000..3d84684
--- /dev/null
+++ b/VueWebApi/Image/4.png
Binary files differ
diff --git a/VueWebApi/Image/5.png b/VueWebApi/Image/5.png
new file mode 100644
index 0000000..5413e4b
--- /dev/null
+++ b/VueWebApi/Image/5.png
Binary files differ
diff --git a/VueWebApi/Image/6.png b/VueWebApi/Image/6.png
new file mode 100644
index 0000000..f923f43
--- /dev/null
+++ b/VueWebApi/Image/6.png
Binary files differ
diff --git a/VueWebApi/Image/7.png b/VueWebApi/Image/7.png
new file mode 100644
index 0000000..9361d0b
--- /dev/null
+++ b/VueWebApi/Image/7.png
Binary files differ
diff --git a/VueWebApi/Image/8.png b/VueWebApi/Image/8.png
new file mode 100644
index 0000000..8176c73
--- /dev/null
+++ b/VueWebApi/Image/8.png
Binary files differ
diff --git a/VueWebApi/Image/9.png b/VueWebApi/Image/9.png
new file mode 100644
index 0000000..92360e2
--- /dev/null
+++ b/VueWebApi/Image/9.png
Binary files differ
diff --git a/VueWebApi/Image/app_1.png b/VueWebApi/Image/app_1.png
new file mode 100644
index 0000000..d19d940
--- /dev/null
+++ b/VueWebApi/Image/app_1.png
Binary files differ
diff --git a/VueWebApi/Image/app_1_1.png b/VueWebApi/Image/app_1_1.png
new file mode 100644
index 0000000..12e078c
--- /dev/null
+++ b/VueWebApi/Image/app_1_1.png
Binary files differ
diff --git a/VueWebApi/Image/app_1_2.png b/VueWebApi/Image/app_1_2.png
new file mode 100644
index 0000000..f56699a
--- /dev/null
+++ b/VueWebApi/Image/app_1_2.png
Binary files differ
diff --git a/VueWebApi/Image/app_2.png b/VueWebApi/Image/app_2.png
new file mode 100644
index 0000000..a2a072b
--- /dev/null
+++ b/VueWebApi/Image/app_2.png
Binary files differ
diff --git a/VueWebApi/Image/app_3.png b/VueWebApi/Image/app_3.png
new file mode 100644
index 0000000..7c775c9
--- /dev/null
+++ b/VueWebApi/Image/app_3.png
Binary files differ
diff --git a/VueWebApi/Image/app_3_1.png b/VueWebApi/Image/app_3_1.png
new file mode 100644
index 0000000..3d077d7
--- /dev/null
+++ b/VueWebApi/Image/app_3_1.png
Binary files differ
diff --git a/VueWebApi/Image/app_3_2.png b/VueWebApi/Image/app_3_2.png
new file mode 100644
index 0000000..7a5e7ed
--- /dev/null
+++ b/VueWebApi/Image/app_3_2.png
Binary files differ
diff --git a/VueWebApi/Image/app_4.png b/VueWebApi/Image/app_4.png
new file mode 100644
index 0000000..b6cce43
--- /dev/null
+++ b/VueWebApi/Image/app_4.png
Binary files differ
diff --git a/VueWebApi/Image/app_4_1.png b/VueWebApi/Image/app_4_1.png
new file mode 100644
index 0000000..bad5496
--- /dev/null
+++ b/VueWebApi/Image/app_4_1.png
Binary files differ
diff --git a/VueWebApi/Image/app_4_2.png b/VueWebApi/Image/app_4_2.png
new file mode 100644
index 0000000..2db937a
--- /dev/null
+++ b/VueWebApi/Image/app_4_2.png
Binary files differ
diff --git a/VueWebApi/Image/app_5.png b/VueWebApi/Image/app_5.png
new file mode 100644
index 0000000..b384e80
--- /dev/null
+++ b/VueWebApi/Image/app_5.png
Binary files differ
diff --git a/VueWebApi/Image/app_6.png b/VueWebApi/Image/app_6.png
new file mode 100644
index 0000000..4d40ea4
--- /dev/null
+++ b/VueWebApi/Image/app_6.png
Binary files differ
diff --git a/VueWebApi/Image/app_7.png b/VueWebApi/Image/app_7.png
new file mode 100644
index 0000000..2692939
--- /dev/null
+++ b/VueWebApi/Image/app_7.png
Binary files differ
diff --git a/VueWebApi/Image/app_8.png b/VueWebApi/Image/app_8.png
new file mode 100644
index 0000000..3bb319a
--- /dev/null
+++ b/VueWebApi/Image/app_8.png
Binary files differ
diff --git a/VueWebApi/Image/app_9.png b/VueWebApi/Image/app_9.png
new file mode 100644
index 0000000..5b39989
--- /dev/null
+++ b/VueWebApi/Image/app_9.png
Binary files differ
diff --git a/VueWebApi/Logs/2022-08-11.TXT b/VueWebApi/Logs/2022-08-11.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-08-11.TXT
diff --git a/VueWebApi/Models/TreeObejct.cs b/VueWebApi/Models/TreeObejct.cs
index ea9d17c..5cd6032 100644
--- a/VueWebApi/Models/TreeObejct.cs
+++ b/VueWebApi/Models/TreeObejct.cs
@@ -10,6 +10,7 @@
public string code { get; set; }
public string name { get; set; }
public string flag { get; set; }
+ public string imgurl { get; set; }
public List<TreeObejctCn> children { get; set; }//瀛愯妭鐐�
}
public class TreeObejctCn
@@ -17,5 +18,6 @@
public string code { get; set; }
public string name { get; set; }
public string flag { get; set; }
+ public string imgurl { get; set; }
}
}
\ No newline at end of file
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index a4692ff..3a9dd90 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-08T06:48:16.3637965Z;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-11T01:06:08.8394009Z;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/08/2022 14:48:09</publishTime>
+ <publishTime>08/11/2022 09:06:03</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>08/08/2022 14:48:09</publishTime>
+ <publishTime>08/11/2022 09:06:03</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>08/08/2022 14:48:09</publishTime>
+ <publishTime>08/11/2022 09:06:03</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -1229,6 +1229,33 @@
<File Include="Grid/webapp-ws-tutorial.htm">
<publishTime>07/08/2022 15:15:11</publishTime>
</File>
+ <File Include="Image/app_1.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/app_2.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/app_3.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/app_4.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/app_5.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/app_6.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/app_7.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/app_8.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
+ <File Include="Image/app_9.png">
+ <publishTime>08/11/2022 08:20:52</publishTime>
+ </File>
<File Include="index.html">
<publishTime>06/30/2022 14:02:46</publishTime>
</File>
@@ -1287,7 +1314,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/08/2022 14:48:15</publishTime>
+ <publishTime>08/11/2022 09:06:08</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/ChannelActionFilterAttribute.cs b/VueWebApi/Tools/ChannelActionFilterAttribute.cs
index 87cd867..a18f137 100644
--- a/VueWebApi/Tools/ChannelActionFilterAttribute.cs
+++ b/VueWebApi/Tools/ChannelActionFilterAttribute.cs
@@ -32,15 +32,15 @@
User loginUser = JsonConvert.DeserializeObject<User>(User);
base.OnActionExecuting(actionContext);
//濡傛灉瀛樺湪
- if (redis.Get<User>("LoginUserIDPC" + loginUser.userid, 0).userid.ToString() != "")
+ if (redis.Get<User>("LoginUserID"+loginUser.usertype + loginUser.userid, 0).userid.ToString() != "")
{
//鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
- User r_loginUser = redis.Get<User>("LoginUserIDPC" + loginUser.userid, 0);
+ User r_loginUser = redis.Get<User>("LoginUserID"+ loginUser.usertype + loginUser.userid, 0);
//濡傛灉session涓殑鐢ㄦ埛guid鍜宺edis涓殑鐢ㄦ埛guid鍖归厤
if (r_loginUser.guid.Equals(loginUser.guid))
{
//閲嶇疆杩囨湡鏃堕棿
- redis.Set<User>("LoginUserIDPC" + loginUser.userid, loginUser, redis.secondsTimeOut, 0);
+ redis.Set<User>("LoginUserID"+ loginUser.usertype + loginUser.userid, loginUser, redis.secondsTimeOut, 0);
}
else
{
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 4db422f..33cd077 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -377,6 +377,30 @@
<Content Include="Global.asax" />
<Content Include="Grid\grwebapp.js" />
<Content Include="Grid\webapp-ws-tutorial.htm" />
+ <Content Include="Image\1.png" />
+ <Content Include="Image\2.png" />
+ <Content Include="Image\3.png" />
+ <Content Include="Image\4.png" />
+ <Content Include="Image\5.png" />
+ <Content Include="Image\6.png" />
+ <Content Include="Image\7.png" />
+ <Content Include="Image\8.png" />
+ <Content Include="Image\9.png" />
+ <Content Include="Image\app_1.png" />
+ <Content Include="Image\app_1_1.png" />
+ <Content Include="Image\app_1_2.png" />
+ <Content Include="Image\app_2.png" />
+ <Content Include="Image\app_3.png" />
+ <Content Include="Image\app_3_1.png" />
+ <Content Include="Image\app_3_2.png" />
+ <Content Include="Image\app_4.png" />
+ <Content Include="Image\app_4_1.png" />
+ <Content Include="Image\app_4_2.png" />
+ <Content Include="Image\app_5.png" />
+ <Content Include="Image\app_6.png" />
+ <Content Include="Image\app_7.png" />
+ <Content Include="Image\app_8.png" />
+ <Content Include="Image\app_9.png" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Areas\HelpPage\Views\Web.config" />
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 2ec52eb..d17360b 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 ed4945c..1e9e81f 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -1020,12 +1020,13 @@
</summary>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)">
<summary>
鐢ㄦ埛鐧诲綍
</summary>
<param name="username">鐢ㄦ埛缂栫爜</param>
<param name="password">瀵嗙爜</param>
+ <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.ForcedOffline(System.Int32,System.String,System.String,System.String)">
@@ -1038,10 +1039,11 @@
<param name="usertype">鎿嶄綔绔疨C/APP</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.LoginController.LoginMenu">
+ <member name="M:VueWebApi.Controllers.LoginController.LoginMenu(System.String)">
<summary>
- 鏌ヨ鍔熻兘鑿滃崟
+ 鏌ヨ鐧诲綍鑿滃崟
</summary>
+ <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.UpdateUserPassword(System.String,System.String,System.String,System.String)">
diff --git a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index e70e291..44f7e05 100644
--- a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_1.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_1.png
new file mode 100644
index 0000000..bdf667e
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_1.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_2.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_2.png
new file mode 100644
index 0000000..7d24ace
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_2.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_3.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_3.png
new file mode 100644
index 0000000..baef482
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_3.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_4.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_4.png
new file mode 100644
index 0000000..3d84684
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_4.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_5.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_5.png
new file mode 100644
index 0000000..5413e4b
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_5.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6.png
new file mode 100644
index 0000000..f923f43
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_6.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_7.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_7.png
new file mode 100644
index 0000000..9361d0b
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_7.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_8.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_8.png
new file mode 100644
index 0000000..8176c73
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_8.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/Image/app_9.png b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_9.png
new file mode 100644
index 0000000..92360e2
--- /dev/null
+++ b/VueWebApi/obj/Release/Package/PackageTmp/Image/app_9.png
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 2ec52eb..d17360b 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 ed4945c..1e9e81f 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -1020,12 +1020,13 @@
</summary>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)">
<summary>
鐢ㄦ埛鐧诲綍
</summary>
<param name="username">鐢ㄦ埛缂栫爜</param>
<param name="password">瀵嗙爜</param>
+ <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.ForcedOffline(System.Int32,System.String,System.String,System.String)">
@@ -1038,10 +1039,11 @@
<param name="usertype">鎿嶄綔绔疨C/APP</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.LoginController.LoginMenu">
+ <member name="M:VueWebApi.Controllers.LoginController.LoginMenu(System.String)">
<summary>
- 鏌ヨ鍔熻兘鑿滃崟
+ 鏌ヨ鐧诲綍鑿滃崟
</summary>
+ <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
<returns></returns>
</member>
<member name="M:VueWebApi.Controllers.LoginController.UpdateUserPassword(System.String,System.String,System.String,System.String)">
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 2ec52eb..d17360b 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3