Merge remote-tracking branch 'origin/master'

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentAttendanceServiceImpl.java

@@ -102,7 +102,7 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM
             return PageResponse.errorParam();
         }
         Page<StudentAttendanceResp> pageResult = new Page<>();
-        Page<StudentAttendance> studentAttendancePage = new Page<>(courseScheduleReq.getPageNo(), courseScheduleReq.getPageSize());
+        Page<StudentAttendance> studentAttendancePage = new Page<StudentAttendance>(courseScheduleReq.getPageNo(), courseScheduleReq.getPageSize());
         QueryWrapper<StudentAttendance> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(true, StudentAttendance::getCourseScheduleId, courseScheduleReq.getCourseScheduleId());
         IPage<StudentAttendance> page = page(studentAttendancePage, queryWrapper);
@@ -131,7 +131,7 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM
         if (Objects.isNull(courseScheduleReq.getCourseScheduleId())) {
             PageResponse.errorParam();
         }
-        Page<ClassGroupStudentMapper> classGroupStudentMapperPage = new Page<>(courseScheduleReq.getPageNo(), courseScheduleReq.getPageSize());
+        Page<ClassGroupStudentMapper> classGroupStudentMapperPage = new Page<ClassGroupStudentMapper>(courseScheduleReq.getPageNo(), courseScheduleReq.getPageSize());
         Page<StudentAttendanceStatisticsResp> pageResult = new Page();
         CourseSchedule courseSchedule = courseScheduleService.getById(courseScheduleReq.getCourseScheduleId());
         if (Objects.nonNull(courseSchedule)) {

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -27,18 +27,19 @@ import com.timevale.esign.sdk.tech.service.UserSignService;
 import com.timevale.esign.sdk.tech.v3.client.ServiceClient;
 import com.timevale.esign.sdk.tech.v3.client.ServiceClientManager;
 import com.timevale.tech.sdk.bean.ProjectConfig;
+import com.ym.mec.thirdparty.eseal.ESealPlugin;
 import com.ym.mec.thirdparty.exception.ThirdpartyException;
 
 @Service
-public class TsignPlugin implements InitializingBean, DisposableBean {
+public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBean {
 
-	@Value("${eseal.tsign.projectid:1}")
+	@Value("${eseal.tsign.projectid:1111563517}")
 	public String projectId; // = "1111563517";
 
-	@Value("${eseal.tsign.projectSecret:1}")
+	@Value("${eseal.tsign.projectSecret:95439b0863c241c63a861b87d1e647b7}")
 	public String projectSecret; // = "95439b0863c241c63a861b87d1e647b7";
 
-	@Value("${eseal.tsign.apisUrl:1}")
+	@Value("${eseal.tsign.apisUrl:http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2}")
 	public String apisUrl; // = "http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2";
 
 	private ServiceClient serviceClient;