Merge branch 'zx_saas_shortUrl' of http://git.dayaedu.com/yonge/mec into dev

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/ResourceServerConfig.java

@@ -28,7 +28,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .authorizeRequests().antMatchers(
                         "/task/**", "/user/updatePassword", "/user/noAuth/queryUserByPhone",
                         "/user/queryUserByPhone", "/user/queryClient", "/user/add",
-                        "/user/queryUserById/*","/open/qrcode/*",
+                        "/user/queryUserById/*","/open/**",
                         "/queryUserInfo","/api/queryUserInfo").hasIpAddress("0.0.0.0/0")
                 .anyRequest().authenticated().and().httpBasic();
     }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/OpenMutualTLSController.java

@@ -0,0 +1,25 @@
+package com.ym.mec.auth.web.controller;
+
+import com.microsvc.toolkit.common.response.template.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/open/mutualTLS")
+@Api(tags = "HTTPS双向认证")
+public class OpenMutualTLSController {
+
+    @ApiOperation(value = "HTTPS双向认证查询")
+    @GetMapping(value = "query")
+    public R<Boolean> queryByParamNameList() {
+        return R.from(true);
+    }
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkWrapper.java

@@ -97,6 +97,9 @@ public class CourseHomeworkWrapper {
         @ApiModelProperty(value = "上课结束时间")
         private String endClassTime;
 
+        @ApiModelProperty(value = "请假时间")
+        private String leaveTime;
+
         @ApiModelProperty(value = "班级名称")
         private String classGroupName;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentAttendance.java

@@ -82,6 +82,9 @@ public class StudentAttendance extends BaseEntity {
 	@ApiModelProperty(value = "状态（正常、旷课、请假、休学）",required = false)
 	private StudentAttendanceStatusEnum status;
 
+	@ApiModelProperty(value = "请假时间",required = false)
+	private Date leaveTime;
+
 	@ApiModelProperty(value = "是否回访）",required = false)
 	private YesOrNoEnum visitFlag = YesOrNoEnum.NO;
 
@@ -345,7 +348,15 @@ public class StudentAttendance extends BaseEntity {
 	public String getRemark(){
 		return this.remark;
 	}
-			
+
+	public Date getLeaveTime() {
+		return leaveTime;
+	}
+
+	public void setLeaveTime(Date leaveTime) {
+		this.leaveTime = leaveTime;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -404,6 +404,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
         studentAttendance.setCurrentClassTimes(0);
         studentAttendance.setRemark(remark);
         studentAttendance.setStatus(StudentAttendanceStatusEnum.LEAVE);
+        studentAttendance.setLeaveTime(date);
         studentAttendance.setUserId(userId);
         studentAttendance.setGroupType(courseSchedule.getGroupType());
         studentAttendance.setMusicGroupId(courseSchedule.getMusicGroupId());

mec-biz/src/main/resources/config/mybatis/StudentAttendanceMapper.xml

@@ -21,6 +21,7 @@
         <result column="teacher_id_" property="teacherId"/>
         <result column="sign_in_time_" property="signInTime"/>
         <result column="sign_out_time_" property="signOutTime"/>
+        <result column="leave_time_" property="leaveTime"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="visitFlag" property="visitFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" property="createTime"/>
@@ -61,24 +62,24 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentAttendance" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO student_attendance
-        (group_type_,music_group_id_,class_group_id_,course_schedule_id_,user_id_,teacher_id_,status_,create_time_,
+        (group_type_,music_group_id_,class_group_id_,course_schedule_id_,user_id_,teacher_id_,status_,leave_time_,create_time_,
         update_time_,remark_,current_class_times_,sign_in_time_,sign_out_time_,current_schedule_id_,visit_flag_,normal_remind_,tenant_id_,qualified_flag_)
         VALUES(#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{classGroupId},
-        #{courseScheduleId},#{userId},#{teacherId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),
+        #{courseScheduleId},#{userId},#{teacherId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{leaveTime},now(),now(),
         #{remark},#{currentClassTimes},#{signInTime},#{signOutTime},#{currentScheduleId},#{visitFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{normalRemind},#{tenantId},#{qualifiedFlag})
     </insert>
 
     <insert id="addStudentAttendances" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
       INSERT INTO student_attendance (group_type_, music_group_id_, class_group_id_, course_schedule_id_,
-      user_id_, teacher_id_, status_, create_time_,update_time_, remark_ ,current_class_times_,sign_in_time_,
+      user_id_, teacher_id_, status_,leave_time_, create_time_,update_time_, remark_ ,current_class_times_,sign_in_time_,
                                       sign_out_time_,current_schedule_id_,visit_flag_,normal_remind_,tenant_id_)
       VALUES
 	  <foreach collection="list" item="studentAttendance" separator=",">
           (#{studentAttendance.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
           #{studentAttendance.musicGroupId},#{studentAttendance.classGroupId},#{studentAttendance.courseScheduleId},
           #{studentAttendance.userId},#{studentAttendance.teacherId},
-          #{studentAttendance.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),#{studentAttendance.updateTime},
+          #{studentAttendance.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{leaveTime},now(),#{studentAttendance.updateTime},
           #{studentAttendance.remark},#{studentAttendance.currentClassTimes},
           #{studentAttendance.signInTime},#{studentAttendance.signOutTime},#{studentAttendance.currentScheduleId},
            #{studentAttendance.visitFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -102,6 +103,9 @@
             <if test="signOutTime != null">
                 sign_out_time_ = #{signOutTime},
             </if>
+            <if test="leaveTime != null">
+                leave_time_ = #{leaveTime},
+            </if>
             <if test="signInTime != null">
                 sign_in_time_ = #{signInTime},
             </if>
@@ -768,7 +772,7 @@
     </select>
     <select id="queryStudentLeave"
             resultType="com.ym.mec.biz.dal.dto.CourseHomeworkWrapper$StudentLeaveResult">
-        select cs.class_date_ classDate,cs.start_class_time_ startClassTime,cs.end_class_time_ endClassTime,
+        select cs.class_date_ classDate,cs.start_class_time_ startClassTime,cs.end_class_time_ endClassTime,sa.leave_time_ leaveTime,
                cg.name_ classGroupName,cs.type_ courseScheduleType,sa.remark_ remark,su.username_ username from student_attendance sa
         left join course_schedule cs ON cs.id_ = sa.course_schedule_id_
         left join class_group cg ON cg.id_ = cs.class_group_id_

mec-common/common-core/src/main/java/com/ym/mec/common/security/BaseAuthenticationEntryPoint.java

@@ -39,7 +39,7 @@ public class BaseAuthenticationEntryPoint implements AuthenticationEntryPoint {
 			errorCode = HttpServletResponse.SC_FORBIDDEN;
 		}
 
-		HttpResponseResult result = new HttpResponseResult(false, errorCode, null, e.getMessage());
+		HttpResponseResult result = new HttpResponseResult(false, errorCode, null, "登录过期，请重新登录");
 
 		ObjectMapper objectMapper = new ObjectMapper();