From 8024ec8c0300dcffa0caf4e2a030e068a9051bc2 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 18 一月 2024 09:08:31 +0800
Subject: [PATCH] 1.ServiceStack.Redis 依赖包变更为StackExchange.Redis

---
 VueWebCoreApi/DLL/DAL/LoginDAL.cs |   94 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 65 insertions(+), 29 deletions(-)

diff --git a/VueWebCoreApi/DLL/DAL/LoginDAL.cs b/VueWebCoreApi/DLL/DAL/LoginDAL.cs
index 330b9c1..edaf450 100644
--- a/VueWebCoreApi/DLL/DAL/LoginDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/LoginDAL.cs
@@ -45,14 +45,14 @@
                 if (dt_.Rows.Count <= 0)
                 {
                     mes.code = "300";
-                    mes.Message = "璐﹀彿瀵嗙爜涓嶆纭�!";
+                    mes.message = "璐﹀彿瀵嗙爜涓嶆纭�!";
                     mes.data = null;
                     return mes;
                 }
                 if (dt_.Rows[0]["status"].ToString() == "N") 
                 {
                     mes.code = "300";
-                    mes.Message = "褰撳墠璐﹀彿宸插仠鐢�!";
+                    mes.message = "褰撳墠璐﹀彿宸插仠鐢�!";
                     mes.data = null;
                     return mes;
                 }
@@ -67,7 +67,7 @@
                 if (dt_.Rows[0]["storg_code"].ToString() == "" || dt_.Rows[0]["storg_code"].ToString() == null)
                 {
                     mes.code = "300";
-                    mes.Message = "褰撳墠鐢ㄦ埛鏈寚瀹氱粍缁�!";
+                    mes.message = "褰撳墠鐢ㄦ埛鏈寚瀹氱粍缁�!";
                     mes.data = null;
                     return mes;
                 }
@@ -75,7 +75,7 @@
                 if (dt_.Rows[0]["post_code"].ToString() == "" || dt_.Rows[0]["post_code"].ToString() == null)
                 {
                     mes.code = "300";
-                    mes.Message = "褰撳墠鐢ㄦ埛鏈寚瀹氬矖浣�!";
+                    mes.message = "褰撳墠鐢ㄦ埛鏈寚瀹氬矖浣�!";
                     mes.data = null;
                     return mes;
                 }
@@ -83,7 +83,7 @@
                 if (dt_.Rows[0]["role_code"].ToString() == "" || dt_.Rows[0]["role_code"].ToString() == null)
                 {
                     mes.code = "300";
-                    mes.Message = "褰撳墠鐢ㄦ埛鏈寚瀹氳鑹�!";
+                    mes.message = "褰撳墠鐢ㄦ埛鏈寚瀹氳鑹�!";
                     mes.data = null;
                     return mes;
                 }
@@ -94,7 +94,7 @@
             catch (Exception e)
             {
                 mes.code = "300";
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
                 return mes;
             }
@@ -122,14 +122,14 @@
                 {
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "璁板綍鎴愬姛!";
+                    mes.message = "璁板綍鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "璁板綍澶辫触!";
+                    mes.message = "璁板綍澶辫触!";
                     mes.data = null;
                 }
             }
@@ -137,7 +137,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -172,7 +172,7 @@
                         string codeString = string.Join(",", menuCodes);
                         //鏌ヨ鑿滃崟鏁版嵁
                         sql = @"select menucode,menuname,menu_seq,imgurl,'0' as flag,parent_id,is_show    
-                                from TMenu where Type=@usertype order by menu_seq";
+                                from TMenu where is_show='Y' and Type=@usertype order by menu_seq";
                         dynamicParams.Add("@usertype", usertype);
                         var data0 = DapperHelper.selectdata(sql, dynamicParams);
                         if (data0.Rows.Count > 0)
@@ -210,14 +210,14 @@
                                
                             }
                             mes.code = "200";
-                            mes.Message = "鏌ヨ鎴愬姛!";
+                            mes.message = "鏌ヨ鎴愬姛!";
                             mes.data = parentMenus;
                             return mes;
                         }
                         else
                         {
                             mes.code = "300";
-                            mes.Message = "绯荤粺鏈缃彍鍗曡祫鏂�,璇疯仈绯荤鐞嗗憳!";
+                            mes.message = "绯荤粺鏈缃彍鍗曡祫鏂�,璇疯仈绯荤鐞嗗憳!";
                             mes.data = null;
                             return mes;
                         }
@@ -225,7 +225,7 @@
                     else
                     {
                         mes.code = "300";
-                        mes.Message = "褰撳墠璐﹀彿瀵瑰簲瑙掕壊鏈缃姛鑳芥潈闄�!";
+                        mes.message = "褰撳墠璐﹀彿瀵瑰簲瑙掕壊鏈缃姛鑳芥潈闄�!";
                         mes.data = null;
                         return mes;
                     }
@@ -267,7 +267,7 @@
                         string codeString = string.Join(",", menuCodes);
                         //鏌ヨ鑿滃崟鏁版嵁
                         sql = @"select menucode,menuname,menu_seq,imgurl,'0' as flag,parent_id,is_show   
-                                from TMenu where Type=@usertype order by menu_seq";
+                                from TMenu where is_show='Y' and Type=@usertype order by CAST(menu_seq as int) ASC";
                         dynamicParams.Add("@usertype", usertype);
                         var data0 = DapperHelper.selectdata(sql, dynamicParams);
                         if (data0.Rows.Count > 0)
@@ -304,14 +304,14 @@
                                    }).ToList();
                             }
                             mes.code = "200";
-                            mes.Message = "鏌ヨ鎴愬姛!";
+                            mes.message = "鏌ヨ鎴愬姛!";
                             mes.data = parentMenus;
                             return mes;
                         }
                         else
                         {
                             mes.code = "300";
-                            mes.Message = "绯荤粺鏈缃彍鍗曡祫鏂�,璇疯仈绯荤鐞嗗憳!";
+                            mes.message = "绯荤粺鏈缃彍鍗曡祫鏂�,璇疯仈绯荤鐞嗗憳!";
                             mes.data = null;
                             return mes;
                         }
@@ -319,7 +319,7 @@
                     else
                     {
                         mes.code = "300";
-                        mes.Message = "褰撳墠璐﹀彿瀵瑰簲瑙掕壊鏈缃姛鑳芥潈闄�!";
+                        mes.message = "褰撳墠璐﹀彿瀵瑰簲瑙掕壊鏈缃姛鑳芥潈闄�!";
                         mes.data = null;
                         return mes;
                     }
@@ -329,7 +329,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -351,7 +351,7 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = "杈撳叆鐨勫瘑鐮佷笉姝g‘,璇烽噸鏂拌緭鍏ワ紒";
+                mes.message = "杈撳叆鐨勫瘑鐮佷笉姝g‘,璇烽噸鏂拌緭鍏ワ紒";
                 mes.data = null;
             }
             else
@@ -366,14 +366,14 @@
                     LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瘑鐮�", us.usertype);
                     mes.code = "200";
                     mes.count = 0;
-                    mes.Message = "淇敼瀵嗙爜鎴愬姛!";
+                    mes.message = "淇敼瀵嗙爜鎴愬姛!";
                     mes.data = null;
                 }
                 else
                 {
                     mes.code = "300";
                     mes.count = 0;
-                    mes.Message = "淇敼瀵嗙爜澶辫触!";
+                    mes.message = "淇敼瀵嗙爜澶辫触!";
                     mes.data = null;
                 }
             }
@@ -384,23 +384,23 @@
         #region[鐧诲嚭]
         public static ToMessage LoginOut(User us)
         {
-            RedisHelper redis = new RedisHelper();
+            RedisCommon redis = new RedisCommon();
             try
             {
                 //鍒犻櫎redis
-                redis.Remove(Enterprise + "LoginUserID" + us.usertype + us.usercode, 0);
+                redis.KeyDelete(Enterprise + "LoginUserID" + us.usertype + us.usercode);
                 //鍐欏叆鏃ュ織
                 LogHelper.DbOperateLog(us.usercode, "閫�鍑�", "閫�鍑轰簡绯荤粺", us.usertype);
                 mes.code = "200";
                 mes.count = 0;
-                mes.Message = "鐧诲嚭鎴愬姛!";
+                mes.message = "鐧诲嚭鎴愬姛!";
                 mes.data = null;
             }
             catch (Exception e)
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;
@@ -424,14 +424,14 @@
             {
                 mes.code = "200";
                 mes.count = 0;
-                mes.Message = "閲嶇疆瀵嗙爜鎴愬姛!";
+                mes.message = "閲嶇疆瀵嗙爜鎴愬姛!";
                 mes.data = null;
             }
             else
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = "閲嶇疆瀵嗙爜澶辫触!";
+                mes.message = "閲嶇疆瀵嗙爜澶辫触!";
                 mes.data = null;
             }
 
@@ -480,7 +480,7 @@
 
                 mes.code = "200";
                 mes.count = 0;
-                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.message = "鏌ヨ鎴愬姛!";
                 mes.data = data;
 
             }
@@ -488,7 +488,43 @@
             {
                 mes.code = "300";
                 mes.count = 0;
-                mes.Message = e.Message;
+                mes.message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[App鐗堟湰鍗囩骇鎺ュ彛]
+        public static ToMessage AppUpgrade()
+        {
+            var sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                list.Clear();
+                //鏌ヨ鎺у埗鍗囩骇琛ㄧ増鏈暟鎹�
+                sql = @"select *   from TSystemApp";
+                var data1 = DapperHelper.selecttable(sql);
+                AppVersion vn = new AppVersion();
+                vn.path = data1.Rows[0]["path"].ToString();
+                vn.version = data1.Rows[0]["version"].ToString();
+                vn.dispyversion = "";
+                vn.activeversion = data1.Rows[0]["activeversion"].ToString();
+                vn.mustupgrade = data1.Rows[0]["mustupgrade"].ToString();
+                list.Add(vn);
+                mes.code = "200";
+                mes.count = 0;
+                mes.message = "鏌ヨ鎴愬姛!";
+                mes.data = list;
+
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.message = e.Message;
                 mes.data = null;
             }
             return mes;

--
Gitblit v1.9.3