update

TEAMModelBI/Controllers/LoginController.cs

@@ -181,15 +181,13 @@ namespace TEAMModelBI.Controllers
                         roles = !string.IsNullOrEmpty($"{item.roles}") ? new List<string>(item.roles.Split(",")) : new List<string>();
                         permissions = !string.IsNullOrEmpty($"{item.permissions}") ? new List<string>(item.permissions.Split(",")) : new List<string>();
                         if (item.depts.Contains($"{proDeptId}")) isExploit = true;
-                        if (item.deptId.Equals($"{proDeptId}")) isExploit = true;
-                        if (item.pid.Equals($"{proDeptId}")) isExploit = true;
+                        if (item.deptId == long.Parse($"{proDeptId}")) isExploit = true;
+                        if (item.pid == long.Parse($"{proDeptId}")) isExploit = true;
 
                         //自己写的
-                        id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, item.tmdId?.ToString(), item.tmdName?.ToString(), item.picture?.ToString(), _option.JwtSecretKey, scope: "assist", Website: "BI", item.RowKey?.ToString(), item.name?.ToString(), item.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray(), expire: 3);
+                        id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, item.tmdId?.ToString(), item.tmdName?.ToString(), item.picture?.ToString(), _option.JwtSecretKey, scope: "assist", Website: "BI", isex: isExploit.ToString(), item.RowKey?.ToString(), item.name?.ToString(), item.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray(), expire: 3);
 
                         (osblob_uri, osblob_sas) = roles.Contains("assist") ? _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete) : _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List);
-
-
                     }
                     if (saveInfo.Count > 0)
                     {
@@ -254,14 +252,17 @@ namespace TEAMModelBI.Controllers
 
                     roles = !string.IsNullOrEmpty($"{ddUserInfo.roles}") ? new List<string>(ddUserInfo.roles.Split(",")) : new List<string>();
                     permissions = !string.IsNullOrEmpty($"{ddUserInfo.permissions}") ? new List<string>(ddUserInfo.permissions.Split(",")) : new List<string>();
+                    if (ddUserInfo.depts.Contains($"{proDeptId}")) isExploit = true;
+                    if (ddUserInfo.deptId == long.Parse($"{proDeptId}")) isExploit = true;
+                    if (ddUserInfo.pid == long.Parse($"{proDeptId}")) isExploit = true;
 
                     //自己写的
-                    id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, ddUserInfo.tmdId?.ToString(), ddUserInfo.tmdName?.ToString(), ddUserInfo.picture?.ToString(), _option.JwtSecretKey, scope: "assist", Website: "BI", ddUserInfo.RowKey?.ToString(), ddUserInfo.name?.ToString(), ddUserInfo.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray(), expire: 3);
+                    id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, ddUserInfo.tmdId?.ToString(), ddUserInfo.tmdName?.ToString(), ddUserInfo.picture?.ToString(), _option.JwtSecretKey, scope: "assist", Website: "BI", isex: isExploit.ToString(), ddUserInfo.RowKey?.ToString(), ddUserInfo.name?.ToString(), ddUserInfo.avatar?.ToString(), roles: roles?.ToArray(), permissions: permissions?.ToArray(), expire: 3);
 
                     (osblob_uri, osblob_sas) = roles.Contains("assist") ? _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete) : _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List);
                 }
 
-                return Ok(new { state = 200, isExploit, ddUserInfos = ddusers, id_token, roles, permissions, osblob_uri, osblob_sas });
+                return Ok(new { state = 200, ddUserInfos = ddusers, id_token, roles, permissions, osblob_uri, osblob_sas });
             }
             catch (Exception ex)
             {

TEAMModelBI/appsettings.Development.json

@@ -60,6 +60,6 @@
   },
   "CustomParam": {
     "SiteScope": "continent", // Õ¾µã·¶Î§  continent ´ó·վ  international ¹ú¼ÊÕ¾
-    "proDeptId": "67690917"
+    "proDeptId": 67690917
   }
 }

TEAMModelBI/appsettings.json

@@ -70,6 +70,6 @@
   },
   "CustomParam": {
     "SiteScope": "continent", // Õ¾µã·¶Î§  continent ´ó·վ  international ¹ú¼ÊÕ¾
-    "proDeptId": "67690917"
+    "proDeptId": 67690917
   }
 }