feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.52</version>
+	<version>1.0.53</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 
@@ -151,6 +151,11 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
+		<dependency>
+			<groupId>com.github.whvcse</groupId>
+			<artifactId>easy-captcha</artifactId>
+			<version>1.6.2</version>
+		</dependency>
 
 		<dependency>
 			<groupId>fadada</groupId>

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -11,10 +11,7 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.taUser.entity.*;
 import com.huiju.estateagents.center.taUser.service.*;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.common.MD5Utils;
-import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.*;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.*;
@@ -85,6 +82,9 @@ public class TaUserController extends BaseController {
     @Autowired
     public ITpLifeConsultantEvaluateService iTpLifeConsultantEvaluateService;
 
+    @Autowired
+    public CaptchaUtils captchaUtils;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -339,7 +339,13 @@ public class TaUserController extends BaseController {
     
         String userName = params.getString("loginName");
         String userPassword = params.getString("loginPassword");
-    
+        String captcha = params.getString("captcha");
+        String captchaKey = params.getString("captchaKey");
+
+        if (!captchaUtils.valid(captchaKey, captcha)) {
+            return ResponseBean.error("验证码不正确或者已过期", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         //验证用户名密码是否正确
         QueryWrapper<TaUser> sysUserQueryWrapper = new QueryWrapper<>();
         sysUserQueryWrapper.eq("login_name",userName);

src/main/java/com/huiju/estateagents/common/CaptchaUtils.java

@@ -0,0 +1,92 @@
+package com.huiju.estateagents.common;
+
+import com.wf.captcha.SpecCaptcha;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.UUID;
+
+@Slf4j
+@Component
+@EnableScheduling
+public class CaptchaUtils {
+    Hashtable<String, Captcha> allCaptchas = new Hashtable<>();
+
+    public Captcha generate() {
+        SpecCaptcha specCaptcha = new SpecCaptcha(130, 48, 5);
+        Captcha cap = new Captcha()
+                .setKey(UUID.randomUUID().toString())
+                .setValue(specCaptcha.text().toLowerCase())
+                .setImage(specCaptcha.toBase64())
+                .setExpire(LocalDateTime.now().plusMinutes(15));
+        allCaptchas.put(cap.getKey(), cap);
+
+        // 返回的内容不包含 value
+        return copy(cap).setValue(null);
+    }
+
+    public boolean valid(String key, String captcha) {
+        if (null == captcha || null == key) {
+            return false;
+        }
+
+        // 没有对应键值
+        Captcha cap = allCaptchas.get(key);
+        if (null == cap) {
+            return false;
+        }
+
+        // 内容不匹配
+        if (!cap.getValue().equals(captcha.toLowerCase())) {
+            return false;
+        }
+
+        boolean res = checkExpire(cap);
+        if (res) {
+            // 过期清除
+            allCaptchas.remove(key);
+        }
+
+        return !res;
+    }
+
+    private Captcha copy(Captcha captcha) {
+        return new Captcha()
+                .setKey(captcha.getKey())
+                .setValue(captcha.getValue())
+                .setImage(captcha.getImage())
+                .setExpire(captcha.getExpire());
+    }
+
+    private boolean checkExpire(Captcha cap) {
+        return LocalDateTime.now().isAfter(cap.getExpire());
+    }
+
+    /**
+     * 定时任务 每半小时 清除一次不用的手机号
+     */
+    @Scheduled(fixedRate = 1000 * 60 * 30)
+    public void clearUnused() {
+        for (Captcha cap: allCaptchas.values()) {
+            if (checkExpire(cap)) {
+                allCaptchas.remove(cap.getKey());
+            }
+        }
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Captcha {
+        String key;
+        String value;
+        String image;
+        LocalDateTime expire;
+    }
+}

src/main/java/com/huiju/estateagents/common/smsService/Captcha.java

@@ -101,7 +101,7 @@ public class Captcha {
         // 过期则清除缓存
         boolean res = checkExpire(phone);
         if (res) {
-            clearCache(phone);
+            clearCache(tel);
         }
 
         return !res;
@@ -137,7 +137,7 @@ public class Captcha {
     public void clearUnused() {
         for (Phone phone: allPhones.values()) {
             if (checkExpire(phone)) {
-                clearCache(phone);
+                clearCache(phone.getNumber());
             }
         }
     }
@@ -148,7 +148,7 @@ public class Captcha {
     private void toCache(Phone phone) {
         allPhones.put(phone.getNumber(), phone);
     }
-    private void clearCache(Phone phone) { allPhones.remove(phone); }
+    private void clearCache(String key) { allPhones.remove(key); }
 
     private LocalDateTime expireTime() {
         return LocalDateTime.now().plusSeconds(expireSec);

src/main/java/com/huiju/estateagents/controller/CommonController.java

@@ -4,21 +4,18 @@ package com.huiju.estateagents.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.AliOSSUtils;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.SMSUtils;
-import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.*;
 import com.huiju.estateagents.common.smsService.Captcha;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITdMiniappTemplateTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -39,7 +36,10 @@ public class CommonController extends BaseController {
     IMiniAppService iMiniAppService;
 
     @Autowired
-    Captcha captchaServ;
+    Captcha captchaServ;    // 短信验证码
+
+    @Autowired
+    CaptchaUtils captchaUtils;  // 图片验证码
 
     /**
      * 图片
@@ -57,6 +57,12 @@ public class CommonController extends BaseController {
         }
     }
 
+    @ApiOperation("获取图片验证码")
+    @GetMapping("/admin/image-captcha")
+    public ResponseBean getCaptcha(HttpServletRequest request, HttpServletResponse response) {
+        return ResponseBean.success(captchaUtils.generate());
+    }
+
     @PostMapping("/admin/qrcode")
     public ResponseBean createQrCode(@RequestBody String jsonStr, HttpServletRequest request) {
         Integer orgId = getOrgId(request);

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -67,6 +67,7 @@ public class AccessInterceptor implements HandlerInterceptor {
 		    "/api/center/signin",
             "/api/channel/signin",
 		    "/api/admin/taUser/signin",
+            "/api/admin/image-captcha",
             "/swagger-resources/configuration/ui",
             "/swagger-resources",
             "/v2/api-docs",