|
@@ -1,20 +1,16 @@
|
|
|
|
|
|
package org.springblade.modules.auth.endpoint;
|
|
|
|
|
|
-import static org.springblade.common.constant.CacheConstant.BIZ_CACHE;
|
|
|
-import static org.springblade.common.constant.CacheConstant.DICT_CACHE;
|
|
|
-import static org.springblade.common.constant.CacheConstant.FLOW_CACHE;
|
|
|
-import static org.springblade.common.constant.CacheConstant.MENU_CACHE;
|
|
|
-import static org.springblade.common.constant.CacheConstant.PARAM_CACHE;
|
|
|
-import static org.springblade.common.constant.CacheConstant.RESOURCE_CACHE;
|
|
|
-import static org.springblade.common.constant.CacheConstant.SYS_CACHE;
|
|
|
-import static org.springblade.common.constant.CacheConstant.USER_CACHE;
|
|
|
-
|
|
|
-import java.time.Duration;
|
|
|
-import java.util.UUID;
|
|
|
-
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
-
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.github.xiaoymin.knife4j.annotations.ApiSort;
|
|
|
+import com.github.xiaoymin.knife4j.core.util.StrUtil;
|
|
|
+import com.wf.captcha.SpecCaptcha;
|
|
|
+import com.wf.captcha.base.Captcha;
|
|
|
+import io.swagger.annotations.Api;
|
|
|
+import io.swagger.annotations.ApiOperation;
|
|
|
+import io.swagger.annotations.ApiParam;
|
|
|
+import lombok.AllArgsConstructor;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springblade.common.cache.CacheNames;
|
|
|
import org.springblade.common.utils.CacheUtil;
|
|
|
import org.springblade.core.constant.AppConstant;
|
|
@@ -40,23 +36,13 @@ import org.springblade.modules.system.entity.UserInfo;
|
|
|
import org.springblade.modules.system.service.ISystemBaseInfoService;
|
|
|
import org.springblade.modules.system.service.ITenantService;
|
|
|
import org.springblade.modules.system.service.IUserService;
|
|
|
-import org.springblade.modules.system.vo.SystemBaseInfoVO;
|
|
|
-import org.springframework.web.bind.annotation.GetMapping;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.github.xiaoymin.knife4j.annotations.ApiSort;
|
|
|
-import com.github.xiaoymin.knife4j.core.util.StrUtil;
|
|
|
-import com.wf.captcha.SpecCaptcha;
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.time.Duration;
|
|
|
+import java.util.UUID;
|
|
|
|
|
|
-import io.swagger.annotations.Api;
|
|
|
-import io.swagger.annotations.ApiOperation;
|
|
|
-import io.swagger.annotations.ApiParam;
|
|
|
-import lombok.AllArgsConstructor;
|
|
|
-import lombok.extern.slf4j.Slf4j;
|
|
|
+import static org.springblade.common.constant.CacheConstant.*;
|
|
|
|
|
|
/**
|
|
|
* 令牌端点
|
|
@@ -143,6 +129,8 @@ public class BladeTokenEndPoint {
|
|
|
@ApiOperation(value = "获取验证码")
|
|
|
public Kv captcha() {
|
|
|
SpecCaptcha specCaptcha = new SpecCaptcha(130, 48, 5);
|
|
|
+ // 设置类型,纯数字、纯字母、字母数字混合
|
|
|
+ specCaptcha.setCharType(Captcha.TYPE_ONLY_NUMBER);
|
|
|
String verCode = specCaptcha.text().toLowerCase();
|
|
|
String key = UUID.randomUUID().toString();
|
|
|
// 存入redis并设置过期时间为30分钟
|