From 562699fa6d0c279fe0f4f81ce87c336a34a3fb91 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 23 七月 2024 14:32:23 +0800
Subject: [PATCH] feat: 数据迁移;netty通信;bug修改
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java
index 0bfcc23..866cb3e 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.user.controller;
+import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ruoyi.admin.api.entity.*;
import com.ruoyi.admin.api.feignClient.AdminClient;
@@ -105,13 +106,13 @@
// 手机验证码校验获取缓存验证码
Object phoneCodeRedis = redisService.getCacheObject(RedisConstants.USER_LOGIN_PHONE_CODE + phone);
if (null == phoneCodeRedis) {
- return R.errorCode("登录失败，验证码已过期!");
+ return R.errorCode("验证码错误!");
} else {
// redis 验证码的value 为 code:时间戳
String rCodeAndTime = String.valueOf(phoneCodeRedis);
String rCode = rCodeAndTime.split(":")[0];
if (!rCode.equalsIgnoreCase(phoneCode)) {
- return R.errorCode("登录失败，验证码无效!");
+ return R.errorCode("验证码错误!");
}
}
}
@@ -125,9 +126,9 @@
} else {
user = new User();
// 随机编号
- user.setUserNo(String.format(Constants.USER_NO_PRE, StringUtils.getCharAndNum(Constants.SIX)));
+ user.setUserNo(String.format(Constants.USER_NO_PRE, RandomUtil.randomNumbers(Constants.EIGHT)));
user.setState(Constants.ONE);
- user.setNickname(phone);
+ user.setNickname(String.format(Constants.USER_NO_PRE, StringUtils.getCharAndNum(Constants.SIX)));
user.setPhone(phone);
user.setCity(loginPhoneRequest.getCity());
user.setOpenId(loginPhoneRequest.getOpenId());
@@ -157,7 +158,11 @@
if (!Constants.ZERO.equals(type) && !Constants.ONE.equals(type)) {
throw new GlobalException("获取类型异常！");
}
- return R.ok(adminClient.dataInfo(type).getData());
+ R<Agreement> r = adminClient.agreementPolicy(type);
+ if (500 == r.getCode()) {
+ return R.fail(r.getMsg());
+ }
+ return R.ok(r.getData());
}
/**
@@ -166,21 +171,25 @@
@ApiOperation(value = "轮播图列表", tags = {"用户端-首页"})
@GetMapping(value = "/banner")
public R<List<Rotate>> banner() {
- List<Rotate> data = adminClient.bannerList().getData();
+ R<List<Rotate>> r = adminClient.bannerList();
+ List<Rotate> data = r.getData();
+ if (null == data) {
+ return R.fail(r.getMsg());
+ }
for (Rotate datum : data) {
RecoveryServe recoveryServe = recoveryServeService.lambdaQuery()
- .eq(RecoveryServe::getId, datum.getId())
- .eq(RecoveryServe::getIsDelete, 0).one();
- Integer classifyId = recoveryServe.getClassifyId();
- RecoveryClassify classify = recoveryClassifyService.lambdaQuery()
- .eq(RecoveryClassify::getId, classifyId)
- .eq(RecoveryClassify::getIsDelete, 0).one();
- if (null != classify) {
- String supClassify = classify.getSupClassify();
- if (Constants.RECOVERY.equals(supClassify)) {
- datum.setType(Constants.ONE);
- } else {
- datum.setType(Constants.ZERO);
+ .eq(RecoveryServe::getId, datum.getRotateServeId()).one();
+ if (null != recoveryServe) {
+ Integer classifyId = recoveryServe.getClassifyId();
+ RecoveryClassify classify = recoveryClassifyService.lambdaQuery()
+ .eq(RecoveryClassify::getId, classifyId).one();
+ if (null != classify) {
+ String supClassify = classify.getSupClassify();
+ if (Constants.RECOVERY.equals(supClassify)) {
+ datum.setType(Constants.ONE);
+ } else {
+ datum.setType(Constants.ZERO);
+ }
}
}
}
--
Gitblit v1.7.1