From 9d65dd091154a0301076549e031e15017898c2ee Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sun, 11 Jan 2026 14:07:02 +0800
Subject: [PATCH] 签章
---
src/main/java/com/nq/service/impl/UserServiceImpl.java | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index f6acbd4..cfbc8b4 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -112,16 +112,16 @@
public ServerResponse reg(String yzmCode, String agentCode, String phone, String userPwd, HttpServletRequest request) {
if (StringUtils.isBlank(agentCode) || StringUtils.isBlank(phone) ||
- StringUtils.isBlank(userPwd) || StringUtils.isBlank(yzmCode))
+ StringUtils.isBlank(userPwd))
{
return ServerResponse.createByErrorMsg("注册失败, 参数不能为空");
}
- String keys = "AliyunSmsCode:" + phone;
- String redis_yzm = RedisShardedPoolUtils.get(keys);
-
- log.info("redis_yzm = {},yzmCode = {}", redis_yzm, yzmCode);
+// String keys = "AliyunSmsCode:" + phone;
+// String redis_yzm = RedisShardedPoolUtils.get(keys);
+//
+// log.info("redis_yzm = {},yzmCode = {}", redis_yzm, yzmCode);
// if (!yzmCode.equals(redis_yzm) && !"6666".equals(yzmCode)) {
// return ServerResponse.createByErrorMsg("注册失败, 验证码错误");
// }
@@ -154,10 +154,19 @@
user.setIsActive(Integer.valueOf(0));
user.setRegTime(new Date());
- String uip = IpUtils.getIp(request);
- user.setRegIp(uip);
- String uadd = JuheIpApi.ip2Add(uip);
- user.setRegAddress(uadd);
+// String uip = IpUtils.getIp(request);
+// user.setRegIp(uip);
+// // IP地址查询改为异步处理，避免阻塞注册接口
+// final String finalUip = uip;
+// final String finalPhone = phone;
+// new Thread(() -> {
+// try {
+// String uadd = JuheIpApi.ip2Add(finalUip);
+// log.info("用户注册IP地址查询完成 手机 {} , ip = {} 地址 = {}", finalPhone, finalUip, uadd);
+// } catch (Exception e) {
+// log.error("IP地址查询异常", e);
+// }
+// }).start();
user.setIsLogin(Integer.valueOf(0));
@@ -183,7 +192,7 @@
String newAgentCode = generateUniqueAgentCode();
agentUser.setAgentCode(newAgentCode);
iAgentUserService.updateAgentCode(agentUser);
- log.info("用户注册成功 手机 {} , ip = {} 地址 = {}", new Object[] { phone, uip, uadd });
+ log.info("用户注册成功 手机 {} , ip = {}", phone, "123123");
return ServerResponse.createBySuccessMsg("注册成功.请登录");
}
return ServerResponse.createBySuccessMsg("注册出错, 请重试");
@@ -229,6 +238,25 @@
String property = PropertiesUtil.getProperty("user.cookie.name");
// System.out.println(property);
String loginToken = request.getHeader(property);
+
+ // 如果header中没有token，尝试从cookie获取
+ if (loginToken == null) {
+ javax.servlet.http.Cookie[] cookies = request.getCookies();
+ if (cookies != null) {
+ for (javax.servlet.http.Cookie cookie : cookies) {
+ if (property != null && property.equals(cookie.getName())) {
+ loginToken = cookie.getValue();
+ break;
+ }
+ }
+ }
+ }
+
+ // 如果cookie中也没有token，尝试从URL参数获取（用于iframe等场景）
+ if (loginToken == null) {
+ loginToken = request.getParameter("token");
+ }
+
if (loginToken == null) {
return null;
}
@@ -366,6 +394,7 @@
String userJson = RedisShardedPoolUtils.get(loginToken);
User user = (User)JsonUtil.string2Obj(userJson, User.class);
User dbuser = this.userMapper.selectByPrimaryKey(user.getId());
+ RedisShardedPoolUtils.setEx(loginToken, JsonUtil.obj2String(dbuser), 9999);
UserInfoVO userInfoVO = assembleUserInfoVO(dbuser);
return ServerResponse.createBySuccess(userInfoVO);
@@ -461,6 +490,16 @@
}
return ServerResponse.createByErrorMsg("修改失败");
}
+
+ @Override
+ public void updateSignedContract(Integer userId, String signedContract) {
+ this.userMapper.updateSignedContract(userId,signedContract);
+ }
+ @Override
+ public void updateSignedAgreement(Integer userId, String signedAgreement) {
+ this.userMapper.updateSignedAgreement(userId,signedAgreement);
+ }
+
@Transactional
@Override
@@ -562,8 +601,8 @@
}
- public ServerResponse auth(String realName, String idCard, String img1key, String img2key, String img3key, HttpServletRequest request) {
- if (StringUtils.isBlank(realName) || StringUtils.isBlank(idCard)){
+ public ServerResponse auth(String realName, String idCard, String address, String img1key, String img2key, String img3key, HttpServletRequest request) {
+ if (StringUtils.isBlank(realName) || StringUtils.isBlank(idCard) || StringUtils.isBlank(address)){
// StringUtils.isBlank(img1key) ||
// StringUtils.isBlank(img2key))
return ServerResponse.createByErrorMsg("参数不能为空");
@@ -582,6 +621,7 @@
user.setNickName(realName);
user.setRealName(realName);
user.setIdCard(idCard);
+ user.setRegAddress(address);
user.setImg1Key(img1key);
user.setImg2Key(img2key);
@@ -1841,6 +1881,8 @@
userInfoVO.setEnableIndexAmt(user.getEnableIndexAmt());
userInfoVO.setEnaleWithdrawAmt(user.getEnaleWithdrawAmt());
+ userInfoVO.setIsSignedContract(user.getIsSignedContract());
+ userInfoVO.setIsSignedAgreement(user.getIsSignedAgreement());
userInfoVO.setHkAmt(user.getHkAmt());
BigDecimal historyProfitLoss = new BigDecimal(0);
--
Gitblit v1.9.3