代码

无关风月

2024-06-15 94824893b36be287747af35902eea499c7acfa12

代码

 ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java

@@ -106,6 +106,7 @@
        return redisTemplate.delete(key);
    }


    /**
     * 删除集合对象
     *

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java

@@ -32,7 +32,7 @@
public class GlobalExceptionHandler {
    private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);

    @Value("${spring.servlet.multipart.max-file-size:4MB}")
    @Value("${spring.servlet.multipart.max-file-size:500MB}")
    private String maxFileSize;
    @Value("${spring.servlet.multipart.max-request-size:100MB}")
    private String maxRequestSize;

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java

@@ -84,6 +84,7 @@
        return success();
    }


    @InnerAuth
    @PostMapping
    public AjaxResult add(@RequestBody SysLogininfor logininfor)

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java

@@ -225,7 +225,9 @@
                String[] split = byId.getTypeIds().split(",");
                for (String s : split) {
                    TGoodsType byId1 = goodsTypeService.getById(s);
                    stringBuilder.append(byId1.getName()).append("|");
                    if (byId1!=null){
                        stringBuilder.append(byId1.getName()).append("|");
                    }
                }
                // 去除最后一个字符
                stringBuilder.deleteCharAt(stringBuilder.length() - 1);

 ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/OssController.java

@@ -11,7 +11,6 @@
import java.io.FileOutputStream;
import java.io.IOException;

@CrossOrigin
@RestController
@RequestMapping("/base/oss")
public class OssController {

 ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java

@@ -146,7 +146,7 @@
    })
    public AjaxResult updatePassword(String phone,String phoneCode,String password) {
        SysUser one = sysUserService.getOne(new QueryWrapper<SysUser>()
                .eq("phone", phone).eq("del_flag", 0));
                .eq("phonenumber", phone).eq("del_flag", 0));
        if (one == null){
            return AjaxResult.error("账号不存在!");
        }
@@ -177,7 +177,7 @@
    })
    public R<?> sendPhoneCode(String phone) throws Exception {
        SysUser one = sysUserService.getOne(new QueryWrapper<SysUser>()
                .eq("phone", phone).eq("del_flag", 0));
                .eq("phonenumber", phone).eq("del_flag", 0));
        if (one == null){
            return R.fail("账号不存在!");
        }

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java

@@ -141,8 +141,14 @@
                // 查询出error字段不为空的数据
                wrapper.isNotNull("error");
                List<TSubject> list1 = subjectService.list(wrapper);
                res.setRecords(list1);
                res.setTotal(list1.size());
                List<TSubject> tSubjects = new ArrayList<>();
                for (TSubject tSubject : list1) {
                    if (!tSubject.getError().isEmpty()){
                        tSubjects.add(tSubject);
                    }
                }
                res.setRecords(tSubjects);
                res.setTotal(tSubjects.size());
                return R.ok(res);
            case 3:
                List<TSubject> list2 = subjectService.list(wrapper);

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java

@@ -733,16 +733,18 @@
            byId.setPhone(phone);
        }
        // 手机验证码校验
        if (!phoneCode.equals("123456")) {
            Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
            if (null == redisPhoneCode) {
                return R.errorCode("手机验证码无效");
            } else {
                // redis 验证码的value 为 code:时间戳
                String rCodeAndTime = String.valueOf(redisPhoneCode);
                String rCode = rCodeAndTime.split(":")[0];
                if (!rCode.equalsIgnoreCase(phoneCode)) {
        if (StringUtils.hasLength(phoneCode)){
            if (!phoneCode.equals("123456")) {
                Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
                if (null == redisPhoneCode) {
                    return R.errorCode("手机验证码无效");
                } else {
                    // redis 验证码的value 为 code:时间戳
                    String rCodeAndTime = String.valueOf(redisPhoneCode);
                    String rCode = rCodeAndTime.split(":")[0];
                    if (!rCode.equalsIgnoreCase(phoneCode)) {
                        return R.errorCode("手机验证码无效");
                    }
                }
            }
        }