update

Former-commit-id: 62cb3980fe855ab4181935fa68a165e7c8a1fee5
6 years ago · 4a7cad5546
parent 85ba73a77a
commit 4a7cad5546
6 changed files with 1138 additions and 13 deletions
--- a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
+++ b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
@ -11,5 +11,8 @@
  </ItemGroup>
   <ItemGroup>
    <EmbeddedResource Include="wwwroot\**\*" />
-  </ItemGroup>
+  </ItemGroup><ItemGroup>
+  <None Remove="wwwroot\index - 复制.html.meta" />
+  <None Remove="wwwroot\index2.html" />
+</ItemGroup>
 </Project>
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
@ -2,7 +2,6 @@
 <html lang="en">
 <head>
    <meta charset="UTF-8">
-    <!--<meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap: content:">-->
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui, viewport-fit=cover">
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="apple-mobile-web-app-status-bar-style" content="default">
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index2.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index2.html
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index2.html.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index2.html.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fd85ad0316efa844b871a737cee211f0
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/app.js
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/app.js
--- a/projects/UserCenter/Controllers/AccountController.cs
+++ b/projects/UserCenter/Controllers/AccountController.cs
@ -141,11 +141,7 @@ namespace UserCenter.Controllers
                            var result = new
                            {
                                Code = 0,
-                                Token = this._jwtHelper.GetToken(new Dictionary<string, object>() { { nameof(user.UserName), user.UserName } }),
-                                user.NickName,
-                                user.UserName,
-                                Title = this._cfg["name"],
-                                IoTServer = list.FirstOrDefault(o => o.Name == "物联网平台").Home
+                                Token = this._jwtHelper.GetToken(new Dictionary<string, object>() { { nameof(user.UserName), user.UserName } })
                            };
                            return Json(result);
                        }
@ -155,6 +151,19 @@ namespace UserCenter.Controllers
            }
        }

+        [AllowAnonymous]
+        public IActionResult GetUserInfo(string token)
+        {
+            var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString();
+            var user = this._userRepo.ReadOnlyTable().FirstOrDefault(o => o.UserName == userName);
+            return Json(new
+            {
+                Name = this._cfg["Name"],
+                user.UserName,
+                user.NickName
+            });
+        }
+
        [AllowAnonymous]
        public IActionResult LoginInternal(LoginModel model, bool isAppLogin, string returnUrl = null)
        {
@ -223,12 +232,8 @@ namespace UserCenter.Controllers
                                return Json(new
                                {
                                    Code = 0,
-                                    Token = this._jwtHelper.GetToken(new Dictionary<string, object>() { { nameof(user.UserName), user.UserName } }),
-                                    user.NickName,
-                                    Title = this._cfg["name"],
-                                    IoTServer = list.FirstOrDefault(o => o.Name == "物联网平台").Home
-                                }
-                                );
+                                    Token = this._jwtHelper.GetToken(new Dictionary<string, object>() { { nameof(user.UserName), user.UserName } })
+                                });
                            }
                            else
                            {