Merge branch 'feature/1124-sms' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TenantAlbumSheetController.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.service.TenantAlbumMusicService;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumMusicWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -40,6 +42,8 @@ public class TenantAlbumSheetController extends BaseController {
     private SysUserFeignService sysUserFeignService;
 
 
+    @Autowired
+    private TeacherService teacherService;
 
 
     @ApiOperation(value = "分页查询")
@@ -49,7 +53,9 @@ public class TenantAlbumSheetController extends BaseController {
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        query.setTenantId(Optional.ofNullable(user.getTenantId()).orElse(-1L));
+
+        Teacher teacher = teacherService.getById(user.getId());
+        query.setTenantId(Optional.ofNullable(teacher.getTenantId()).orElse(-1L));
         query.setClientType(ClientEnum.TEACHER);
         IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page = tenantAlbumMusicService.selectPage(QueryInfo.getPage(query), query);
         return succeed((PageUtil.pageInfo(page)));

cooleshow-common/src/main/java/com/yonge/cooleshow/common/service/impl/RedisIdGeneratorService.java

@@ -98,19 +98,20 @@ public class RedisIdGeneratorService implements IdGeneratorService {
 
 	@Override
 	public boolean verifyValidCode(String mobile, String authCode,String keyEnum) {
-		if (debugMode || this.authCode) {
-			if (defaultPwd.equals(authCode)) {
-				return true;
-			}
-		} else {
-			String key = "verificationCode" + keyEnum + mobile;
-			Object object = redisCache.get(key);
-			log.info("*********************mobile:{} smsCode:{} inutCode:{}******************", key, object, authCode);
-			String verifyCode = object == null ? null : object.toString();
-			if (StringUtils.isNoneEmpty(verifyCode) && StringUtils.equalsIgnoreCase(verifyCode, authCode)) {
-				return true;
-			}
+
+		// 本地调试模式
+		if ((debugMode || this.authCode) && StringUtils.equalsIgnoreCase(defaultPwd, authCode)) {
+			return true;
+		}
+
+		String key = "verificationCode" + keyEnum + mobile;
+		Object object = redisCache.get(key);
+		log.info("*********************mobile:{} smsCode:{} inutCode:{}******************", key, object, authCode);
+		String verifyCode = object == null ? null : object.toString();
+		if (StringUtils.isNoneEmpty(verifyCode) && StringUtils.equalsIgnoreCase(verifyCode, authCode)) {
+			return true;
 		}
+
 		return false;
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysMessageService.java

@@ -68,7 +68,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param mobileNOOrEmailAddr
 	 * @return
 	 */
-	public String getSendedVerificationCode(MessageTypeEnum type, String mobileNOOrEmailAddr);
+	String getSendedVerificationCode(MessageTypeEnum type, String mobileNOOrEmailAddr, String verifyCode);
 
 
 	/**

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SmsCodeServiceImpl.java

@@ -44,7 +44,9 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 		} else {
 			typeEnum  = MessageTypeEnum.SMS_VERIFY_CODE;
 		}
-		String verifyCode = sysMessageService.getSendedVerificationCode(typeEnum, mobile);
+		String verifyCode = sysMessageService.getSendedVerificationCode(typeEnum, mobile, authCode);
+
+		// 校验缓存中的验证码
 		if (StringUtils.isNoneEmpty(verifyCode) && StringUtils.equalsIgnoreCase(verifyCode, authCode)) {
 			return true;
 		}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMessageServiceImpl.java

@@ -308,10 +308,12 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		}
 
 		String key = getVerificationCodeCacheKey(messageType, receiver);
-		int code = DEFAULT_CODE;
+		// 生成验证码
+		int code = getRandomCode(messageType, receiver);
+		/*int code = DEFAULT_CODE;
 		if (debugMode == false && !authCode) {
 			code = getRandomCode(messageType, receiver);
-		}
+		}*/
 		Map<Long, String> receivers = new HashMap<>(1);
 		receivers.put(userId, receiver);
 		batchSendMessage(messageSender, messageType, receivers, null, 1, "","",platform, code);
@@ -326,10 +328,15 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public String getSendedVerificationCode(MessageTypeEnum type, String mobileNOOrEmailAddr) {
-		if (debugMode == true) {
-			return DEFAULT_CODE + "";
+	public String getSendedVerificationCode(MessageTypeEnum type, String mobileNOOrEmailAddr, String verifyCode) {
+
+		// 本地调试模式
+		String defaultVerifyCode = DEFAULT_CODE + "";
+		if (debugMode == true && StringUtils.equalsIgnoreCase(verifyCode, defaultVerifyCode)) {
+			return defaultVerifyCode;
 		}
+
+		// 返回缓存中的验证码
 		String key = getVerificationCodeCacheKey(type, mobileNOOrEmailAddr);
 		Object object = redisCache.get(key);
 		return object == null ? null : object.toString();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumMusicServiceImpl.java

@@ -109,7 +109,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         if (StringUtil.isEmpty(albumId)){
             Long tenantId = query.getTenantId();
             //查询机构专辑Id
-            List<TenantAlbumMusic> list = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantId, tenantId).list();
+            List<TenantAlbumMusic> list = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantId, tenantId).eq(TenantAlbumMusic::getDelFlag,false).list();
             if (CollectionUtils.isNotEmpty(list)){
                 TenantAlbumMusic albumMusic = list.get(0);
                  albumId = albumMusic.getTenantAlbumId().toString();