update

TEAMModelOS.Extension/IES.Exam/IES.ExamServer/Controllers/IndexController.cs

@@ -287,7 +287,7 @@ namespace IES.ExamServer.Controllers
                             randomCode = $"{random.Next(1000, 9999)}";
                             string? CenterUrl = _configuration.GetValue<string>("ExamServer:CenterUrl");
                             CenterUrl = CenterUrl.Equals("https://localhost:5001") ? "https://www.teammodel.cn" : CenterUrl;
-                            string content = $"{CenterUrl}/qrcodelogin?code=login:{school?.id}:{randomCode}&m=%E6%89%AB%E7%A0%81%E7%99%BB%E5%BD%95&o=1";
+                            string content = $"{CenterUrl}/qrcodelogin?randomcode=login:{school?.id}:{randomCode}&m=%E6%89%AB%E7%A0%81%E7%99%BB%E5%BD%95&o=1";
                             var str = QRCodeHelper.GenerateQRCode(content, 300, 300, QRCodeHelper.logo);
                             qrcode = $"data:image/png;base64,{str}";
                             return Ok(new { code = 200, randomCode = randomCode, qrcode, type });
@@ -299,7 +299,7 @@ namespace IES.ExamServer.Controllers
                             randomCode = $"{random.Next(1000, 9999)}";
                             string? CenterUrl = _configuration.GetValue<string>("ExamServer:CenterUrl");
                             CenterUrl = CenterUrl.Equals("https://localhost:5001") ? "https://www.teammodel.cn" : CenterUrl;
-                            string content = $"{CenterUrl}/qrcodelogin?code=login:{school?.id}:{randomCode}&m=%E6%89%AB%E7%A0%81%E7%99%BB%E5%BD%95&o=1";
+                            string content = $"{CenterUrl}/qrcodelogin?code=randomcode:{school?.id}:{randomCode}&m=%E6%89%AB%E7%A0%81%E7%99%BB%E5%BD%95&o=1";
                             Bitmap qrCodeImage = QRCodeHelper.GetBitmap(content, 200, 200);
                             using (MemoryStream stream = new MemoryStream())
                             {

TEAMModelOS/Controllers/Client/HiTAControlller.cs

@@ -90,7 +90,9 @@ namespace TEAMModelOS.Controllers.Client
             public string school { get; set; }
             public long ts { get; set; }
             public string id_token { get; set; }
+            public string randomcode { get; set; }
             public string code { get; set; }
+
         }
         /// <summary>
         /// 

TEAMModelOS/Controllers/System/CoreController.cs

@@ -437,21 +437,21 @@ namespace TEAMModelOS.Controllers
                 }
                 //await _dingDing.SendBotMsg(join.ToJsonString()+ dict.ToJsonString(), GroupNames.成都开发測試群組);
 
-                if (!string.IsNullOrWhiteSpace(join.id_token) && !string.IsNullOrWhiteSpace(join.school) && join.school.Contains("login:"))
+                if (!string.IsNullOrWhiteSpace(join.id_token) && !string.IsNullOrWhiteSpace(join.randomcode) && join.randomcode.Contains("login:"))
                 {
                     var jwt = new JwtSecurityToken(join.id_token);
                     //await _dingDing.SendBotMsg(join.ToJsonString(), GroupNames.成都开发測試群組);
                     var id = jwt.Payload.Sub;
-                    await _azureRedis.GetRedisClient(8).StringSetAsync($"HiTA:Login:{join.school.Replace("login:", "")}", id, expiry: new TimeSpan(0, 0, 30));
-                    return Ok(new { name = "关闭弹窗以获取登录信息" });
+                    await _azureRedis.GetRedisClient(8).StringSetAsync($"HiTA:Login:{join.randomcode.Replace("login:", "")}", id, expiry: new TimeSpan(0, 0, 30));
+                    return Ok(new { msg = "关闭弹窗以获取登录信息" ,code=200});
                 }
-                else { return Ok(new { error = 400, msg = "参数错误" }); }
+                else { return Ok(new { code = 400, msg = "参数错误" }); }
                 
             }
             catch (Exception ex)
             {
                 await _dingDing.SendBotMsg($"{ex.Message},{ex.StackTrace}", GroupNames.成都开发測試群組);
-                return Ok(new { error = 400, msg = "参数错误" });
+                return Ok(new { code = 500, msg = "参数错误" });
             }
         }
 
@@ -466,10 +466,10 @@ namespace TEAMModelOS.Controllers
             }
             string tmdid = string.Empty;
             string school = join.school;
-            if (!string.IsNullOrWhiteSpace(join.code)&& !string.IsNullOrWhiteSpace(school))
+            if (!string.IsNullOrWhiteSpace(join.randomcode)&& !string.IsNullOrWhiteSpace(school))
             {
                 
-                var data = await _azureRedis.GetRedisClient(8).StringGetAsync($"HiTA:Login:{school}:{join.code}");
+                var data = await _azureRedis.GetRedisClient(8).StringGetAsync($"HiTA:Login:{school}:{join.randomcode}");
                 if (data.HasValue)
                 {
                     tmdid = data.ToString();