.vs/VueWebApi/v16/.suoBinary files differ
VueWebApi/Controllers/LoginController.cs
@@ -1,6 +1,7 @@ using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Configuration; using System.Data; using System.Linq; using System.Net; @@ -20,6 +21,9 @@ //定义全局信息返回变量 ToMessage mes = new ToMessage(); RedisHelper redis = new RedisHelper(); //获取企业配置Enterprise private static readonly string Enterprise = ConfigurationManager.AppSettings["Enterprise"]; #region[PC用户登录] /// <summary> @@ -46,18 +50,18 @@ ms.username = dt.Rows[0]["USERNAME"].ToString(); ms.password = dt.Rows[0]["PASSWORD"].ToString(); ms.usertype = usertype; ms.rediskey = "LoginUserID" + ms.usertype + ms.userid; ms.rediskey = Enterprise+"LoginUserID" + ms.usertype + ms.userid; mss.Add(ms); HttpContext.Current.Session.Clear(); //从会话状态集合中删除所有的键值 //HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms); //User loginUser = JsonConvert.DeserializeObject<User>(HttpContext.Current.Session["User"].ToString()); User loginUser = JsonConvert.DeserializeObject<User>(JsonConvert.SerializeObject(ms)); //如果redis登录用户中不存在当前用户 if (redis.Get<User>("LoginUserID" + ms.usertype + ms.userid, 0) == null) if (redis.Get<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, 0) == null) { //redis.Remove("LoginUserID" + ms.userid, 0); //写入redis(注意：redis类里面的失效时间必须在key创建完成之后才生效) redis.Set<User>("LoginUserID" + ms.usertype + ms.userid, ms, redis.secondsTimeOut, 0); redis.Set<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, ms, redis.secondsTimeOut, 0); //登录信息写入session HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms); //写入登录操作记录 @@ -69,7 +73,7 @@ else //如果存在 { //获取redis中当前用户信息 User r_loginUser = redis.Get<User>("LoginUserID" + ms.usertype + ms.userid, 0); User r_loginUser = redis.Get<User>(Enterprise+"LoginUserID" + ms.usertype + ms.userid, 0); //如果session中的用户usercode和redis中的用户usercode匹配 if ((r_loginUser.usercode + r_loginUser.usertype).Equals(loginUser.usercode + loginUser.usertype)) { @@ -80,7 +84,7 @@ else { //重置过期时间(注意：redis类里面的失效时间必须在key创建完成之后才生效) redis.Set<User>("LoginUserID" + ms.usertype + loginUser.userid, loginUser, redis.secondsTimeOut, 0); redis.Set<User>(Enterprise+"LoginUserID" + ms.usertype + loginUser.userid, loginUser, redis.secondsTimeOut, 0); //登录信息写入session HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms); //写入登录操作记录 @@ -129,7 +133,7 @@ { try { redis.Remove("LoginUserID" + usertype + userid, 0); //删除redis redis.Remove(Enterprise+"LoginUserID" + usertype + userid, 0); //删除redis mes.code = "200"; mes.count = 0; mes.Message = "强制下线成功!"; VueWebApi/DLL/DAL/LoginDAL.cs
@@ -1,6 +1,7 @@ using Dapper; using System; using System.Collections.Generic; using System.Configuration; using System.Data; using System.Data.SqlClient; using System.Linq; @@ -19,6 +20,8 @@ public static List<SqlParameter> listStr = new List<SqlParameter>(); //定义全局参数集合 public static SqlParameter[] parameters; //定义全局SqlParameter参数数组 public static string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"]; //获取企业配置Enterprise private static readonly string Enterprise = ConfigurationManager.AppSettings["Enterprise"]; #region [登录查询] public static DataTable LoginSearch(string username, string password) @@ -239,7 +242,7 @@ cont = DapperHelper.SQL(sql, dynamicParams); if (cont > 0) { redis.Remove("LoginUserID" + usertype + userid, 0); //删除redis redis.Remove(Enterprise+"LoginUserID" + usertype + userid, 0); //删除redis mes.code = "200"; mes.count = 0; mes.Message = "登出成功!"; VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -1340,6 +1340,7 @@ mes.count = 0; mes.Message = "工艺路线已被工单引用，不允许删除!"; mes.data = null; return mes; } else { @@ -1353,6 +1354,7 @@ mes.count = 0; mes.Message = "工艺路线已设置节拍工价，请先删除设置!"; mes.data = null; return mes; } else { @@ -1366,7 +1368,6 @@ sql = @"delete TMateriel_Route where route_code=@routecode"; list.Add(new { str = sql, parm = new { routecode = routecode } }); } } bool aa = DapperHelper.DoTransaction(list); if (aa) { @@ -1374,6 +1375,7 @@ mes.count = 0; mes.Message = "删除成功!"; mes.data = null; return mes; } else { @@ -1381,6 +1383,8 @@ mes.count = 0; mes.Message = "删除失败!"; mes.data = null; return mes; } } } catch (Exception e) @@ -1389,6 +1393,7 @@ mes.count = 0; mes.Message = e.Message; mes.data = null; return mes; } return mes; } VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -2521,7 +2521,7 @@ } //是否末道 if (json[i].last_choke == "Y") else if (json[i].last_choke == "Y") { decimal this_reportqty = decimal.Parse(json[i].report_qty.ToString()); //报工数量(合格) decimal this_ngqty = decimal.Parse(json[i].ng_qty.ToString()); //不良数量 @@ -3033,7 +3033,7 @@ wo_code=json[i].wo_code.ToString(), step_seq=json[i].step_seq.ToString(), step_code=json[i].step_code.ToString(), repair_qty = decimal.Parse(json[i].report_qty), report_qty = decimal.Parse(json[i].report_qty), ng_qty = decimal.Parse(json[i].ng_qty), bad_qty = decimal.Parse(json[i].bad_qty), } VueWebApi/DLL/DAL/ReportManagerDAL.cs
@@ -483,7 +483,7 @@ left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode left join TMateriel_Info M on A.materiel_code=M.partcode left join TStep T on A.step_code=T.stepcode left join TUser U on B.report_person=U.usercode" + search; left join TUser U on B.report_person=U.usercode where" + search; var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total); mes.code = "200"; mes.Message = "查询成功!"; VueWebApi/Logs/2022-11-19.TXT
VueWebApi/Logs/2022-11-21.TXT
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>D:\网站发布\MES灵翔</_PublishTargetUrl> <History>True|2022-11-18T08:03:51.0449470Z;False|2022-11-18T16:03:09.4203709+08:00;True|2022-11-18T16:01:39.4591963+08:00;True|2022-11-18T15:18:55.9443587+08:00;True|2022-11-18T15:18:44.4492390+08:00;True|2022-11-18T13:29:22.9601475+08:00;True|2022-11-18T13:29:05.4108151+08:00;True|2022-11-18T13:25:30.9305617+08:00;True|2022-11-17T10:13:35.2543186+08:00;True|2022-11-16T11:50:20.8332089+08:00;True|2022-11-16T10:30:15.8662476+08:00;True|2022-11-16T09:54:50.9630719+08:00;True|2022-11-11T13:23:20.3484151+08:00;True|2022-11-09T13:07:34.9422662+08:00;True|2022-11-09T10:59:58.4912849+08:00;True|2022-11-09T10:11:04.4851324+08:00;True|2022-11-09T10:10:46.8698985+08:00;</History> <History>True|2022-11-21T03:02:59.6984011Z;True|2022-11-21T10:55:50.7022834+08:00;True|2022-11-18T16:03:51.0449470+08:00;False|2022-11-18T16:03:09.4203709+08:00;True|2022-11-18T16:01:39.4591963+08:00;True|2022-11-18T15:18:55.9443587+08:00;True|2022-11-18T15:18:44.4492390+08:00;True|2022-11-18T13:29:22.9601475+08:00;True|2022-11-18T13:29:05.4108151+08:00;True|2022-11-18T13:25:30.9305617+08:00;True|2022-11-17T10:13:35.2543186+08:00;True|2022-11-16T11:50:20.8332089+08:00;True|2022-11-16T10:30:15.8662476+08:00;True|2022-11-16T09:54:50.9630719+08:00;True|2022-11-11T13:23:20.3484151+08:00;True|2022-11-09T13:07:34.9422662+08:00;True|2022-11-09T10:59:58.4912849+08:00;True|2022-11-09T10:11:04.4851324+08:00;True|2022-11-09T10:10:46.8698985+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="Areas/HelpPage/HelpPage.css"> @@ -705,13 +705,13 @@ <publishTime>12/24/2021 15:38:29</publishTime> </File> <File Include="bin/VueWebApi.dll"> <publishTime>11/18/2022 16:03:45</publishTime> <publishTime>11/21/2022 11:02:53</publishTime> </File> <File Include="bin/VueWebApi.pdb"> <publishTime>11/18/2022 16:03:45</publishTime> <publishTime>11/21/2022 11:02:53</publishTime> </File> <File Include="bin/VueWebApi.xml"> <publishTime>11/18/2022 16:03:45</publishTime> <publishTime>11/21/2022 11:02:53</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>02/08/2013 16:42:28</publishTime> @@ -1074,7 +1074,7 @@ <publishTime>06/16/2022 13:39:23</publishTime> </File> <File Include="Web.config"> <publishTime>11/18/2022 16:03:50</publishTime> <publishTime>11/21/2022 11:02:59</publishTime> </File> </ItemGroup> </Project> VueWebApi/Web.config
@@ -18,6 +18,8 @@ <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_lx;User ID=sa;Password=xkd@20220602;pooling=false" /> <!--大岛服务器环境--> <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />--> <!--redis企业配置--> <add key="Enterprise" value="LX" /> <!--redis数据库链接配置ip--> <add key="RedisConnIp" value="127.0.0.1" /> <!--redis数据库链接配置端口号--> VueWebApi/bin/VueWebApi.dllBinary files differ
VueWebApi/bin/VueWebApi.pdbBinary files differ
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dllBinary files differ
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdbBinary files differ
VueWebApi/obj/Release/VueWebApi.dllBinary files differ
VueWebApi/obj/Release/VueWebApi.pdbBinary files differ
