Li 3 년 전
부모
커밋
960b3ae514
2개의 변경된 파일14개의 추가작업 그리고 13개의 파일을 삭제
  1. 2 2
      TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs
  2. 12 11
      TEAMModelBI/Tool/Extension/JwtAuth.cs

+ 2 - 2
TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -207,7 +207,7 @@ namespace TEAMModelBI.Controllers.BISchool
         /// <param name="school"></param>
         /// <param name="school"></param>
         /// <returns></returns>
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [ProducesDefaultResponseType]
-       // [AuthToken(Roles = "assist")]
+        [AuthToken(Roles = "assist")]
         [HttpPost("batch-school")]
         [HttpPost("batch-school")]
         public async Task<IActionResult> BatchCreateSchool(FoundSchools foundSchools)
         public async Task<IActionResult> BatchCreateSchool(FoundSchools foundSchools)
         {
         {
@@ -365,7 +365,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 await _azureStorage.SaveBILog("school-batchAdd", stringBuilder?.ToString(), _dingDing, httpContext: HttpContext);
                 await _azureStorage.SaveBILog("school-batchAdd", stringBuilder?.ToString(), _dingDing, httpContext: HttpContext);
 
 
                 if (schools.Count > 0)
                 if (schools.Count > 0)
-                    return Ok(new { state = 201, message = "已有部分学校批量创建成功;学校编号已经重复!请检查学校编号!", schools = schools });
+                    return Ok(new { state = 201, message = "已有部分学校批量创建成功;学校编号已经重复!请检查学校编号!", schools });
                 else
                 else
                     return Ok(new { state = 200, message = "批量创校已全部完成" });
                     return Ok(new { state = 200, message = "批量创校已全部完成" });
             }
             }

+ 12 - 11
TEAMModelBI/Tool/Extension/JwtAuth.cs

@@ -14,17 +14,17 @@ namespace TEAMModelBI.Models.Extension
         /// <param name="id">醍摩豆ID</param>
         /// <param name="id">醍摩豆ID</param>
         /// <param name="name">醍摩豆名称</param>
         /// <param name="name">醍摩豆名称</param>
         /// <param name="picture">醍摩豆头像</param>
         /// <param name="picture">醍摩豆头像</param>
-        /// <param name="did">钉钉</param>
-        /// <param name="dname"></param>
-        /// <param name="dpicture"></param>
-        /// <param name="salt"></param>
-        /// <param name="scope"></param>
-        /// <param name="Website"></param>
-        /// <param name="unitid"></param>
-        /// <param name="roles"></param>
-        /// <param name="permissions"></param>
+        /// <param name="did">钉钉Id</param>
+        /// <param name="dname">钉钉名称</param>
+        /// <param name="dpicture">钉钉头像</param>
+        /// <param name="salt">秘钥</param>
+        /// <param name="scope">范围</param>
+        /// <param name="Website">平台</param>
+        /// <param name="unitid">企业简码</param>
+        /// <param name="roles">角色</param>
+        /// <param name="permissions">权限</param>
         /// <param name="schools"></param>
         /// <param name="schools"></param>
-        /// <param name="expire"></param>
+        /// <param name="expire">到期时间</param>
         /// <returns></returns>
         /// <returns></returns>
         public static string CreateAuthTokenBI(string issuser, string id, string name, string picture, string did, string dname, string dpicture, string salt, string scope, string Website, string unitid = "", string[] roles = null, string[] permissions = null, string[] schools = null, int expire = 1)
         public static string CreateAuthTokenBI(string issuser, string id, string name, string picture, string did, string dname, string dpicture, string salt, string scope, string Website, string unitid = "", string[] roles = null, string[] permissions = null, string[] schools = null, int expire = 1)
         {
         {
@@ -41,7 +41,8 @@ namespace TEAMModelBI.Models.Extension
                 { "ddsub",did } ,  //登陆者的钉钉用户id
                 { "ddsub",did } ,  //登陆者的钉钉用户id
                 { "ddname",dname } ,  //登陆者的钉钉用户名称
                 { "ddname",dname } ,  //登陆者的钉钉用户名称
                 { "ddpicture",dpicture },  //登陆者的钉钉用户头像
                 { "ddpicture",dpicture },  //登陆者的钉钉用户头像
-                { "schools",schools}, //登陆者的授权学校
+                { "schools",schools}, //登陆者的授权
+                { "scope",scope}, //
                 { JwtRegisteredClaimNames.Website,Website}, // 平台站点
                 { JwtRegisteredClaimNames.Website,Website}, // 平台站点
             };
             };