From 572df690f72ed4a077d934823f261dec39b3cc7d Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 08 九月 2026 17:11:34 +0800
Subject: [PATCH] feat&bug：文档内容修改
---
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 262 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 246 insertions(+), 16 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index b0148ce..279e705 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -11,6 +11,7 @@
import com.dsh.account.model.AdvertisementChangeStateDTO;
import com.dsh.account.model.AppUserByNameAndPhoneDTO;
import com.dsh.account.model.AppUserIdsByCityName;
+import com.dsh.account.model.ImageCaptchaVo;
import com.dsh.account.model.JoinPlayPaiVo;
import com.dsh.account.model.LoginSMSCodeVo;
import com.dsh.account.model.LoginWeChatVo;
@@ -18,12 +19,7 @@
import com.dsh.account.model.query.UserDetailsOfSearch;
import com.dsh.account.model.query.appUserQuery.QueryAppUser;
import com.dsh.account.model.vo.QueryAppUserVO;
-import com.dsh.account.service.IVipPaymentService;
-import com.dsh.account.service.TAppGiftService;
-import com.dsh.account.service.TAppUserService;
-import com.dsh.account.service.TCourseInfoRecordService;
-import com.dsh.account.service.TStudentService;
-import com.dsh.account.service.UserIntegralChangesService;
+import com.dsh.account.service.*;
import com.dsh.account.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
@@ -43,12 +39,14 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestHeader;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -65,6 +63,8 @@
@Autowired
private TAppUserService appUserService;
+ @Autowired
+ private ImageCaptchaService imageCaptchaService;
@Autowired
private VipClient vipClient;
@@ -85,7 +85,116 @@
@Autowired
private UserIntegralChangesService userIntegralChangesService;
+ @Autowired
+ private UserAuditService userAuditService;
+ /**
+ * 查询用户头像昵称审核列表
+ */
+ @ResponseBody
+ @PostMapping("/user/listAudit")
+ public List<Map<String, Object>> listAudit(@RequestBody UserAuditDTO dto) {
+ List<Map<String, Object>> maps = userAuditService.listAudit(dto);
+ for (Map<String, Object> map : maps) {
+ if (map.get("auditTime")!=null){
+ // 将时间戳转换为YYYY-MM-DD HH:mm:ss
+ String s = map.get("auditTime").toString().split("\\.")[0];
+ map.put("auditTime", s);
+ }
+ }
+ return maps;
+ }
+ @ResponseBody
+ @PostMapping("/user/audit")
+ public void audit(@RequestBody TUserAudit dto){
+ TUserAudit userAudit = userAuditService.getById(dto.getId());
+ TAppUser appUser = appUserService.getById(userAudit.getAppUserId());
+ if (dto.getState()==2){
+ // 审核通过 修改用户头像或昵称
+ if (userAudit.getType()==1){
+ appUser.setName(userAudit.getName());
+ }else{
+ appUser.setHeadImg(userAudit.getHeadImg());
+ }
+ appUserService.updateById(appUser);
+ userAudit.setState(2);
+ userAudit.setAuditTime(new Date());
+ userAuditService.updateById(userAudit);
+ }else{
+ userAudit.setState(3);
+ userAudit.setRemark(dto.getRemark());
+ userAudit.setAuditTime(new Date());
+
+ userAuditService.updateById(userAudit);
+ }
+ }
+ @ResponseBody
+ @PostMapping("/user/auditBatch")
+ public void auditBatch(@RequestBody AuditBatchDTO dto){
+ List<TUserAudit> list = userAuditService.lambdaQuery().in(TUserAudit::getId, dto.getIds())
+ .list();
+ Map<Integer, TAppUser> userMap = appUserService.lambdaQuery()
+ .in(TAppUser::getId, list.stream().map(TUserAudit::getAppUserId)
+ .collect(Collectors.toList())).list()
+ .stream().collect(Collectors.toMap(TAppUser::getId, e -> e));
+ for (TUserAudit userAudit : list) {
+ TAppUser appUser = userMap.get(userAudit.getAppUserId());
+ if (dto.getState()==2){
+ // 审核通过 修改用户头像或昵称
+ if (userAudit.getType()==1){
+ appUser.setName(userAudit.getName());
+ }else{
+ appUser.setHeadImg(userAudit.getHeadImg());
+ }
+ userAudit.setAuditTime(new Date());
+ userAudit.setState(2);
+ userAuditService.updateById(userAudit);
+ }else{
+ userAudit.setState(3);
+ userAudit.setRemark("");
+ userAudit.setAuditTime(new Date());
+
+ userAuditService.updateById(userAudit);
+ }
+ }
+
+ }
+ /**
+ * 获取审核详情
+ */
+ @ResponseBody
+ @GetMapping("/user/getAuditById/{id}")
+ public TUserAudit getAuditById(@PathVariable("id")Integer id) {
+ return userAuditService.getById(id);
+ }
+ /**
+ * 批量修改用户昵称和头像
+ */
+ @ResponseBody
+ @PostMapping("/base/appUser/updateHeadImgAndName")
+ public void updateHeadImgAndName() {
+ List<TAppUser> list = appUserService.list();
+ for (TAppUser appUser : list) {
+ appUser.setHeadImg("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/f7fbeaed277a45ab9591b70dc5699cab.jpg");
+ String s = generateNickname(appUser.getId());
+ appUser.setName(s);
+ }
+ appUserService.updateBatchById(list);
+ }
+ public static String generateNickname(Integer userId) {
+ if (userId == null) {
+ return null;
+ }
+
+ // 将用户ID转换为字符串
+ String userIdStr = String.valueOf(userId);
+
+ // 使用String.format确保总长度为6位，不足的前面补0
+ String formattedId = String.format("%06d", Long.parseLong(userIdStr));
+
+ // 返回"用户" + 格式化后的ID
+ return "用户" + formattedId;
+ }
/**
* 根据介绍有礼id查询当前活动参与次数
*/
@@ -135,6 +244,28 @@
public TAppUser queryAppUser1(@RequestBody Integer appUserId) {
TAppUser appUser = appUserService.getById(appUserId);
return appUser;
+ }
+
+ /**
+ * Internal-only data source for the management sensitive-data query. The
+ * caller is authenticated and authorised by the management service; its
+ * Feign interceptor adds the header that permits the response to remain
+ * unmasked for that single request.
+ */
+ @PostMapping("/internal/sensitive/app-user/{id}")
+ public Map<String, Object> sensitiveAppUser(@PathVariable("id") Integer id,
+ @RequestHeader(value = "X-Internal-Sensitive-Access", required = false) String access) {
+ if (!"true".equalsIgnoreCase(access)) {
+ throw new IllegalStateException("Sensitive data access is restricted to the management service");
+ }
+ TAppUser user = appUserService.getById(id);
+ if (user == null) return null;
+ Map<String, Object> result = new java.util.HashMap<String, Object>();
+ result.put("id", user.getId());
+ result.put("name", user.getName());
+ result.put("phone", user.getPhone());
+ result.put("idCard", user.getIdCard());
+ return result;
}
/**
@@ -211,26 +342,119 @@
}
@ResponseBody
- @PostMapping("/base/appUser/getSMSCode")
- @ApiOperation(value = "获取短信验证码", tags = {"APP-登录注册"})
+ @PostMapping("/base/appUser/imageCaptcha")
+ @ApiOperation(value = "获取短信发送前置图形验证码", tags = {"APP-登录注册"})
@ApiImplicitParams({
@ApiImplicitParam(value = "类型（1：登录，2：注册，3：修改密码，4：忘记密码）", name = "type", dataType = "int", required = true),
@ApiImplicitParam(value = "电话号码", name = "phone", dataType = "string", required = true)
})
- public ResultUtil getSMSCode(Integer type, String phone) {
- if (ToolUtil.isEmpty(phone)) {
+ public ResultUtil<ImageCaptchaVo> getImageCaptcha(Integer type, String phone, HttpServletRequest request) {
+ if (!isValidPhone(phone)) {
return ResultUtil.paranErr("phone");
}
- if (ToolUtil.isEmpty(type)) {
+ if (!isValidSmsType(type)) {
return ResultUtil.paranErr("type");
}
try {
- ResultUtil smsCode = appUserService.getSMSCode(type, phone);
- return smsCode;
+ ImageCaptchaVo captcha = imageCaptchaService.create(phone, type, getClientIp(request));
+ if (captcha == null) {
+ return ResultUtil.error("图形验证码获取过于频繁，请稍后重试", null);
+ }
+ return ResultUtil.success(captcha);
} catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
+ }
+
+ @ResponseBody
+ @PostMapping("/base/appUser/getSMSCode")
+ @ApiOperation(value = "获取短信验证码", tags = {"APP-登录注册"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "类型（1：登录，2：注册，3：修改密码，4：忘记密码）", name = "type", dataType = "int", required = true),
+ @ApiImplicitParam(value = "电话号码", name = "phone", dataType = "string", required = true),
+ @ApiImplicitParam(value = "图形验证码唯一标识", name = "captchaId", dataType = "string", required = true),
+ @ApiImplicitParam(value = "图形验证码", name = "captchaCode", dataType = "string", required = true)
+ })
+ public ResultUtil getSMSCode(Integer type, String phone, String captchaId, String captchaCode,
+ HttpServletRequest request) {
+ if (!isValidPhone(phone)) {
+ return ResultUtil.paranErr("phone");
+ }
+ if (!isValidSmsType(type)) {
+ return ResultUtil.paranErr("type");
+ }
+ if (ToolUtil.isEmpty(captchaId)|| ToolUtil.isEmpty(captchaCode) ) {
+ return ResultUtil.error("系统维护中，注册或登录请联系场地管理员");
+ }
+ if (!imageCaptchaService.verifyAndConsume(captchaId, captchaCode, phone, type)) {
+ return ResultUtil.error("图形验证码错误或已失效，请刷新后重试");
+ }
+ try {
+ return appUserService.getSMSCode(type, phone, getClientIp(request));
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+ private boolean isValidPhone(String phone) {
+ return phone != null && phone.matches("^1\\d{10}$");
+ }
+
+ private boolean isValidSmsType(Integer type) {
+ return type != null && type >= 1 && type <= 4;
+ }
+
+ private String getClientIp(HttpServletRequest request) {
+ String remoteAddress = request.getRemoteAddr();
+ if (!isInternalProxyAddress(remoteAddress)) {
+ return remoteAddress;
+ }
+
+ String forwardedFor = request.getHeader("X-Forwarded-For");
+ if (ToolUtil.isNotEmpty(forwardedFor)) {
+ String[] addresses = forwardedFor.split(",");
+ for (int i = addresses.length - 1; i >= 0; i--) {
+ String clientIp = addresses[i].trim();
+ if (isValidIpText(clientIp) && !isInternalProxyAddress(clientIp)) {
+ return clientIp;
+ }
+ }
+ }
+ String realIp = request.getHeader("X-Real-IP");
+ if (isValidIpText(realIp)) {
+ return realIp.trim();
+ }
+ return remoteAddress;
+ }
+
+ private boolean isInternalProxyAddress(String ip) {
+ if (ip == null) {
+ return false;
+ }
+ if ("127.0.0.1".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip) || "::1".equals(ip)
+ || ip.startsWith("10.") || ip.startsWith("192.168.")) {
+ return true;
+ }
+ if (ip.startsWith("172.")) {
+ String[] parts = ip.split("\\.");
+ if (parts.length == 4) {
+ try {
+ int secondPart = Integer.parseInt(parts[1]);
+ return secondPart >= 16 && secondPart <= 31;
+ } catch (NumberFormatException ignored) {
+ return false;
+ }
+ }
+ }
+ return false;
+ }
+
+ private boolean isValidIpText(String ip) {
+ return ToolUtil.isNotEmpty(ip)
+ && ip.length() <= 45
+ && ip.trim().matches("[0-9a-fA-F:.]+");
}
@@ -419,9 +643,10 @@
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<JoinPlayPaiVo> queryJoinPlayPai(String lon, String lat) {
-
+ System.out.println("11122323232");
try {
Integer uid = tokenUtil.getUserIdFormRedis();
+ System.out.println("55555"+uid);
if (null == uid) {
return ResultUtil.tokenErr();
}
@@ -640,6 +865,10 @@
public void updateAppUser(@RequestBody TAppUser appUser) {
try {
TAppUser appUser1 = appUserService.getById(appUser.getId());
+ // A management edit form may contain the displayed masked value.
+ // Never persist that display value over the original identifier.
+ if (appUser.getPhone() != null && appUser.getPhone().contains("*")) appUser.setPhone(appUser1.getPhone());
+ if (appUser.getIdCard() != null && appUser.getIdCard().contains("*")) appUser.setIdCard(appUser1.getIdCard());
appUserService.updateById(appUser);
if (appUser.getIntegral().compareTo(appUser1.getIntegral()) != 0) {
UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
@@ -699,8 +928,7 @@
integral = integral - updateIntegral.getIntegral();
break;
}
- appUser.setIntegral(integral);
- appUserService.updateById(appUser);
+
UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
userIntegralChanges.setAppUserId(updateIntegral.getId());
userIntegralChanges.setType(1);
@@ -710,6 +938,8 @@
userIntegralChanges.setInsertTime(new Date());
userIntegralChanges.setCategory(updateIntegral.getChangeType());
userIntegralChangesService.save(userIntegralChanges);
+ appUser.setIntegral(integral);
+ appUserService.updateById(appUser);
return true;
}
--
Gitblit v1.7.1