Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_2022-_0505

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

@@ -17,7 +17,6 @@ public class TenantPreJoinDto implements Serializable {
     @ApiModelProperty(value = "公司全称")
     private String tsignName;
 
-    @NotNull(message = "推荐人不能为空")
     @ApiModelProperty(value = "推荐人")
     private Integer recommender;
 
@@ -34,12 +33,9 @@ public class TenantPreJoinDto implements Serializable {
     @ApiModelProperty(value = "机构邮箱")
     private String email;
 
-    @Size(max = 13, message = "客服电话电话-手机号最高11位、座机号最高为13位,请核实后再填写!")
-    @Pattern(regexp = "^[0-9]*$", message = "客服电话只能填写数字！")
     @ApiModelProperty(value = "客服电话")
     private String customerServicePhone;
 
-    @NotBlank(message = "营业执照编码不能为空!")
     @ApiModelProperty(value = "营业执照编码")
     private String tsignCode;
 
@@ -61,21 +57,15 @@ public class TenantPreJoinDto implements Serializable {
     @ApiModelProperty(value = "企业负责人电话")
     private String enterpriseLiablePhone;
 
-    @NotBlank(message = "法人身份证正面照片不能为空!")
     @ApiModelProperty(value = "法人身份证正面照片地址")
     private String legalPersonIdFrontPic;
 
-    @NotBlank(message = "法人身份证反面照片不能为空!")
     @ApiModelProperty(value = "法人身份证反面照片地址")
     private String legalPersonIdReversePic;
 
-    @NotBlank(message = "项目负责人不能为空!")
     @ApiModelProperty(value = "项目负责人/机构联系人")
     private String contacts;
 
-    @NotBlank(message = "项目负责人电话电话不能为空!")
-    @Size(max = 11, message = "手机号最高11位请核实后再填写!")
-    @Pattern(regexp = "^[0-9]*$", message = "项目负责人电话电话只能填写数字！")
     @ApiModelProperty(value = "项目负责人电话/机构联系人电话")
     private String phone;
 
@@ -83,11 +73,9 @@ public class TenantPreJoinDto implements Serializable {
     @ApiModelProperty(value = "公司营业执照图片")
     private String tsignPic;
 
-    @NotBlank(message = "税务登记证照片不能为空!")
     @ApiModelProperty(value = "税务登记证照片地址")
     private String taxRegisterPic;
 
-    @NotBlank(message = "公司开户信息照片不能为空!")
     @ApiModelProperty(value = "公司开户信息照片地址")
     private String companyAccountInfoPic;
 
@@ -95,11 +83,9 @@ public class TenantPreJoinDto implements Serializable {
     @ApiModelProperty(value = "机构logo")
     private String logo;
 
-    @NotBlank(message = "企业公章图片不能为空!")
     @ApiModelProperty(value = "企业公章图片地址")
     private String corporateChops;
 
-    @NotBlank(message = "企业财务公章图片不能为空!")
     @ApiModelProperty(value = "企业财务公章图片地址")
     private String corporateFinanceChops;
 

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -493,7 +493,7 @@ public class RoomServiceImpl implements RoomService {
         }
 
         String leaveSuccessKey = "leaveRoomSuccess" + roomId + userId;
-        Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(leaveSuccessKey, roomId, 1l, TimeUnit.SECONDS);
+        Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(leaveSuccessKey, roomId, 10l, TimeUnit.SECONDS);
         log.info("leaveRoomSuccess: roomId={}, userId={},deviceNum={},aBoolean={}", roomId, userId, deviceNum, aBoolean);
         if (!aBoolean) {
             if (StringUtils.isNotEmpty(deviceNum)) {