From f13a20a0eb44ed9513db7b5bfb4886c93f3b9abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Fri, 5 Dec 2025 17:18:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=9C=AA=E8=83=BD?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=A6=E6=A0=A1=E5=AD=A6=E7=94=9F=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=97=B6=E6=9C=AA=E6=B7=BB=E5=8A=A0=E5=B9=B4=E7=BA=A7?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learn.Archives.API/appsettings.Production.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learn.Archives.API/appsettings.Production.json b/Learn.Archives.API/appsettings.Production.json index 2f0a12c..26a7f01 100644 --- a/Learn.Archives.API/appsettings.Production.json +++ b/Learn.Archives.API/appsettings.Production.json @@ -8,7 +8,7 @@ "AppConfig": { "ID": 2, //程序唯一值 "Redis": { - "ConnectionString": "r-2vc07uq6kgm580hxeu.redis.cn-chengdu.rds.aliyuncs.com:6379,password=r-2vc07uq6kgm580hxeu:JyFQa8MeZ4ndxVbdhUc6,defaultDatabase=3" + "ConnectionString": "yxjy-redis-in.23544.com:6379,password=MY50BKM1i3z8Vcz6V7c2,defaultDatabase=60", }, "DB": { "ConnectionString": "AllowLoadLocalInfile=true;Server=rm-2vc20nd3d11g0oh6g2o.rwlb.cn-chengdu.rds.aliyuncs.com;User ID=marking;Password=poiuytPOIUYT098765)(*&^%;Port=3306;Database=learn.archives;CharSet=utf8mb4;pooling=true;SslMode=None", From f40f094139694bb564bba9071197ca7ec11b137e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Fri, 5 Dec 2025 17:19:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=9C=AA=E8=83=BD?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=A6=E6=A0=A1=E5=AD=A6=E7=94=9F=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=97=B6=E6=9C=AA=E6=B7=BB=E5=8A=A0=E5=B9=B4=E7=BA=A7?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learn.Archives.API/Controllers/ExamClassInfoController.cs | 4 ++-- Learn.Archives.API/appsettings.Production.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Learn.Archives.API/Controllers/ExamClassInfoController.cs b/Learn.Archives.API/Controllers/ExamClassInfoController.cs index e3f022b..aed1949 100644 --- a/Learn.Archives.API/Controllers/ExamClassInfoController.cs +++ b/Learn.Archives.API/Controllers/ExamClassInfoController.cs @@ -100,7 +100,7 @@ namespace Learn.Archives.API.Controllers !p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState) .Select((s, c, p, pr, u) => new { - Name = c.Name + u.RealName, + Name =p.GradeLevel+p.GraduationYear.ToString()+ c.Name + u.RealName, u.Id, }).ToDictionaryAsync(s => s.Name, s => s.Id); //处理学生成绩数据 @@ -122,7 +122,7 @@ namespace Learn.Archives.API.Controllers errorExcelInfo.Add(s); return null; } - var name = s.Class + s.Student; + var name = grade.GradeLevel+ grade.GradeYear+ s.Class + s.Student; if (!userDic.ContainsKey(name)) { s.Error = "未能匹配到年级班级下对应的学生"; diff --git a/Learn.Archives.API/appsettings.Production.json b/Learn.Archives.API/appsettings.Production.json index 26a7f01..2f0a12c 100644 --- a/Learn.Archives.API/appsettings.Production.json +++ b/Learn.Archives.API/appsettings.Production.json @@ -8,7 +8,7 @@ "AppConfig": { "ID": 2, //程序唯一值 "Redis": { - "ConnectionString": "yxjy-redis-in.23544.com:6379,password=MY50BKM1i3z8Vcz6V7c2,defaultDatabase=60", + "ConnectionString": "r-2vc07uq6kgm580hxeu.redis.cn-chengdu.rds.aliyuncs.com:6379,password=r-2vc07uq6kgm580hxeu:JyFQa8MeZ4ndxVbdhUc6,defaultDatabase=3" }, "DB": { "ConnectionString": "AllowLoadLocalInfile=true;Server=rm-2vc20nd3d11g0oh6g2o.rwlb.cn-chengdu.rds.aliyuncs.com;User ID=marking;Password=poiuytPOIUYT098765)(*&^%;Port=3306;Database=learn.archives;CharSet=utf8mb4;pooling=true;SslMode=None", From e0fdc8c6c362f7ec519fafcafdca058ff3f4b026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Fri, 5 Dec 2025 19:00:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=97=B6=E5=B9=B4=E7=BA=A7=E5=88=97=E5=80=BC?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C=20=E4=BF=AE=E5=A4=8D=20master?= =?UTF-8?q?=E7=9A=84=E8=BF=9E=E6=8E=A5=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learn.Archives.API/Controllers/ExamClassInfoController.cs | 6 ++++++ Learn.Archives.API/appsettings.Production.json | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Learn.Archives.API/Controllers/ExamClassInfoController.cs b/Learn.Archives.API/Controllers/ExamClassInfoController.cs index aed1949..b93c4e9 100644 --- a/Learn.Archives.API/Controllers/ExamClassInfoController.cs +++ b/Learn.Archives.API/Controllers/ExamClassInfoController.cs @@ -115,6 +115,12 @@ namespace Learn.Archives.API.Controllers return null; } var grade = GradeHelper.GetStudentGradeBaseByGrade(s.Grade); + if (grade is null) + { + s.Error = "未能识别有效的年级!"; + errorExcelInfo.Add(s); + return null; + } var sub = ImportExamInfoSubjectDic(s); if(sub is null) { diff --git a/Learn.Archives.API/appsettings.Production.json b/Learn.Archives.API/appsettings.Production.json index 2f0a12c..4e4fca1 100644 --- a/Learn.Archives.API/appsettings.Production.json +++ b/Learn.Archives.API/appsettings.Production.json @@ -8,12 +8,12 @@ "AppConfig": { "ID": 2, //程序唯一值 "Redis": { - "ConnectionString": "r-2vc07uq6kgm580hxeu.redis.cn-chengdu.rds.aliyuncs.com:6379,password=r-2vc07uq6kgm580hxeu:JyFQa8MeZ4ndxVbdhUc6,defaultDatabase=3" + + "ConnectionString": "archives-redis-in.23544.com:6379,password=MY50BKM1i3z8Vcz6V7c2,defaultDatabase=61" }, "DB": { - "ConnectionString": "AllowLoadLocalInfile=true;Server=rm-2vc20nd3d11g0oh6g2o.rwlb.cn-chengdu.rds.aliyuncs.com;User ID=marking;Password=poiuytPOIUYT098765)(*&^%;Port=3306;Database=learn.archives;CharSet=utf8mb4;pooling=true;SslMode=None", - //"ConnectionString": "AllowLoadLocalInfile=true;Server=usercenter-mysql.23544.com;User ID=usercenter;Password=MPsSSNuvFO7wBqADXC9zweh9tdOPNwm6;Port=3306;Database=learn.archives;CharSet=utf8mb4;pooling=true;SslMode=None", - + //"ConnectionString": "AllowLoadLocalInfile=true;Server=rm-2vc20nd3d11g0oh6g2o.rwlb.cn-chengdu.rds.aliyuncs.com;User ID=marking;Password=poiuytPOIUYT098765)(*&^%;Port=3306;Database=learn.archives;CharSet=utf8mb4;pooling=true;SslMode=None", + "ConnectionString": "AllowLoadLocalInfile=true;Server=archives-mysql-in.23544.com;User ID=archives;Password=MPsSSNuvFO7wBqADXC9zweh9tdOPNwm6;Port=3306;Database=learn.archives;CharSet=utf8mb4;pooling=true;SslMode=None", "SqlType": "MySql", "UpdateTable": false