错误调整 ，BaseController 移除方法

TEAMModelGrpc/Services/ClassroomStudentService.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using TEAMModelGrpc.Models;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models.StudentInfo;
 
 namespace TEAMModelGrpc.Services
 {

TEAMModelGrpc/Services/CourseService.cs

@@ -6,8 +6,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using TEAMModelGrpc.Models;
+using TEAMModelOS.Models.SchoolInfo;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models;
 
 namespace TEAMModelGrpc.Services
 {

TEAMModelGrpc/Services/HomeWorkService.cs

@@ -10,7 +10,9 @@ using TEAMModelOS.Models;
 using TEAMModelOS.SDK.Context.Exception;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models.StudentInfo;
+using TEAMModelOS.Models.Dto;
+using TEAMModelOS.Models.TeacherInfo;
 
 namespace TEAMModelGrpc.Services
 {

TEAMModelGrpc/TEAMModelOS.GRPC.xml

@@ -206,7 +206,7 @@
             数据状态
             </summary>
         </member>
-        <member name="M:TEAMModelGrpc.Services.ClassroomService.SaveOrUpdateVolume(Grpc.Core.IAsyncStreamReader{TEAMModelOS.Service.Models.Classroom},Grpc.Core.IServerStreamWriter{TEAMModelOS.Service.Models.Classroom},Grpc.Core.ServerCallContext)">
+        <member name="M:TEAMModelGrpc.Services.ClassroomService.SaveOrUpdateVolume(Grpc.Core.IAsyncStreamReader{TEAMModelOS.Models.SchoolInfo.Classroom},Grpc.Core.IServerStreamWriter{TEAMModelOS.Models.SchoolInfo.Classroom},Grpc.Core.ServerCallContext)">
             <summary>
             保存教室
             </summary>
@@ -215,7 +215,7 @@
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:TEAMModelGrpc.Services.ClassroomService.FindVolume(TEAMModelGrpc.Models.Dict,Grpc.Core.IServerStreamWriter{TEAMModelOS.Service.Models.Classroom},Grpc.Core.ServerCallContext)">
+        <member name="M:TEAMModelGrpc.Services.ClassroomService.FindVolume(TEAMModelGrpc.Models.Dict,Grpc.Core.IServerStreamWriter{TEAMModelOS.Models.SchoolInfo.Classroom},Grpc.Core.ServerCallContext)">
             <summary>
             查询教室
             </summary>
@@ -232,7 +232,7 @@
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:TEAMModelGrpc.Services.ClassStudentService.SaveOrUpdateClassStudent(Grpc.Core.IAsyncStreamReader{TEAMModelOS.Service.Models.ClassStudent},Grpc.Core.IServerStreamWriter{TEAMModelOS.Service.Models.ClassStudent},Grpc.Core.ServerCallContext)">
+        <member name="M:TEAMModelGrpc.Services.ClassStudentService.SaveOrUpdateClassStudent(Grpc.Core.IAsyncStreamReader{TEAMModelOS.Models.StudentInfo.ClassStudent},Grpc.Core.IServerStreamWriter{TEAMModelOS.Models.StudentInfo.ClassStudent},Grpc.Core.ServerCallContext)">
             <summary>
             保存 或 修改 教室学生关联
             </summary>
@@ -241,7 +241,7 @@
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:TEAMModelGrpc.Services.ClassStudentService.FindStudents(TEAMModelGrpc.Models.StringDto,Grpc.Core.IServerStreamWriter{TEAMModelOS.Service.Models.ClassStudent},Grpc.Core.ServerCallContext)">
+        <member name="M:TEAMModelGrpc.Services.ClassStudentService.FindStudents(TEAMModelGrpc.Models.StringDto,Grpc.Core.IServerStreamWriter{TEAMModelOS.Models.StudentInfo.ClassStudent},Grpc.Core.ServerCallContext)">
             <summary>
             查询学生在哪些教室
             </summary>
@@ -250,7 +250,7 @@
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:TEAMModelGrpc.Services.CourseService.FindCourseByDict(TEAMModelGrpc.Models.Dict,Grpc.Core.IServerStreamWriter{TEAMModelOS.Service.Models.Course},Grpc.Core.ServerCallContext)">
+        <member name="M:TEAMModelGrpc.Services.CourseService.FindCourseByDict(TEAMModelGrpc.Models.Dict,Grpc.Core.IServerStreamWriter{TEAMModelOS.Models.SchoolInfo.Course},Grpc.Core.ServerCallContext)">
             <summary>
             查询课程
             </summary>
@@ -259,7 +259,7 @@
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:TEAMModelGrpc.Services.CourseService.SaveCourse(Grpc.Core.IAsyncStreamReader{TEAMModelOS.Service.Models.Course},Grpc.Core.IServerStreamWriter{TEAMModelOS.Service.Models.Course},Grpc.Core.ServerCallContext)">
+        <member name="M:TEAMModelGrpc.Services.CourseService.SaveCourse(Grpc.Core.IAsyncStreamReader{TEAMModelOS.Models.SchoolInfo.Course},Grpc.Core.IServerStreamWriter{TEAMModelOS.Models.SchoolInfo.Course},Grpc.Core.ServerCallContext)">
             <summary>
             保存课程
             </summary>
@@ -276,7 +276,7 @@
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:TEAMModelGrpc.Services.HomeWorkService.StudentScoring(TEAMModelOS.Models.HomeworkCommentDto,Grpc.Core.ServerCallContext)">
+        <member name="M:TEAMModelGrpc.Services.HomeWorkService.StudentScoring(TEAMModelOS.Models.Dto.HomeworkCommentDto,Grpc.Core.ServerCallContext)">
             <summary>
             学生作业打分评论
             </summary>
@@ -284,7 +284,7 @@
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:TEAMModelGrpc.Services.HomeWorkService.TeacherScoring(TEAMModelOS.Models.HomeworkScoringDto,Grpc.Core.ServerCallContext)">
+        <member name="M:TEAMModelGrpc.Services.HomeWorkService.TeacherScoring(TEAMModelOS.Models.Dto.HomeworkScoringDto,Grpc.Core.ServerCallContext)">
             <summary>
             教师作业打分评论
             </summary>
@@ -292,7 +292,7 @@
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:TEAMModelGrpc.Services.HomeWorkService.FindTeacherComments(TEAMModelGrpc.Models.Dict,Grpc.Core.IServerStreamWriter{TEAMModelOS.Service.Models.Comment},Grpc.Core.ServerCallContext)">
+        <member name="M:TEAMModelGrpc.Services.HomeWorkService.FindTeacherComments(TEAMModelGrpc.Models.Dict,Grpc.Core.IServerStreamWriter{TEAMModelOS.Models.TeacherInfo.Comment},Grpc.Core.ServerCallContext)">
             <summary>
             查询教师评语罐头
             </summary>

TEAMModelOS/Controllers/BaseController.cs

@@ -15,62 +15,6 @@ namespace TEAMModelOS.Controllers
 {
     public class BaseController : ControllerBase
     {
-        public List<string> GetLoginUser(string claimType)
-        {
-            //var tokenHeader = "";
-            //HttpRequest request = HttpContext.Request;
-            //if (request.Headers.ContainsKey(Constants.AUTHORIZATION))
-            //{
-            //    tokenHeader = request.Headers[Constants.AUTHORIZATION];
-            //    //tokenHeader = tokenHeader.ToString().Substring("Bearer ".Length).Trim();
-            //    tokenHeader = tokenHeader.Replace("Bearer ", "");
-            //}
-            //if (request.Query.ContainsKey(Constants.ACCESS_TOKEN))
-            //{
-            //    tokenHeader = request.Query[Constants.ACCESS_TOKEN];
-            //    tokenHeader = tokenHeader.Trim();
-            //}
-            //if (string.IsNullOrEmpty(tokenHeader))
-            //{
-            //    return null;
-            //}
-            //ClaimModel claimModel = JwtHelper.SerializeJWT(tokenHeader);
-            //claimModel.Claim.TryGetValue(claimType, out var claimValue);
-            //List<string> claimValues = new List<string>();
-            //foreach (Claim claim in claimModel.Claims)
-            //{
-            //    if (claim.Type.Equals(claimType))
-            //    {
-            //        claimValues.Add(claim.Value);
-            //    }
-            //}
-            //return claimValues;
-            return null;
-        }
-
-        public static bool ValidateIdToken(string token, string salt)
-        {
-            try
-            {
-                var handler = new JwtSecurityTokenHandler();
-                var validationParameters = new TokenValidationParameters
-                {
-                    RequireExpirationTime = true,
-                    ValidateIssuer = false,
-                    ValidateAudience = false,
-                    IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(salt)),
-                    ValidateLifetime = false,
-                    //LifetimeValidator = LifetimeValidator,
-                    ClockSkew = TimeSpan.Zero
-                };
-                ClaimsPrincipal principal = handler.ValidateToken(token, validationParameters, out SecurityToken securityToken);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Trace.WriteLine(ex.Message);
-                return false;
-            }
-        }
+       
     }
 }

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -143,7 +143,7 @@ namespace TEAMModelOS.Controllers.Client
         public async Task<IActionResult> GetSchoolInfo(JsonElement requert)
         {
             var (id, school) = HttpContext.GetAuthTokenInfo(); //此API有設置權杖，需要取得權杖使用者id及當前學校代碼(學校不一定有)
-
+            
             if (!requert.TryGetProperty("id_token", out JsonElement id_token)) return BadRequest();
             //if (!requert.TryGetProperty("school_code", out JsonElement school_code)) return BadRequest();
             var jwt = new JwtSecurityToken(id_token.GetString());

TEAMModelOS/TEAMModelOS.csproj

@@ -45,6 +45,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="Controllers\Common\" />
     <Folder Include="JwtRsaFile\" />
     <Folder Include="logfile\" />
     <Folder Include="wwwroot\" />