From 94824893b36be287747af35902eea499c7acfa12 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 15 六月 2024 19:21:26 +0800
Subject: [PATCH] 代码
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 4 +++-
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java | 2 +-
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 10 ++++++++--
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 20 +++++++++++---------
ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java | 1 +
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java | 4 ++--
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/OssController.java | 1 -
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java | 1 +
8 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
index ba4459b..18244c4 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
@@ -106,6 +106,7 @@
return redisTemplate.delete(key);
}
+
/**
* 删除集合对象
*
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
index fa88c03..21e5861 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java
index aa116a4..49b38fb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java
+++ b/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)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
index 60caadb..f159cd0 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
+++ b/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);
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/OssController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/OssController.java
index 5ea2804..4560bfe 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/OssController.java
+++ b/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 {
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
index 6a352cf..fb71737 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
+++ b/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("账号不存在!");
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index 842680e..bf7496b 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/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);
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index b82fcae..9e3043c 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/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("手机验证码无效");
+ }
}
}
}
--
Gitblit v1.7.1