Merge remote-tracking branch 'origin/master' into wheng

controller/pom.xml

@@ -14,6 +14,11 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>com.anji-plus</groupId>
+            <artifactId>spring-boot-starter-captcha</artifactId>
+            <version>1.3.0</version>
+        </dependency>
         <dependency>
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-spring-boot-starter</artifactId>

controller/src/main/java/com/koobietech/eas/controller/AdminLoginController.java

@@ -1,7 +1,10 @@
 package com.koobietech.eas.controller;
 
 
-import com.koobietech.eas.common.pojo.JwtUserDto;
+import com.anji.captcha.model.common.ResponseModel;
+import com.anji.captcha.model.vo.CaptchaVO;
+import com.anji.captcha.service.CaptchaService;
+import com.koobietech.eas.common.exception.EasException;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.dao.Pojo.AdminPojo;
 import com.koobietech.eas.dao.dto.LoginToken;
@@ -18,6 +21,10 @@ public class AdminLoginController {
     @Resource
     private AdminLoginService adminLoginService;
 
+    @Resource
+    private CaptchaService captchaService;
+
+
 
     @PostMapping("/adminLogin")
     @Operation(summary = "管理员登录",  description = "用户名和密码为请求载荷，若登录成功，返回两token")
@@ -29,11 +36,71 @@ public class AdminLoginController {
     }
 
     @PostMapping("/refreshToken")
-    @Operation(summary = "刷新token",  description = "当token过期，在请求头中携带refresh token，若刷新成功，返回新的token和refresh token")
+    @Operation(summary = "刷新token", description = "当token过期，在请求头中携带refresh token，若刷新成功，返回新的token和refresh token")
     public JsonResult refreshToken(@RequestHeader("Authorization") String refreshToken) {
         // 返回新的token和refresh token
         return JsonResult.data(adminLoginService.refreshToken(refreshToken));
     }
 
+    @PostMapping("/verify.get")
+    @Operation(summary = "获取验证码", description = "前端发起获取验证码请求，后端访问静态资源返回滑动图片")
+    public ResponseModel get(@RequestBody CaptchaVO captchaVO) {
+        return captchaService.get(captchaVO);
+    }
+
+    @PostMapping("/verify.check")
+    @Operation(summary = "核对验证码轨迹", description = "前端把用户的滑动轨迹转化成字符串传入后端，通过算法判断轨迹是否为真人")
+    public ResponseModel check(@RequestBody CaptchaVO captchaVO) {
+        return captchaService.check(captchaVO);
+    }
+
+    @PostMapping("/verify.judge")
+    @Operation(summary = "二次校验验证码", description = "校验滑动验证码结果，是否匹配上，传参：captchaVerification")
+    public ResponseModel verify(@RequestBody CaptchaVO captchaVO) {
+        ResponseModel response = captchaService.verification(captchaVO);
+        //repCode  0000  无异常，代表成功
+        //repCode  9999  服务器内部异常
+        //repCode  0011  参数不能为空
+        //repCode  6110  验证码已失效，请重新获取
+        //repCode  6111  验证失败
+        //repCode  6112  获取验证码失败,请联系管理员
+        //repCode  6113  底图未初始化成功，请检查路径
+        //repCode  6201  get接口请求次数超限，请稍后再试!
+        //repCode  6206  无效请求，请重新获取验证码
+        //repCode  6202  接口验证失败数过多，请稍后再试
+        //repCode  6204  check接口请求次数超限，请稍后再试!
+        if (!response.isSuccess()) {
+            String repCode = response.getRepCode();
+            switch (repCode) {
+                case "9999":
+                    throw new EasException("服务器内部异常", 9999);
+                case "0011":
+                    throw new EasException("参数不能为空", 0011);
+                case "6110":
+                    throw new EasException("验证码已失效，请重新获取", 6110);
+                case "6111":
+                    throw new EasException("验证失败", 6111);
+                case "6112":
+                    throw new EasException("获取验证码失败,请联系管理员", 6112);
+                case "6113":
+                    throw new EasException("底图未初始化成功，请检查路径", 6113);
+                case "6201":
+                    throw new EasException("get接口请求次数超限，请稍后再试!", 6201);
+                case "6206":
+                    throw new EasException("无效请求，请重新获取验证码", 6206);
+                case "6202":
+                    throw new EasException("接口验证失败数过多，请稍后再试", 6202);
+                case "6204":
+                    throw new EasException("check接口请求次数超限，请稍后再试!", 6204);
+                default:
+                    // 处理未知的 repCode
+                    throw new EasException("未知错误，你干嘛~哎哟~", -1);
+            }
+        }
+
+        return response;
+    }
+
+
 
 }

controller/src/main/java/com/koobietech/eas/controller/EasEduClassController.java

@@ -0,0 +1,114 @@
+package com.koobietech.eas.controller;
+
+
+import com.github.pagehelper.PageHelper;
+import com.koobietech.eas.common.constant.Disabled;
+import com.koobietech.eas.common.result.JsonPageResult;
+import com.koobietech.eas.common.result.JsonResult;
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasEduClass;
+import com.koobietech.eas.mbg.model.EasEduSubjects;
+import com.koobietech.eas.service.EasEduClassService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.management.ValueExp;
+import java.util.List;
+
+@RestController
+@Tag(name = "班级控制器")
+public class EasEduClassController {
+
+    @Resource
+    EasEduClassService easEduClassService;
+
+    /**
+     * 添加班级类
+     * @param easEduClass
+     * @return
+     */
+    @PostMapping("/addClass")
+    @Operation(summary = "增加班级类" , description = "用于增加班级类")
+    public JsonResult addClass(@RequestBody  EasEduClass easEduClass){
+
+        int add_i = easEduClassService.addClass(easEduClass);
+        return JsonResult.ok("班级类添加成功");
+    }
+
+    /**
+     * 修改班级类信息
+     * @param easEduClass
+     * @return
+     */
+    @PutMapping(value = "/updateClass")
+    @Operation(summary = "更新班级类",description = "用于修改班级类信息")
+    public JsonResult updateClass(@RequestBody EasEduClass easEduClass){
+        int update_i = easEduClassService.updateClass(easEduClass);
+        if (update_i > 0){
+            return JsonResult.ok("修改成功！");
+        }else {
+            return JsonResult.fail("修改失败");
+        }
+    }
+
+    /**
+     * 删除班级类
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/deleteClass/{id}")
+    @Operation(summary = "删除班级类",description = "用于根据 id 删除班级类")
+    public JsonResult deleteClass(@PathVariable Long id ){
+        int delete_i = easEduClassService.deleteClass(id);
+        if (delete_i > 0){
+            return JsonResult.ok();
+        }else {
+            return JsonResult.fail();
+        }
+    }
+
+    /**
+     * 通过 id 查询班级类
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/selectId")
+    @Operation(summary = "id 查询班级类" , description = "通过id查询班级类")
+    public JsonResult selectId( Long id ){
+        EasEduClass easEduClass = easEduClassService.selectId(id);
+        System.out.println(
+                Disabled.valueOf(easEduClass.getDisabled())
+        );
+        return JsonResult.data(easEduClass);
+    }
+
+    /**
+     * 查询所有的班级类
+     * @return
+     */
+    @GetMapping(value = "/selectTotal")
+    @Operation(summary = "查询所有的班级类",description = "用于查询所有的班级类")
+    public JsonResult selectTotal(){
+        List<EasEduClass> easEduClasses = easEduClassService.selectTotal();
+        return JsonResult.data(easEduClasses);
+    }
+
+    /**
+     * 通过条件查询班级类
+     * @param easEduClass
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping(value = "/selectCondition")
+    @Operation(summary = "根据条件进行查询班级类", description = "用于根据条件查询班级类")
+    public JsonPageResult selectCondition(@RequestBody EasEduClass easEduClass,
+                                            @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageData data = easEduClassService.selectCondition(easEduClass);
+        return JsonPageResult.data(data);
+    }
+}

controller/src/main/java/com/koobietech/eas/controller/EasUserController.java

@@ -21,7 +21,6 @@ public class EasUserController {
     @PostMapping("/test")
     @Operation(summary = "控制器测试用例" , description = "用于演示Swagger配置注解")
     public List<EasSysStudent> test(@RequestBody EasEduSubjects easEduSubjects){
-
         return demoService.test( easEduSubjects );
     }
 

controller/src/main/resources/application-local.yaml

@@ -2,15 +2,15 @@ server:
   port: 8080
 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:13306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
+    url: jdbc:mysql://127.0.0.1:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
     username: root
-    password: 0JZBdtlYoiOepddh
+    password: 123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   redis:
     host: localhost
-    database: 9
+    database: 15
     password:
-    port: 26379
+    port: 6379
   security:
     user:
       name: admin

controller/src/main/resources/application.yaml

@@ -34,3 +34,22 @@ eas:
   jwt-secret-key: 123456
   jwt-expires-date: 1
   password-sign-key: eas-key-password
+aj:
+  captcha:
+    jigsaw: classpath:images/jigsaw
+    pic-click: classpath:images/pic-click
+    cache-type: local
+    type: default
+    water-mark: "\u6211\u7684\u6c34\u5370"
+    slip-offset: 5
+    aes-status: true
+    interference-options: 2
+    font-style: 1
+    font-size: 25
+    history-data-clear-enable: false
+    req-frequency-limit-enable: false
+    req-get-lock-limit: 5
+    req-get-lock-seconds: 360
+    req-get-minute-limit: 30
+    req-check-minute-limit: 60
+    req-verify-minute-limit: 60

security/src/main/java/com/koobietech/eas/security/filter/EasSecurityFilter.java

@@ -69,6 +69,8 @@ public class EasSecurityFilter extends OncePerRequestFilter {
                 // 将身份验证令牌设置到当前的 SecurityContext 中
                 context.setAuthentication(authenticationToken);
             }
+            //放行
+            filterChain.doFilter(request, response);
         }
         filterChain.doFilter(request, response);
     }

service/src/main/java/com/koobietech/eas/service/EasEduClassService.java

@@ -0,0 +1,23 @@
+package com.koobietech.eas.service;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasEduCategory;
+import com.koobietech.eas.mbg.model.EasEduClass;
+
+import java.util.List;
+
+public interface EasEduClassService {
+
+    int addClass(EasEduClass easEduClass);
+
+    int updateClass(EasEduClass easEduClass);
+
+    int deleteClass( Long id );
+
+    EasEduClass selectId( Long id );
+
+    List<EasEduClass> selectTotal();
+
+    PageData selectCondition(EasEduClass easEduClass );
+
+}

service/src/main/java/com/koobietech/eas/service/impl/AdminLoginServiceImpl.java

@@ -139,6 +139,11 @@ public class AdminLoginServiceImpl implements AdminLoginService {
     private void validatePassword(String inputPassword, String encryptedPassword){
         String decryptedPassword = passwordManager.decryptPassword(inputPassword);
         System.out.println("前端解密来的decryptedPassword: " + decryptedPassword);
+
+        String encode = passwordEncoder.encode("123456");
+        System.out.println("cunli:"+encode);
+
+
         System.out.println("数据库查到的密码easSysUserinfo.getPasswd(): " + encryptedPassword);
         if (!passwordEncoder.matches(decryptedPassword, encryptedPassword)) {
             throw new EasException("密码不正确", 9901);

service/src/main/java/com/koobietech/eas/service/impl/EasEduClassServiceImpl.java

@@ -0,0 +1,125 @@
+package com.koobietech.eas.service.impl;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.mapper.EasEduClassMapper;
+import com.koobietech.eas.mbg.model.EasEduCategory;
+import com.koobietech.eas.mbg.model.EasEduCategoryExample;
+import com.koobietech.eas.mbg.model.EasEduClass;
+import com.koobietech.eas.mbg.model.EasEduClassExample;
+import com.koobietech.eas.service.EasEduClassService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import javax.imageio.metadata.IIOMetadataFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class EasEduClassServiceImpl implements EasEduClassService {
+
+    @Resource
+    EasEduClassMapper easEduClassMapper;
+    @Override
+    public int addClass(EasEduClass easEduClass) {
+        easEduClass.setCreateTime(new Date());
+        easEduClass.setModifyTime(new Date());
+        return easEduClassMapper.insert(easEduClass);
+    }
+
+    @Override
+    public int updateClass(EasEduClass easEduClass) {
+        return easEduClassMapper.updateByPrimaryKey( easEduClass );
+    }
+
+    @Override
+    public int deleteClass(Long id) {
+        return  easEduClassMapper.deleteByPrimaryKey( id );
+    }
+
+    @Override
+    public EasEduClass selectId(Long id) {
+        System.out.println("Id" + id);
+        return easEduClassMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public List<EasEduClass> selectTotal() {
+        return easEduClassMapper.selectByExample(null);
+    }
+
+    @Override
+    public PageData selectCondition(EasEduClass easEduClass) {
+        EasEduClassExample easEduClassExample = new EasEduClassExample();
+        EasEduClassExample.Criteria criteria = easEduClassExample.createCriteria();
+        if ( Objects.nonNull(easEduClass) ) {
+            if (Objects.nonNull(easEduClass.getId())) {
+                criteria.andIdEqualTo(easEduClass.getId());
+            }
+            if (StringUtils.hasText(easEduClass.getName())) {
+                criteria.andNameLike("%" + easEduClass.getName() + "%");
+            }
+            if (Objects.nonNull(easEduClass.getManageId()) && easEduClass.getManageId() > 0){
+                criteria.andManageIdEqualTo(easEduClass.getManageId());
+            }
+            if (Objects.nonNull(easEduClass.getAssistantId()) && easEduClass.getAssistantId() > 0){
+                criteria.andAssistantIdEqualTo(easEduClass.getAssistantId());
+            }
+            if (Objects.nonNull(easEduClass.getCreateTime())) {
+                criteria.andCreateTimeGreaterThan(easEduClass.getCreateTime());
+            }
+            if (Objects.nonNull(easEduClass.getModifyTime())) {
+                criteria.andCreateTimeGreaterThan(easEduClass.getModifyTime());
+            }
+            if (Objects.nonNull(easEduClass.getCreateUid()) && easEduClass.getCreateUid() > 0) {
+                criteria.andCreateUidEqualTo(easEduClass.getCreateUid());
+            }
+            if (StringUtils.hasText(easEduClass.getDisabled())) {
+                criteria.andDisabledEqualTo(easEduClass.getDisabled());
+            }
+        }
+        List<EasEduClass> easEduClasses = easEduClassMapper.selectByExample(easEduClassExample);
+        long l = easEduClassMapper.countByExample(easEduClassExample);
+        return PageData.init(easEduClasses,l);
+    }
+
+//    @Override
+//    public PageData selectCondition(EasEduClass easEduClass) {
+//        EasEduClassExample easEduClassExample = new EasEduClassExample();
+//        EasEduClassExample.Criteria criteria = easEduClassExample.createCriteria();
+//        if (Objects.nonNull(easEduClass)){
+//            if (Objects.nonNull(easEduClass.getId())){
+//                criteria.andIdEqualTo(easEduClass.getId());
+//            }
+//            if (StringUtils.hasText((easEduClass.getName()))){
+//                criteria.andNameLike("%" + easEduClass.getName() + "%");
+//            }
+//            if (Objects.nonNull(easEduClass.getManageId())){
+//                criteria.andManageIdEqualTo(easEduClass.getManageId());
+//            }
+//            if (Objects.nonNull(easEduClass.getAssistantId())){
+//                criteria.andManageIdEqualTo(easEduClass.getManageId());
+//            }
+//            if (Objects.nonNull(easEduClass.getCreateTime())){
+//                criteria.andCreateTimeGreaterThan(easEduClass.getCreateTime());
+//            }
+//            if (Objects.nonNull(easEduClass.getModifyTime())){
+//                criteria.andModifyTimeGreaterThan(easEduClass.getModifyTime());
+//            }
+//            if (Objects.nonNull(easEduClass.getCreateUid())){
+//                criteria.andCreateUidEqualTo(easEduClass.getCreateUid());
+//            }
+//            if (StringUtils.hasText(easEduClass.getDisabled())){
+//                criteria.andDisabledEqualTo(easEduClass.getDisabled());
+//            }
+//        }
+//        List<EasEduClass> easEduClasses = easEduClassMapper.selectByExample(easEduClassExample);
+//        long l = easEduClassMapper.countByExample(easEduClassExample);
+//        PageData ret = new PageData();
+//        ret.setData(easEduClasses);
+//        ret.setTotal(l);
+//        return ret;
+//    }
+
+}