From 22af5bed0da8a5852bd824a1e21e6fc43df6df2a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 11 十二月 2023 19:20:43 +0800
Subject: [PATCH] 1.App 智能分析,生产进度看板接口 2.PC端设备点检项目、保养项目、点检标准、保养标准、点检记录、保养记录、维修记录 3.工序检验扫码添加判断(条码任务是否存在、工单是否关闭) 4.添加App图标图片文件
---
VueWebCoreApi/Controllers/LoginController.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/VueWebCoreApi/Controllers/LoginController.cs b/VueWebCoreApi/Controllers/LoginController.cs
index dd5eed9..14a44c2 100644
--- a/VueWebCoreApi/Controllers/LoginController.cs
+++ b/VueWebCoreApi/Controllers/LoginController.cs
@@ -80,7 +80,7 @@
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
mes.data = ms.token.ToString();
}
else //濡傛灉瀛樺湪
@@ -92,7 +92,7 @@
{
mes.data = ms.token.ToString();
mes.code = "302";
- mes.Message = "褰撳墠璐﹀彿宸茬櫥褰�,鏄惁寮哄埗涓嬬嚎!";
+ mes.message = "褰撳墠璐﹀彿宸茬櫥褰�,鏄惁寮哄埗涓嬬嚎!";
}
else
{
@@ -102,7 +102,7 @@
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.data = ms;
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
}
}
}
@@ -110,7 +110,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
@@ -162,14 +162,14 @@
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 Json(mes);
@@ -191,14 +191,14 @@
{
try
{
- var token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyY29kZSI6Ijk5OSIsInVzZXJuYW1lIjoi5rWL6K-V6LSm5Y-3Iiwic3RvcmdfY29kZSI6IlNDQjAxXzEiLCJzdG9yZ19uYW1lIjoi55Sf5Lqn5LiA6YOoIiwiaXNfc3lzdGVtX2FkbWluIjoiTiIsInJvbGVfY29kZSI6IlIyMzA4MjMwMiw5OTk5Iiwicm9sZV9kYXRhcGVybWlzc2lvbnMiOiIiLCJ1c2VydHlwZSI6IkFQUCIsInJlZGlza2V5IjoiTmV3TUVTTG9naW5Vc2VySURBUFA5OTkiLCJ0aW1lb3V0IjoiMjAyMy0xMC0xN1QxMjozMjozOC40NTYzMTE0KzA4OjAwIn0.BX_axVR1-IT3L5SP6D5o7EhPbdW9SbZcp55C3PYy5eE"; //HttpContext.Request.Headers["Token"].ToString();
+ var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
mes = LoginBLL.LoginMenu(usercode, usertype,us);
}
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
}
return Json(mes);
}
@@ -295,7 +295,7 @@
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
mes.data = ms.token.ToString();
}
else //濡傛灉瀛樺湪
@@ -316,7 +316,7 @@
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.data = ms;
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
}
}
}
@@ -324,7 +324,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
--
Gitblit v1.9.3