From d3b5fbde186a47c0dc8b0b58d5688ae5691ed9e6 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sat, 10 Jan 2026 23:46:21 +0800
Subject: [PATCH] 签章
---
src/main/java/com/nq/service/impl/UserServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 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..8130840 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -112,7 +112,7 @@
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("注册失败, 参数不能为空");
}
@@ -157,7 +157,7 @@
String uip = IpUtils.getIp(request);
user.setRegIp(uip);
String uadd = JuheIpApi.ip2Add(uip);
- user.setRegAddress(uadd);
+// user.setRegAddress(uadd);
user.setIsLogin(Integer.valueOf(0));
@@ -229,6 +229,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;
}
@@ -462,6 +481,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
public ServerResponse exchangeOp(BigDecimal amt, Integer type, HttpServletRequest request) throws Exception {
@@ -562,8 +591,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 +611,7 @@
user.setNickName(realName);
user.setRealName(realName);
user.setIdCard(idCard);
+ user.setRegAddress(address);
user.setImg1Key(img1key);
user.setImg2Key(img2key);
@@ -1841,6 +1871,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