修改角色

TEAMModelOS.Service/Core/Implements/LoginInfoService.cs

@@ -18,6 +18,7 @@ using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
 using TEAMModelOS.SDK.Extension.HttpClient.Implements;
 using TEAMModelOS.SDK.Extension.JwtAuth.JwtHelper;
 using TEAMModelOS.SDK.Extension.JwtAuth.Models;
+using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Helper.Common.DateTimeHelper;
 using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using TEAMModelOS.SDK.Helper.Network.HttpHelper;
@@ -153,55 +154,20 @@ namespace TEAMModelOS.Service.Core.Implements
         }
         public async Task<JwtResponse> CreateJwtToken(LoginInfo loginInfo)
         {
-            //List<RoleUser> roots = BaseConfigModel.Configuration.GetSection("RoleUser:Root").Get<List<RoleUser>>();
-            //List<RoleUser> admins = BaseConfigModel.Configuration.GetSection("RoleUser:Admin").Get<List<RoleUser>>();
-            //List<RoleUser> stewards = BaseConfigModel.Configuration.GetSection("RoleUser:Steward").Get<List<RoleUser>>();
-            //List<RoleUser> schools = BaseConfigModel.Configuration.GetSection("RoleUser:School").Get<List<RoleUser>>();
-            //string role = "";
-            //foreach (var roleUser in roots)
-            //{
-            //    if (roleUser.Phone.Equals(loginInfo.CountryCode + loginInfo.Phone))
-            //    {
-            //        role = role + "Root,";
-            //        break;
-            //    }
-            //}
-            //foreach (var roleUser in admins)
-            //{
-            //    if (roleUser.Phone.Equals(loginInfo.CountryCode + loginInfo.Phone))
-            //    {
-            //        role = role + "Admin,";
-            //        break;
-            //    }
-            //}
-            //foreach (var roleUser in stewards)
-            //{
-            //    if (roleUser.Phone.Equals(loginInfo.CountryCode + loginInfo.Phone))
-            //    {
-            //        role = role + "Steward,";
-            //        break;
-            //    }
-            //}
-            //foreach (var roleUser in schools)
-            //{
-            //    if (roleUser.Phone.Equals(loginInfo.CountryCode + loginInfo.Phone))
-            //    {
-            //        role = role + "School,";
-            //        break;
-            //    }
-            //}
-            //role = role + "Teacher";
-
             Dictionary<string, object> dict = new Dictionary<string, object>
             {
-              //  { "Phone", loginInfo.CountryCode + loginInfo.Phone },
-                { "TeamModelId", loginInfo.CountryCode + loginInfo.TeamModelId }
+                { "Phone", loginInfo.CountryCode + loginInfo.Phone },
+                { "TeamModelId",  loginInfo.TeamModelId }
             };
             string role = "";
             List<RoleUser> roleUsers = await _repository.FindListByDict<RoleUser>(dict);
-            // roleUsers.Select(x =>role=role+ x.RoleCode+",");
-            roleUsers.ForEach(x => role = role + x.RoleCode + ",");
-            role = role + "Teacher";
+            if (roleUsers.IsNotEmpty()) {
+                foreach (RoleUser roleUser in roleUsers)
+                {
+                    role = role + roleUser.RoleCode + ",";
+                }
+            }
+            role= role.Substring(0, role.Length - 1);
             ClaimModel model = new ClaimModel
             {
                 Scope = "WebApp"

TEAMModelOS.Service/Core/Interfaces/ISchoolService.cs

@@ -15,6 +15,6 @@ namespace TEAMModelOS.Service.Core.Interfaces
         /// <param name="getSchool"></param>
         /// <returns></returns>
         Task<List<School>> GetSchool(SchoolCode schoolCode);
-        Task<Dictionary<string, object>> AuthorizedAISchoolAsync(Dictionary<string, object> @params);
+        Task<RoleUser> AuthorizedAISchoolAsync(Dictionary<string, object> @params);
     }
 }

TEAMModelOS/Controllers/Core/SchoolController.cs

@@ -49,8 +49,8 @@ namespace TEAMModelOS.Controllers.Core
         public async Task<BaseJosnRPCResponse> AuthorizedAISchool(JosnRPCRequest<Dictionary<string,object>> request)
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            Dictionary<string, object> schools = await _schoolInfoService.AuthorizedAISchoolAsync(request.@params);
-            builder.Data(schools);
+            RoleUser role = await _schoolInfoService.AuthorizedAISchoolAsync(request.@params);
+            builder.Data(role);
             return builder.build();
         }
 

TEAMModelOS/SeedData/SeedDataService.cs

@@ -52,8 +52,12 @@ namespace TEAMModelOS.SeedData
 
             List<RoleUser> deleteUsers = await _azureTableDBRepository.FindListByKey<RoleUser>("RoleCode", "Root");
             await _azureTableDBRepository.DeleteAll<RoleUser>(deleteUsers);
-           List<RoleUser> deleteAdmin = await _azureTableDBRepository.FindListByKey<RoleUser>("RoleCode", "Admin");
-           await _azureTableDBRepository.DeleteAll<RoleUser>(deleteAdmin);
+            List<RoleUser> deleteAdmin = await _azureTableDBRepository.FindListByKey<RoleUser>("RoleCode", "Admin");
+            await _azureTableDBRepository.DeleteAll<RoleUser>(deleteAdmin);
+            List<RoleUser> deleteTeacher = await _azureTableDBRepository.FindListByKey<RoleUser>("RoleCode", "Teacher");
+            await _azureTableDBRepository.DeleteAll<RoleUser>(deleteTeacher);
+            List<RoleUser> deleteSchoolAdmin = await _azureTableDBRepository.FindListByKey<RoleUser>("RoleCode", "SchoolAdmin");
+            await _azureTableDBRepository.DeleteAll<RoleUser>(deleteSchoolAdmin);
             List<RoleUser>  usersRoot = MessagePackHelper.JsonToObject<List<RoleUser>>(roots.ToJson());
             usersRoot.ForEach(m => {
                 m.RowKey = Guid.NewGuid().ToString();
@@ -69,11 +73,32 @@ namespace TEAMModelOS.SeedData
                 m.RowKey = Guid.NewGuid().ToString();
                 m.PartitionKey = "Admin";
                 m.RoleCode = "Admin";
-                m.RoleName = "超级管理员";
+                m.RoleName = "系统管理员";
                 m.SchoolCode = "default";
                 m.SchoolName = "默认学校";
             });
-           await _azureTableDBRepository.SaveOrUpdateAll<RoleUser>(usersAdmin);
+            await _azureTableDBRepository.SaveOrUpdateAll<RoleUser>(usersAdmin);
+            //RoleUser roleUser = new RoleUser { RowKey = Guid.NewGuid().ToString(), PartitionKey = "Teacher" ,RoleCode= "Teacher",RoleName= "任课教师", SchoolCode = "2151022409", SchoolName= "成都高新区芳草小学" };
+            List<RoleUser> usersTeacher = MessagePackHelper.JsonToObject<List<RoleUser>>(admins.ToJson());
+            usersTeacher.ForEach(m => {
+                m.RowKey = Guid.NewGuid().ToString();
+                m.PartitionKey = "Teacher";
+                m.RoleCode = "Teacher";
+                m.RoleName = "任课教师";
+                m.SchoolCode = "2151022409";
+                m.SchoolName = "成都高新区芳草小学";
+            });
+            await _azureTableDBRepository.SaveOrUpdateAll<RoleUser>(usersTeacher);
+            List<RoleUser> usersSchoolAdmin = MessagePackHelper.JsonToObject<List<RoleUser>>(admins.ToJson());
+            usersSchoolAdmin.ForEach(m => {
+                m.RowKey = Guid.NewGuid().ToString();
+                m.PartitionKey = "SchoolAdmin";
+                m.RoleCode = "SchoolAdmin";
+                m.RoleName = "学校管理员";
+                m.SchoolCode = "2151022409";
+                m.SchoolName = "成都高新区芳草小学";
+            });
+            await _azureTableDBRepository.SaveOrUpdateAll<RoleUser>(usersSchoolAdmin);
         }
 
         public void SeedRole() {

TEAMModelOS/Startup.cs

@@ -45,7 +45,7 @@ namespace TEAMModelOS
             //    options.MinimumSameSitePolicy = SameSiteMode.None;
             //});
             services.AddMvc(
-                option=> { option.Filters.Add<HttpGlobalExceptionFilter>(); }
+                //option=> { option.Filters.Add<HttpGlobalExceptionFilter>(); }
                 ).SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
             //上传文件最大处理
             services.Configure<FormOptions>(x =>