("key");
+ if (string.Concat(userName, timestamp, key).Md5() == sign)
+ {
+ var user = this._userRepo.ReadOnlyTable().FirstOrDefault(o => o.UserName == userName);
+ if (user == null)
+ {
+ user = new User { UserName = userName, NickName = nickName, Avatar = avatar };
+ this._userRepo.Add(user);
+ this._userRepo.SaveChanges();
+ }
+ HttpContext.JwtSignIn(userName, rememberMe, _cfg);
+ return "";
+ }
+ else
+ {
+ return $"function(){{return \"{userName} login error\";}}();";
+ }
+ }
+ catch (Exception ex)
+ {
+ ex.PrintStack();
+ return $"function(){{return {ex.Message};}}();";
+ }
+ }
+
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")]
public string JsonpLogout(string userName, string timestamp, string sign)
{
try
{
- var key = this._configuration["usercenter:key"];
+ var key = this._cfg["usercenter:key"];
if (string.Concat(userName, timestamp, key).Md5() == sign)
{
- HttpContext.SignOutAsync();
+ HttpContext.JwtSignOut();
return "";
}
else
@@ -92,7 +123,7 @@ namespace IoTCenter.Controllers
public IActionResult Login(string returnUrl = null)
{
var fullReturnUrl = Url.GetFullUrl(returnUrl ?? "~");
- var loginUrl = this._configuration["usercenter:login"];
+ var loginUrl = this._cfg["usercenter:login"];
var url = loginUrl.SetParam(nameof(returnUrl), fullReturnUrl);
return Redirect(url);
}
@@ -136,7 +167,7 @@ namespace IoTCenter.Controllers
public IActionResult Register()
{
var fullReturnUrl = Url.FullAction("Index", "Home");
- var registerUrl = this._configuration["usercenter:register"];
+ var registerUrl = this._cfg["usercenter:register"];
var url = registerUrl.SetParam("returnUrl", fullReturnUrl);
return Redirect(url);
}
diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml
index 0a55eed4..19f31b27 100644
--- a/projects/IoTCenter/Views/Home/Node.cshtml
+++ b/projects/IoTCenter/Views/Home/Node.cshtml
@@ -171,13 +171,13 @@
-
- {{GetDeviceDataAttr(device.number,'温度','Description')}}
+
+ {{GetDeviceDataAttr(device.number,'温度','description')}}
- 温度:{{GetDeviceDataAttr(device.number,'温度','Value')}}{{ GetDeviceDataAttr(device.number,'温度','Unit')}}
+ 温度:{{GetDeviceDataAttr(device.number,'温度','value')}}{{ GetDeviceDataAttr(device.number,'温度','unit')}}
@@ -188,13 +188,13 @@
-
- {{GetDeviceDataAttr(device.number,'湿度','Description')}}
+
+ {{GetDeviceDataAttr(device.number,'湿度','description')}}
- 湿度:{{GetDeviceDataAttr(device.number,'湿度','Value')}}{{ GetDeviceDataAttr(device.number,'湿度','Unit')}}
+ 湿度:{{GetDeviceDataAttr(device.number,'湿度','value')}}{{ GetDeviceDataAttr(device.number,'湿度','unit')}}
@@ -208,13 +208,13 @@
-
- {{GetDeviceDataAttr(device.number,'PM2.5','Description')}}
+
+ {{GetDeviceDataAttr(device.number,'PM2.5','description')}}
- PM2.5:{{GetDeviceDataAttr(device.number,'PM2.5','Value')}}{{ GetDeviceDataAttr(device.number,'PM2.5','Unit')}}
+ PM2.5:{{GetDeviceDataAttr(device.number,'PM2.5','value')}}{{ GetDeviceDataAttr(device.number,'PM2.5','unit')}}
@@ -227,13 +227,13 @@
-
- {{GetDeviceDataAttr(device.number,'光照度','Description')}}
+
+ {{GetDeviceDataAttr(device.number,'光照度','description')}}
- 光照 {{GetDeviceDataAttr(device.number,'光照度','Value')}}{{ GetDeviceDataAttr(device.number,'光照度','Unit')}}
+ 光照 {{GetDeviceDataAttr(device.number,'光照度','value')}}{{ GetDeviceDataAttr(device.number,'光照度','unit')}}
@@ -245,12 +245,12 @@
-

+
正常
- 红外 {{GetDeviceDataAttr(device.number,'状态','Value') }}
+ 红外 {{GetDeviceDataAttr(device.number,'状态','value') }}
@@ -262,12 +262,12 @@
-

+
正常
- 烟雾 {{GetDeviceDataAttr(device.number,'状态','Value') }}
+ 烟雾 {{GetDeviceDataAttr(device.number,'状态','value') }}
@@ -333,7 +333,7 @@