Merge branch 'dev'

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -2,6 +2,7 @@ package com.zhongzheng.controller.user;
 
 import cn.hutool.core.lang.Validator;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
@@ -134,8 +135,15 @@ public class UserController extends BaseController {
             vo.setEduPhone(tenant.getEduPhone());
             vo.setSlabSign(tenant.getSlabSign());
             vo.setStudentRestudy(tenant.getStudentRestudy());
+            if (ObjectUtils.isNotNull(tenant.getPwdCheckTime()) && tenant.getPwdCheckTime() > 0){
+                //判斷用戶是否需要修改密碼
+                Long time = ObjectUtils.isNotNull(vo.getPwdTime())?vo.getPwdTime():vo.getCreateTime();
+                Long dayAfter = DateUtils.getDayAfter(time, tenant.getPwdCheckTime());
+                if (dayAfter < DateUtils.getNowTime()){
+                    vo.setPwdSign(1);
+                }
+            }
         }
-
         bo.setUserId(loginUser.getUser().getUserId());
         iUserVisitLogService.insertByAddBo(bo);
         return AjaxResult.success(vo);

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -822,7 +822,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(bo.getPwd()==null){
             throw new CustomException("密码不能为空");
         }
-        if(!ToolsUtils.verifEasyPwd(bo.getPwd())){
+        if(!ToolsUtils.verifPwd(bo.getPwd())){
             throw new CustomException("密码应由8-16位数字、大小写字母、符号组成");
         }
         String key = Constants.REGISTER_SMS + bo.getTel();
@@ -1270,9 +1270,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
+        SysTenant tenant = iSysTenantService.getById(user.getTenantId());
         Map<String,Object> map = new HashMap<>();
         map.put(Constants.TOKEN,wxTokenService.createToken(loginUser));
         map.put("user_account",user.getUserAccount());
+        if (ObjectUtils.isNotNull(tenant.getPwdCheckTime()) && tenant.getPwdCheckTime() > 0){
+            //判斷用戶是否需要修改密碼
+            Long time = ObjectUtils.isNotNull(user.getPwdTime())?user.getPwdTime():user.getCreateTime();
+            Long dayAfter = DateUtils.getDayAfter(time, tenant.getPwdCheckTime());
+            if (dayAfter < DateUtils.getNowTime()){
+                map.put("pwd_sign",1);
+            }
+        }
         map.put("full_info",Validator.isEmpty(user.getIdCard())?false:true); //是否完善身份信息
         return map;
     }
@@ -1393,9 +1402,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
+        SysTenant tenant = iSysTenantService.getById(user.getTenantId());
         Map<String,Object> map = new HashMap<>();
         map.put(Constants.TOKEN,wxTokenService.createToken(loginUser));
         map.put("user_account",user.getUserAccount());
+        if (ObjectUtils.isNotNull(tenant.getPwdCheckTime()) && tenant.getPwdCheckTime() > 0){
+            //判斷用戶是否需要修改密碼
+            Long time = ObjectUtils.isNotNull(user.getPwdTime())?user.getPwdTime():user.getCreateTime();
+            Long dayAfter = DateUtils.getDayAfter(time, tenant.getPwdCheckTime());
+            if (dayAfter < DateUtils.getNowTime()){
+                map.put("pwd_sign",1);
+            }
+        }
         map.put("full_info",Validator.isEmpty(user.getIdCard())?false:true); //是否完善身份信息
         return map;
     }
@@ -1567,9 +1585,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
+        SysTenant tenant = iSysTenantService.getById(user.getTenantId());
         Map<String,Object> map = new HashMap<>();
         map.put(Constants.TOKEN,wxTokenService.createToken(loginUser));
         map.put("user_account",user.getUserAccount());
+        if (ObjectUtils.isNotNull(tenant.getPwdCheckTime()) && tenant.getPwdCheckTime() > 0){
+            //判斷用戶是否需要修改密碼
+            Long time = ObjectUtils.isNotNull(user.getPwdTime())?user.getPwdTime():user.getCreateTime();
+            Long dayAfter = DateUtils.getDayAfter(time, tenant.getPwdCheckTime());
+            if (dayAfter < DateUtils.getNowTime()){
+                map.put("pwd_sign",1);
+            }
+        }
         map.put("full_info",Validator.isEmpty(user.getIdCard())?false:true); //是否完善身份信息
         return map;
     }
@@ -2284,9 +2311,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
+        SysTenant tenant = iSysTenantService.getById(user.getTenantId());
         Map<String,Object> map = new HashMap<>();
         map.put(Constants.TOKEN,wxTokenService.createToken(loginUser));
         map.put("user_account",user.getUserAccount());
+        if (ObjectUtils.isNotNull(tenant.getPwdCheckTime()) && tenant.getPwdCheckTime() > 0){
+            //判斷用戶是否需要修改密碼
+            Long time = ObjectUtils.isNotNull(user.getPwdTime())?user.getPwdTime():user.getCreateTime();
+            Long dayAfter = DateUtils.getDayAfter(time, tenant.getPwdCheckTime());
+            if (dayAfter < DateUtils.getNowTime()){
+                map.put("pwd_sign",1);
+            }
+        }
         map.put("full_info",Validator.isEmpty(user.getIdCard())?false:true); //是否完善身份信息
         return map;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysTenant.java

@@ -123,4 +123,6 @@ private static final long serialVersionUID=1L;
     private Integer slabSign;
     /** 学员重学按钮: 1不显示 0显示*/
     private Integer studentRestudy;
+    /** 学员密码默认更改天数*/
+    private Integer pwdCheckTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/tencentcloud/service/impl/FaceOcrServiceImpl.java

@@ -331,6 +331,8 @@ public class FaceOcrServiceImpl implements IFaceOcrService {
             if(Validator.isEmpty(bo.getUrlA())||Validator.isEmpty(bo.getOneInchPhotos())){
                 throw new CustomException("参数错误");
             }
+            log.error("身份证照片路径:"+bo.getUrlA());
+            log.error("一寸照片:"+bo.getOneInchPhotos());
             String oneInchPhotos =bo.getOneInchPhotos();
             Credential cred = new Credential(SecretId, SecretKey);
             ClientProfile clientProfile = new ClientProfile();

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -321,6 +321,8 @@ public class UserVo {
 	private Integer slabSign;
 	@ApiModelProperty("学员重学按钮: 1不显示 0显示")
 	private Integer studentRestudy;
+	@ApiModelProperty("是否需要修改密碼: 1是 0否")
+	private Integer pwdSign;
 	public void setNull(){
 		this.setOpenId(null);
 /*		this.setIdCardImg1(null);

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -1144,8 +1144,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         class_grade_user cgu  LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
         LEFT JOIN goods g ON og.goods_id = g.goods_id
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
+        LEFT JOIN course_business cb ON g.business_id = cb.id
         WHERE
         1 = 1
+        AND cgu.`status` = 1
+        AND cb.`period_check_sign` = 1
         <if test="periodStatus != null">
             AND cgu.period_status = 1
         </if>
@@ -1764,4 +1767,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT * from class_grade where grade_id = #{gradeId}
     </select>
 
+
 </mapper>