merge

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/SmsCodeController.java

@@ -37,8 +37,9 @@ public class SmsCodeController extends BaseController {
     @ApiImplicitParams({  @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
                           @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）", required = true, dataType = "String") })
     @PostMapping(value = "/sendSmsCode")
-    public Object sendLoginVerifyCode(String mobile,String type) throws Exception {
-        smsCodeService.sendValidCode(mobile, type, ClientEnum.SYSTEM);
+    public Object sendLoginVerifyCode(String mobile,String type,String code) throws Exception {
+
+        smsCodeService.sendValidCode(mobile, type, ClientEnum.SYSTEM,code);
         return succeed();
     }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/SmsCodeController.java

@@ -37,8 +37,8 @@ public class SmsCodeController extends BaseController {
     @ApiImplicitParams({  @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
                           @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）", required = true, dataType = "String") })
     @PostMapping(value = "/sendSmsCode")
-    public Object sendLoginVerifyCode(String mobile,String type) throws Exception {
-        smsCodeService.sendValidCode(mobile, type, ClientEnum.STUDENT);
+    public Object sendLoginVerifyCode(String mobile,String type,String code) throws Exception {
+        smsCodeService.sendValidCode(mobile, type, ClientEnum.STUDENT, code);
         return succeed();
     }
 

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

@@ -37,8 +37,8 @@ public class SmsCodeController extends BaseController {
     @ApiImplicitParams({  @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
                           @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号,LOGOFF:用户注销）", required = true, dataType = "String") })
     @PostMapping(value = "/sendSmsCode")
-    public Object sendLoginVerifyCode(String mobile,String type) throws Exception {
-        smsCodeService.sendValidCode(mobile, type, ClientEnum.TEACHER);
+    public Object sendLoginVerifyCode(String mobile,String type,String code) throws Exception {
+        smsCodeService.sendValidCode(mobile, type, ClientEnum.TEACHER, code);
         return succeed();
     }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/SmsCodeController.java

@@ -37,8 +37,8 @@ public class SmsCodeController extends BaseController {
     @ApiImplicitParams({  @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
                           @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号,LOGOFF:用户注销）", required = true, dataType = "String") })
     @PostMapping(value = "/sendSmsCode")
-    public Object sendLoginVerifyCode(String mobile,String type) throws Exception {
-        smsCodeService.sendValidCode(mobile, type, ClientEnum.TENANT);
+    public Object sendLoginVerifyCode(String mobile,String type,String code) throws Exception {
+        smsCodeService.sendValidCode(mobile, type, ClientEnum.TENANT, code);
         return succeed();
     }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -77,8 +77,8 @@ public class TenantInfoController extends BaseController {
             @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）", required =
                     true, dataType = "String")})
     @PostMapping(value = "/sendSmsCode")
-    public Object sendLoginVerifyCode(String mobile, String type) throws Exception {
-        smsCodeService.sendValidCode(mobile, type, ClientEnum.SYSTEM);
+    public Object sendLoginVerifyCode(String mobile, String type,String code) throws Exception {
+        smsCodeService.sendValidCode(mobile, type, ClientEnum.SYSTEM, code);
         return succeed();
     }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/website/controller/SmsCodeController.java

@@ -37,8 +37,8 @@ public class SmsCodeController extends BaseController {
     @ApiImplicitParams({@ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）", required = true, dataType = "String")})
     @PostMapping(value = "/sendSmsCode")
-    public Object sendLoginVerifyCode(String mobile, String type) throws Exception {
-        smsCodeService.sendValidCode(mobile, type, ClientEnum.WEBSITE);
+    public Object sendLoginVerifyCode(String mobile, String type,String code) throws Exception {
+        smsCodeService.sendValidCode(mobile, type, ClientEnum.WEBSITE, code);
         return succeed();
     }
 

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/SysConfigConstant.java

@@ -424,6 +424,11 @@ public interface SysConfigConstant {
      */
     String USER_MUSIC_VIDEO_DEFAULT_URL = "user_music_video_default_url";
 
+    /**
+     * sms_send_verify
+     */
+    String SMS_SEND_VERIFY = "sms_send_verify";
+
 
     /**
      * 草稿保存时长

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/SmsCodeController.java

@@ -40,8 +40,8 @@ public class SmsCodeController extends BaseController {
     @ApiImplicitParams({  @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
                           @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）", required = true, dataType = "String") })
     @PostMapping(value = "/sendSmsCode")
-    public Object sendLoginVerifyCode(String mobile,String type) throws Exception {
-        smsCodeService.sendValidCode(mobile, type, ClientEnum.SYSTEM);
+    public Object sendLoginVerifyCode(String mobile,String type,String code) throws Exception {
+        smsCodeService.sendValidCode(mobile, type, ClientEnum.SYSTEM, code);
         return succeed();
     }
 

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

@@ -17,5 +17,5 @@ public interface SmsCodeService {
 	 * 发送登录验证码
 	 * @return
 	 */
-	boolean sendValidCode(String mobile, String type, ClientEnum platform) throws Exception;
+	boolean sendValidCode(String mobile, String type, ClientEnum platform, String code) throws Exception;
 }

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

@@ -10,10 +10,13 @@ import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.SmsCodeService;
 import com.yonge.cooleshow.biz.dal.service.SysConfigService;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
+import com.yonge.cooleshow.common.constant.SysConfigConstant;
+import com.yonge.cooleshow.common.security.SecurityConstants;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -27,6 +30,8 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 	private SysUserFeignService sysUserFeignService;
 	@Autowired
 	private SysConfigService sysConfigService;
+    @Autowired
+    private RedisTemplate<String,String> redisTemplate;
 
 	@Override
 	public boolean verifyValidCode(String mobile, String authCode, String type) {
@@ -54,7 +59,22 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 	}
 
 	@Override
-	public boolean sendValidCode(String mobile, String type, ClientEnum platform) {
+	public boolean sendValidCode(String mobile, String type, ClientEnum platform, String code) {
+
+        String configValue = sysConfigService.findConfigValue(SysConfigConstant.SMS_SEND_VERIFY);
+        if(StringUtils.isNotEmpty(configValue) && "1".equals(configValue)) {
+            if (StringUtils.isEmpty(mobile) || StringUtils.isEmpty(code)) {
+                throw new BizException("图形验证码错误");
+            }
+            String redisKey = MessageTypeEnum.KAPTCHA_SESSION_KEY + mobile;
+            if (redisTemplate.hasKey(redisKey)) {
+                if (!StringUtils.equalsIgnoreCase(redisTemplate.opsForValue().get(redisKey), code)) {
+                    throw new BizException("图形验证码错误");
+                }
+            } else {
+                throw new BizException("图形验证码错误");
+            }
+        }
 		//SMS_VERIFY_CODE_LOGOFF
 		SysUser sysUser = sysUserFeignService.queryUserByMobile(mobile);
 		// 修改手机号 有用户了不许修改

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/SmsCodeController.java

@@ -40,8 +40,8 @@ public class SmsCodeController extends BaseController {
     @ApiImplicitParams({  @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
                           @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）", required = true, dataType = "String") })
     @PostMapping(value = "/sendSmsCode")
-    public Object sendLoginVerifyCode(String mobile,String type) throws Exception {
-        smsCodeService.sendValidCode(mobile, type, ClientEnum.STUDENT);
+    public Object sendLoginVerifyCode(String mobile,String type,String code) throws Exception {
+        smsCodeService.sendValidCode(mobile, type, ClientEnum.STUDENT, code);
         return succeed();
     }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SmsCodeController.java

@@ -40,8 +40,8 @@ public class SmsCodeController extends BaseController {
     @ApiImplicitParams({  @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
                           @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号,LOGOFF:用户注销）", required = true, dataType = "String") })
     @PostMapping(value = "/sendSmsCode")
-    public Object sendLoginVerifyCode(String mobile,String type) throws Exception {
-        smsCodeService.sendValidCode(mobile, type, ClientEnum.TEACHER);
+    public Object sendLoginVerifyCode(String mobile,String type,String code) throws Exception {
+        smsCodeService.sendValidCode(mobile, type, ClientEnum.TEACHER, code);
         return succeed();
     }
 

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/SmsCodeController.java

@@ -37,8 +37,8 @@ public class SmsCodeController extends BaseController {
     @ApiImplicitParams({  @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
                           @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号,LOGOFF:用户注销）", required = true, dataType = "String") })
     @PostMapping(value = "/sendSmsCode")
-    public Object sendLoginVerifyCode(String mobile,String type) throws Exception {
-        smsCodeService.sendValidCode(mobile, type, ClientEnum.TENANT);
+    public Object sendLoginVerifyCode(String mobile,String type,String code) throws Exception {
+        smsCodeService.sendValidCode(mobile, type, ClientEnum.TENANT, code);
         return succeed();
     }
 

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -77,8 +77,8 @@ public class TenantInfoController extends BaseController {
             @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）", required =
                     true, dataType = "String")})
     @PostMapping(value = "/sendSmsCode")
-    public Object sendLoginVerifyCode(String mobile, String type) throws Exception {
-        smsCodeService.sendValidCode(mobile, type, ClientEnum.SYSTEM);
+    public Object sendLoginVerifyCode(String mobile, String type,String code) throws Exception {
+        smsCodeService.sendValidCode(mobile, type, ClientEnum.SYSTEM, code);
         return succeed();
     }
 

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/SmsCodeController.java

@@ -37,8 +37,8 @@ public class SmsCodeController extends BaseController {
     @ApiImplicitParams({@ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）", required = true, dataType = "String")})
     @PostMapping(value = "/sendSmsCode")
-    public Object sendLoginVerifyCode(String mobile, String type) throws Exception {
-        smsCodeService.sendValidCode(mobile, type, ClientEnum.WEBSITE);
+    public Object sendLoginVerifyCode(String mobile, String type,String code) throws Exception {
+        smsCodeService.sendValidCode(mobile, type, ClientEnum.WEBSITE, code);
         return succeed();
     }