From 6dc95c02eab0f056c7f70e969854c9f3dd299b14 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 29 Jul 2023 17:26:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=AD=E5=BB=BA=E5=90=8E=E5=8F=B0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97-=E5=AE=8C=E6=88=90=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/WebMasterConstants.java | 15 +++++ .../common/enums/ExceptionEnums.java | 5 +- .../java/com/mashibing/common/util/R.java | 34 ++++++++++ .../com/mashibing/common/vo/ResultVO.java | 23 +++++++ beacon-webmaster/pom.xml | 21 +++++++ .../webmaster/config/KaptchaConfig.java | 33 ++++++++++ .../webmaster/config/ShiroConfig.java | 4 +- .../controller/KaptchaController.java | 50 +++++++++++++++ .../controller/SmsUserController.java | 62 +++++++++++++++++++ .../com/mashibing/webmaster/dto/UserDTO.java | 24 +++++++ .../mashibing/webmaster/realm/ShiroRealm.java | 2 +- 11 files changed, 270 insertions(+), 3 deletions(-) create mode 100644 beacon-common/src/main/java/com/mashibing/common/constant/WebMasterConstants.java create mode 100644 beacon-common/src/main/java/com/mashibing/common/util/R.java create mode 100644 beacon-common/src/main/java/com/mashibing/common/vo/ResultVO.java create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/config/KaptchaConfig.java create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/controller/KaptchaController.java create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/controller/SmsUserController.java create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/dto/UserDTO.java diff --git a/beacon-common/src/main/java/com/mashibing/common/constant/WebMasterConstants.java b/beacon-common/src/main/java/com/mashibing/common/constant/WebMasterConstants.java new file mode 100644 index 0000000..a2c08a0 --- /dev/null +++ b/beacon-common/src/main/java/com/mashibing/common/constant/WebMasterConstants.java @@ -0,0 +1,15 @@ +package com.mashibing.common.constant; + +/** + * @author zjw + * @description + */ +public interface WebMasterConstants { + + /** + * 将验证码基于这个key做存储 + */ + String KAPTCHA = "kaptcha"; + + +} diff --git a/beacon-common/src/main/java/com/mashibing/common/enums/ExceptionEnums.java b/beacon-common/src/main/java/com/mashibing/common/enums/ExceptionEnums.java index ff1e8c2..d0a8fc5 100644 --- a/beacon-common/src/main/java/com/mashibing/common/enums/ExceptionEnums.java +++ b/beacon-common/src/main/java/com/mashibing/common/enums/ExceptionEnums.java @@ -25,7 +25,10 @@ public enum ExceptionEnums { ONE_HOUR_LIMIT(-17,"1小时限流规则生效，无法发送短信"), NO_CHANNEL(-18,"没有选择到合适的通道！"), SEARCH_INDEX_ERROR(-19,"添加文档信息失败！"), - SEARCH_UPDATE_ERROR(-20,"修改文档信息失败！") + SEARCH_UPDATE_ERROR(-20,"修改文档信息失败！"), + + KAPACHA_ERROR(-100,"验证码错误！"), + AUTHEN_ERROR(-101,"用户名或密码错误！") ; private Integer code; diff --git a/beacon-common/src/main/java/com/mashibing/common/util/R.java b/beacon-common/src/main/java/com/mashibing/common/util/R.java new file mode 100644 index 0000000..108a605 --- /dev/null +++ b/beacon-common/src/main/java/com/mashibing/common/util/R.java @@ -0,0 +1,34 @@ +package com.mashibing.common.util; + +import com.mashibing.common.enums.ExceptionEnums; +import com.mashibing.common.vo.ResultVO; + +import javax.xml.transform.Result; + +/** + * 封装ResultVO的工具 + * @author zjw + * @description + */ +public class R { + + /** + * 成功，无数据 + * @return + */ + public static ResultVO ok(){ + return new ResultVO(0,""); + } + + /** + * 失败，指定错误信息 + * @param enums + * @return + */ + public static ResultVO error(ExceptionEnums enums){ + return new ResultVO(enums.getCode(),enums.getMsg()); + } + + + +} diff --git a/beacon-common/src/main/java/com/mashibing/common/vo/ResultVO.java b/beacon-common/src/main/java/com/mashibing/common/vo/ResultVO.java new file mode 100644 index 0000000..99c9300 --- /dev/null +++ b/beacon-common/src/main/java/com/mashibing/common/vo/ResultVO.java @@ -0,0 +1,23 @@ +package com.mashibing.common.vo; + +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 响应前端数据的基本结构 + * @author zjw + * @description + */ +@Data +@NoArgsConstructor +public class ResultVO { + + private Integer code; + + private String msg; + + public ResultVO(Integer code, String msg) { + this.code = code; + this.msg = msg; + } +} diff --git a/beacon-webmaster/pom.xml b/beacon-webmaster/pom.xml index a537cdd..31413f4 100644 --- a/beacon-webmaster/pom.xml +++ b/beacon-webmaster/pom.xml @@ -16,11 +16,13 @@ org.springframework.boot spring-boot-starter-web + org.apache.shiro shiro-spring-boot-web-starter 1.4.0 + mysql mysql-connector-java @@ -36,10 +38,29 @@ mybatis-spring-boot-starter 2.2.2 + org.springframework.boot spring-boot-starter-test + + + com.github.axet + kaptcha + 0.0.9 + + + + com.mashibing + beacon-common + 1.0-SNAPSHOT + + + + org.hibernate + hibernate-validator + 6.1.5.Final + diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/config/KaptchaConfig.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/config/KaptchaConfig.java new file mode 100644 index 0000000..40d5653 --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/config/KaptchaConfig.java @@ -0,0 +1,33 @@ +package com.mashibing.webmaster.config; + +import com.google.code.kaptcha.Constants; +import com.google.code.kaptcha.impl.DefaultKaptcha; +import com.google.code.kaptcha.util.Config; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Properties; + +/** + * 验证码生成规则 + * @author zjw + * @description + */ +@Configuration +public class KaptchaConfig { + + @Bean + public DefaultKaptcha kaptcha(){ + //1、直接构建DefaultKaptcha + DefaultKaptcha kaptcha = new DefaultKaptcha(); + + //2、设置配置信息 + Properties properties = new Properties(); + properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_CHAR_LENGTH,"4"); + Config config = new Config(properties); + kaptcha.setConfig(config); + + //3、返回对象 + return kaptcha; + } +} diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/config/ShiroConfig.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/config/ShiroConfig.java index a1a0342..c49a01d 100644 --- a/beacon-webmaster/src/main/java/com/mashibing/webmaster/config/ShiroConfig.java +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/config/ShiroConfig.java @@ -44,7 +44,9 @@ public class ShiroConfig { //2、配置上过滤器链 Map filterChainDefinitionMap = new LinkedHashMap<>(); // anon代表放行，使用的是AnonymousFilter - filterChainDefinitionMap.put("/sys/user/login","anon"); + filterChainDefinitionMap.put("/public/**","anon"); + filterChainDefinitionMap.put("/captcha.jpg","anon"); + filterChainDefinitionMap.put("/sys/login","anon"); filterChainDefinitionMap.put("/index.html","anon"); filterChainDefinitionMap.put("/login.html","anon"); filterChainDefinitionMap.put("/logout","logout"); diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/controller/KaptchaController.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/controller/KaptchaController.java new file mode 100644 index 0000000..9614810 --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/controller/KaptchaController.java @@ -0,0 +1,50 @@ +package com.mashibing.webmaster.controller; + +import com.google.code.kaptcha.impl.DefaultKaptcha; +import com.mashibing.common.constant.WebMasterConstants; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +import javax.imageio.ImageIO; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; +import java.io.IOException; + +/** + * @author zjw + * @description + */ +@Controller +public class KaptchaController { + + private final String JPG = "jpg"; + + @Autowired + private DefaultKaptcha kaptcha; + + @GetMapping("/captcha.jpg") + public void captcha(HttpServletResponse resp){ + //1、验证码图片不需要做存储和缓存 + resp.setHeader("Cache-Control","no-store, no-cahe"); + //2、设置响应头信息 + resp.setContentType("image/jpg"); + //3、生成验证码文字 + String text = kaptcha.createText(); + // 认证需要验证验证码的准确性，基于Shiro将text做存储 + SecurityUtils.getSubject().getSession().setAttribute(WebMasterConstants.KAPTCHA,text); + //4、基于文字生成对应的图片 + BufferedImage image = kaptcha.createImage(text); + //5、写回验证码图片信息 + try { + ServletOutputStream outputStream = resp.getOutputStream(); + ImageIO.write(image,JPG,outputStream); + } catch (IOException e) { + e.printStackTrace(); + } + } + + +} diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/controller/SmsUserController.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/controller/SmsUserController.java new file mode 100644 index 0000000..12cf1b6 --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/controller/SmsUserController.java @@ -0,0 +1,62 @@ +package com.mashibing.webmaster.controller; + +import com.alibaba.druid.util.StringUtils; +import com.mashibing.common.constant.WebMasterConstants; +import com.mashibing.common.enums.ExceptionEnums; +import com.mashibing.common.util.R; +import com.mashibing.common.vo.ResultVO; +import com.mashibing.webmaster.dto.UserDTO; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authc.AuthenticationException; +import org.apache.shiro.authc.UsernamePasswordToken; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + * 认证，注册等基于用户的操作接口 + * + * @author zjw + * @description + */ +@RestController +@RequestMapping("/sys") +@Slf4j +public class SmsUserController { + + + @PostMapping("/login") + public ResultVO login(@RequestBody @Valid UserDTO userDTO, BindingResult bindingResult) { +// * 1、请求参数的非空校验 + if (bindingResult.hasErrors()) { + // 参数不合法，响应对应的JSON信息 + log.info("【认证操作】参数不合法，userDTO = {}", userDTO); + return R.error(ExceptionEnums.PARAMETER_ERROR); + } +// * 2、基于验证码校验请求是否合理 + String realKaptcha = (String) SecurityUtils.getSubject().getSession().getAttribute(WebMasterConstants.KAPTCHA); + if (!userDTO.getCaptcha().equalsIgnoreCase(realKaptcha)) { + log.info("【认证操作】验证码不正确，kapacha = {}，realKaptcha = {}", userDTO.getCaptcha(), realKaptcha); + return R.error(ExceptionEnums.KAPACHA_ERROR); + } +// * 3、基于用户名和密码做Shiro的认证操作 + UsernamePasswordToken token = new UsernamePasswordToken(userDTO.getUsername(),userDTO.getPassword()); + token.setRememberMe(userDTO.getRememberMe()); + try { + SecurityUtils.getSubject().login(token); + } catch (AuthenticationException e) { +// * 4、根据Shiro的认证，返回响应信息 + log.info("【认证操作】用户名或密码错误，ex = {}", e.getMessage()); + return R.error(ExceptionEnums.AUTHEN_ERROR); + } + // 到这，代表认证成功 + return R.ok(); + } + + +} diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/dto/UserDTO.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/dto/UserDTO.java new file mode 100644 index 0000000..2e46e16 --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/dto/UserDTO.java @@ -0,0 +1,24 @@ +package com.mashibing.webmaster.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author zjw + * @description + */ +@Data +public class UserDTO { + + @NotBlank + private String username; + @NotBlank + private String password; + @NotBlank + private String captcha; + + private Boolean rememberMe = false; + + +} diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/realm/ShiroRealm.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/realm/ShiroRealm.java index fe20b3f..860065f 100644 --- a/beacon-webmaster/src/main/java/com/mashibing/webmaster/realm/ShiroRealm.java +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/realm/ShiroRealm.java @@ -50,7 +50,7 @@ public class ShiroRealm extends AuthorizingRealm { SmsUser smsUser = userService.findByUsername(username); //3、查询完毕后，查看用户是否为null，为null就直接返回即可 - if(smsUser != null){ + if(smsUser == null){ // 用户名错误 return null; }