From a50c7d1497d7f707b79597553d9db978ba7e9dd5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 08:59:12 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index 36fb9be..6e780d0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -33,6 +33,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
+import java.security.SecureRandom;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -145,7 +146,10 @@
TAppUser appUser = new TAppUser();
appUser.setPhone(registerDto.getPhone());
appUser.setPassword(SecurityUtils.encryptPassword(registerDto.getPwd()));
+ // 5位随机使用英文+数字格式
+ appUser.setName("用户"+generateRandomString(5));
+ appUser.setAvatar("https://tcjt-zpw.obs.cn-east-3.myhuaweicloud.com/xinquan/89ff629aace742ff965e88eab7069b9c.png");
appUser.setCode(generateUniqueId());
appUserService.save(appUser);
@@ -153,6 +157,18 @@
return R.ok();
}
+ public static String generateRandomString(int length) {
+ String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+ SecureRandom random = new SecureRandom();
+ StringBuilder sb = new StringBuilder(length);
+
+ for (int i = 0; i < length; i++) {
+ int index = random.nextInt(characters.length());
+ sb.append(characters.charAt(index));
+ }
+
+ return sb.toString();
+ }
public static String generateUniqueId() {
// 获取当前日期并格式化为yyyyMMdd
@@ -178,12 +194,12 @@
TAppUser byId = appUserService.getById(userId);
- String cacheObject = redisCache.getCacheObject(byId.getPhone());
- if (!code.equals("123456")&&!cacheObject.equals(code)){
+ String cacheObject = redisCache.getCacheObject(newPhone);
+ if (!code.equals("123456")&&!code.equals(cacheObject)){
return R.fail("验证码错误");
}
- if (redisCache.getCacheObject(byId.getPhone()).equals(code)){
+ if (redisCache.getCacheObject(newPhone).equals(code)){
byId.setPhone(newPhone);
appUserService.updateById(byId);
return R.ok();
@@ -259,6 +275,7 @@
.ge(appUserQuery.getCreateTime1() != null, TAppUser::getCreateTime,time1)
.le(appUserQuery.getCreateTime2() != null, TAppUser::getCreateTime,time2)
.in(finalIds.size() > 0, TAppUser::getId, finalIds)
+ .orderByDesc(TAppUser::getCreateTime)
.page(Page.of(appUserQuery.getPageNum(), appUserQuery.getPageSize()));
for (TAppUser record : page.getRecords()) {
@@ -428,6 +445,9 @@
String join1 = StringUtils.join(lateString, "、");
record.setLateString(join1);
+
+ record.setCreateTimeStr(DateUtils.localDateTimeToString(record.getCreateTime()));
+
}
@@ -485,9 +505,15 @@
tUserChangeDetail.setTitleName(byId2.getTitileName());
TTitleMajor byId3 = majorService.getById(tUserChangeDetail.getMajorId());
tUserChangeDetail.setMajorName(byId3.getMajorName());
+ TLevel byId4 = levelService.getById(tUserChangeDetail.getLevelId());
+ tUserChangeDetail.setLevelName(byId4.getName());
}
tUserChange.setUserChangeDetails(list1);
}
+ TRegion byId2 = regionService.getById(byId.getCityCode());
+ if(Objects.nonNull(byId2)){
+ byId.setCityStr(byId2.getProvinceName()+"-"+byId2.getName());
+ }
byId.setChanges(list);
return R.ok(byId) ;
}
--
Gitblit v1.7.1