Merge branch 'master' of https://github.com/7-idiot/weChat-Operation

operation-backend/src/main/java/com/idiot/operationbackend/config/CorsConfig.java

@@ -1,29 +0,0 @@
-//package com.idiot.operationbackend.config;
-//
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.web.cors.CorsConfiguration;
-//import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-//import org.springframework.web.filter.CorsFilter;
-//
-///**
-// * @author wang xiao
-// * @date Created in 15:08 2020/9/14
-// */
-//@Configuration
-//public class CorsConfig {
-//
-//
-//
-//    @Bean
-//    public CorsFilter corsFilter() {
-//        CorsConfiguration config = new CorsConfiguration();
-//        config.addAllowedOrigin("*");
-//        config.addAllowedMethod("*");
-//        config.addAllowedHeader("*");
-//        UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();
-//        configSource.registerCorsConfiguration("/**", config);
-//        return new CorsFilter(configSource);
-//    }
-//
-//}

operation-backend/src/main/java/com/idiot/operationbackend/config/ExceptionHandlerConfiguration.java

@@ -1,6 +1,6 @@
 package com.idiot.operationbackend.config;
 
-import com.baomidou.kaptcha.exception.KaptchaException;
+
 import com.idiot.operationbackend.support.CustomException;
 import com.idiot.operationbackend.support.JsonResult;
 import org.slf4j.Logger;
@@ -35,14 +35,7 @@ public class ExceptionHandlerConfiguration {
         return ResponseEntity.ok(jsonResult);
     }
 
-    @ExceptionHandler(value = KaptchaException.class)
-    public ResponseEntity<JsonResult<String>> orderingExceptionHandler(KaptchaException e) {
-        JsonResult<String> jsonResult = JsonResult.build(500);
-        jsonResult.message("验证码错误或者已经过期！");
-        log.warn("发生验证码异常==========>异常code:{},异常原因:{}", 500, "验证码错误或者已经过期！");
-        e.printStackTrace();
-        return ResponseEntity.ok(jsonResult);
-    }
+
 
     @ExceptionHandler(value = RuntimeException.class)
     public ResponseEntity<JsonResult<String>> exceptionHandler(RuntimeException e) {

operation-backend/src/main/java/com/idiot/operationbackend/controller/AuthController.java

@@ -1,6 +1,6 @@
 package com.idiot.operationbackend.controller;
 
-import com.baomidou.kaptcha.Kaptcha;
+
 import com.idiot.operationbackend.entity.AuthUser;
 import com.idiot.operationbackend.service.facade.AuthUserService;
 import com.idiot.operationbackend.support.Constants;
@@ -8,7 +8,6 @@ import com.idiot.operationbackend.support.CustomException;
 import com.idiot.operationbackend.support.JsonResult;
 import com.idiot.operationbackend.util.JwtTokenUtil;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,27 +33,19 @@ public class AuthController  {
 
     private final Logger logger = LoggerFactory.getLogger(AuthController.class);
 
-    @Autowired
-    private Kaptcha kaptcha;
+
 
     @Autowired
     private AuthUserService userService;
 
 
-    @GetMapping("/captcha")
-    @ApiOperation(value = "获取验证码")
-    public void getCaptcha() {
-        kaptcha.render();
-    }
-
-
 
     @PostMapping("/login")
     @ApiOperation(value = "账号登录")
     public ResponseEntity<JsonResult<AuthUser>> login(@RequestBody @Valid AuthUser authUser) {
         logger.info("用户：{}账号密码登录",authUser.getUserCode());
-        String captchaCode = authUser.getCaptchaCode();
-        kaptcha.validate(captchaCode);
+
+
         authUser =userService.queryByUserCodeAndPassword(authUser.getPassword(),authUser.getUserCode());
         if (Objects.isNull(authUser)) {
             throw new CustomException(500,"账号或者密码错误！请检查大小写");

operation-backend/src/main/java/com/idiot/operationbackend/entity/AuthUser.java

@@ -34,9 +34,7 @@ public class AuthUser {
 
     private String createTime;
 
-    @TableField(exist = false)
-    @NotEmpty(message = "验证码不能为空")
-    private String captchaCode;
+
 
     public String getId() {
         return id;
@@ -110,11 +108,5 @@ public class AuthUser {
         this.createTime = createTime;
     }
 
-    public String getCaptchaCode() {
-        return captchaCode;
-    }
 
-    public void setCaptchaCode(String captchaCode) {
-        this.captchaCode = captchaCode;
-    }
 }

operation-backend/src/main/resources/application-dev.yml

@@ -30,23 +30,6 @@ logging:
   level:
     root: info
     org.mybatis: debug
-#kaptcha 图形验证码配置
-kaptcha:
-  height: 50
-  width: 150
-  content:
-    length: 4
-    source: 0123456789abcdefghijklmnopqrstuvwxyz
-    space: 10
-  font:
-    color: blue
-    name: 宋体,楷体,微软雅黑
-    size: 40
-  background-color:
-    from: lightGray
-    to: white
-  border:
-    enabled: false
 wechat:
   # 微信第三方平台 (独立部署需要自主申请)
   platform: