From e17f787bb9450a90ec4d0731ca068b8284f044b2 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 11 Jan 2026 15:55:21 +0800
Subject: [PATCH] 1
---
.idea/inspectionProfiles/Project_Default.xml | 68 +++++++++
src/main/java/com/nq/service/StockDzService.java | 2
src/main/java/com/nq/pojo/StockSubscribe.java | 2
src/main/java/com/nq/pojo/User.java | 2
src/main/java/com/nq/pojo/StockDz.java | 1
src/main/java/com/nq/vo/stock/StockDzVo.java | 4
src/main/java/com/nq/service/IUserService.java | 2
src/main/java/com/nq/service/impl/UserServiceImpl.java | 30 ---
src/main/resources/mapper/UserMapper.xml | 2
src/main/java/com/nq/vo/user/UserInfoVO.java | 2
src/main/java/com/nq/controller/UserApiController.java | 40 +++++
src/main/java/com/nq/service/impl/StockDzServiceImpl.java | 5
src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java | 3
src/main/java/com/nq/controller/backend/AdminController.java | 59 +++++---
src/main/java/com/nq/controller/backend/AdminStockDz.java | 5
src/main/resources/application.yml | 178 +++++++++---------------
16 files changed, 240 insertions(+), 165 deletions(-)
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..ee9f695
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,68 @@
+<component name="InspectionProjectProfileManager">
+ <profile version="1.0">
+ <option name="myName" value="Project Default" />
+ <inspection_tool class="AliAccessStaticViaInstance" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AliArrayNamingShouldHaveBracket" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AliControlFlowStatementWithoutBraces" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AliDeprecation" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AliEqualsAvoidNull" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AliLongLiteralsEndingWithLowercaseL" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AliMissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AliWrapperTypeEquality" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAbstractClassShouldStartWithAbstractNaming" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAbstractMethodOrInterfaceMethodMustUseJavadoc" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidApacheBeanUtilsCopy" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidCallStaticSimpleDateFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidCommentBehindStatement" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidComplexCondition" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidConcurrentCompetitionRandom" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidDoubleOrFloatEqualCompare" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidManuallyCreateThread" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidMissUseOfMathRandom" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidNegationOperator" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidNewDateGetTime" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidPatternCompileInMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidReturnInFinally" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidStartWithDollarAndUnderLineNaming" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaAvoidUseTimer" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaBigDecimalAvoidDoubleConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaBooleanPropertyShouldNotStartWithIs" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaClassCastExceptionWithSubListToArrayList" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaClassCastExceptionWithToArray" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaClassMustHaveAuthor" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaClassNamingShouldBeCamel" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaCollectionInitShouldAssignCapacity" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaCommentsMustBeJavadocFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaConcurrentExceptionWithModifyOriginSubList" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaConstantFieldShouldBeUpperCase" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaCountDownShouldInFinally" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaDontModifyInForeachCircle" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaEnumConstantsMustHaveComment" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaExceptionClassShouldEndWithException" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaIbatisMethodQueryForList" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaLockShouldWithTryFinally" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaLowerCamelCaseVariableNaming" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaMethodReturnWrapperType" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaMethodTooLong" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaPackageNaming" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaPojoMustOverrideToString" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaPojoMustUsePrimitiveField" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaPojoNoDefaultValue" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaRemoveCommentedCode" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaServiceOrDaoClassShouldEndWithImpl" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaSneakyThrowsWithoutExceptionType" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaStringConcat" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaSwitchExpression" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaSwitchStatement" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaTestClassShouldEndWithTestNaming" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaThreadLocalShouldRemove" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaThreadPoolCreation" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaThreadShouldSetName" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaTransactionMustHaveRollback" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaUndefineMagicConstant" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaUnsupportedExceptionWithModifyAsList" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaUseQuietReferenceNotation" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AlibabaUseRightCaseForDateFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MapOrSetKeyShouldOverrideHashCodeEquals" enabled="true" level="WARNING" enabled_by_default="true" />
+ </profile>
+</component>
\ No newline at end of file
diff --git a/src/main/java/com/nq/controller/UserApiController.java b/src/main/java/com/nq/controller/UserApiController.java
index 7ebf9a9..024208c 100644
--- a/src/main/java/com/nq/controller/UserApiController.java
+++ b/src/main/java/com/nq/controller/UserApiController.java
@@ -1,9 +1,14 @@
package com.nq.controller;
+import cn.hutool.core.util.ObjectUtil;
import com.nq.common.ServerResponse;
+import com.nq.dao.SiteBannerMapper;
+import com.nq.dao.UserMapper;
+import com.nq.pojo.SiteBanner;
import com.nq.pojo.SiteSpread;
+import com.nq.pojo.User;
import com.nq.service.ISiteSpreadService;
import com.nq.service.IUserService;
@@ -42,6 +47,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import java.math.BigDecimal;
+import java.util.List;
@Controller
@@ -53,14 +59,33 @@
IUserService iUserService;
@Autowired
+ UserMapper userMapper;
+
+ @Autowired
ISiteSpreadService iSiteSpreadService;
+
+ @Autowired
+ SiteBannerMapper siteBannerMapper;
//注册
@RequestMapping(value = {"reg.do"}, method = {RequestMethod.POST})
@ResponseBody
- public ServerResponse reg(@RequestParam("agentCode") String agentCode, @RequestParam("phone") String phone, @RequestParam(value = "yzmCode", defaultValue = "") String yzmCode, @RequestParam("userPwd") String userPwd, HttpServletRequest httpServletRequest) {
- return this.iUserService.reg(yzmCode, agentCode, phone, userPwd, httpServletRequest);
-}
+ public ServerResponse reg( @RequestParam("phone") String phone, @RequestParam("userPwd") String userPwd, HttpServletRequest httpServletRequest) {
+ return this.iUserService.reg(phone, userPwd, httpServletRequest);
+ }
+
+ //修改头像
+ @RequestMapping(value = {"updatePhoto.do"}, method = {RequestMethod.POST})
+ @ResponseBody
+ public ServerResponse updatePhoto(@RequestParam("userId") String userId, @RequestParam("photoUrl") String photoUrl,HttpServletRequest httpServletRequest) {
+ User user = userMapper.selectById(userId);
+ if(ObjectUtil.isEmpty(user)){
+ return ServerResponse.createByErrorMsg("用户不存在！");
+ }
+ user.setPhotoUrl(photoUrl);
+ userMapper.updateById(user);
+ return ServerResponse.createBySuccess();
+ }
//登录
@RequestMapping(value = {"login.do"}, method = {RequestMethod.POST})
@@ -123,6 +148,15 @@
return ServerResponse.createBySuccess("获取成功", siteSpread);
}
+ @RequestMapping({"getSiteBanner.do"})
+ @ResponseBody
+ public ServerResponse getSiteBanner() {
+ List<SiteBanner> siteBanners = this.siteBannerMapper.listByAdmin();
+ return ServerResponse.createBySuccess(siteBanners);
+ }
+
+
+
}
diff --git a/src/main/java/com/nq/controller/backend/AdminController.java b/src/main/java/com/nq/controller/backend/AdminController.java
index 033cd1b..17b4237 100644
--- a/src/main/java/com/nq/controller/backend/AdminController.java
+++ b/src/main/java/com/nq/controller/backend/AdminController.java
@@ -1,6 +1,7 @@
package com.nq.controller.backend;
+import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Maps;
@@ -15,7 +16,11 @@
import com.nq.utils.PropertiesUtil;
+import java.io.File;
+import java.io.IOException;
+import java.time.LocalDate;
import java.util.Map;
+import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
@@ -92,29 +97,41 @@
@ResponseBody
public ServerResponse upload(HttpSession session, @RequestParam(value = "upload_file", required = false) MultipartFile file, HttpServletRequest request) {
- String path = request.getSession().getServletContext().getRealPath("upload");
-
- ServerResponse serverResponse = this.iFileUploadService.upload(file, path);
-
- if (serverResponse.isSuccess()) {
-
- String targetFileName = serverResponse.getData().toString();
-
- String url = PropertiesUtil.getProperty("ftp.server.http.prefix") + targetFileName;
-
-
- Map fileMap = Maps.newHashMap();
-
- fileMap.put("uri", targetFileName);
-
- fileMap.put("url", url);
-
-
- return ServerResponse.createBySuccess(fileMap);
-
+ // 兼容c端组件上传原理
+ String fileType = file.getOriginalFilename();
+ if (StrUtil.isEmpty(fileType) || fileType.contains("blob")) {
+ fileType = "blob.png";
}
- return serverResponse;
+ String fileName = file.getOriginalFilename();
+ String fileExtentionName = fileName.substring(fileName.lastIndexOf(".") + 1);
+
+ // 生成唯一的文件名
+ String id = UUID.randomUUID().toString();
+ String path = LocalDate.now() + "/" + id + "." + fileExtentionName;
+
+ // 确保目标文件夹存在
+ File targetDir = new File(PropertiesUtil.getProperty("loca.images.dir") + "/" + LocalDate.now());
+ if (!targetDir.exists()) {
+ targetDir.mkdirs();
+ }
+
+ // 构建本地文件路径
+ File localFile = new File(targetDir, id + "." + fileExtentionName);
+
+ // 打印上传路径
+ log.info("LocalFileUploadService uploadFile localFilePath: {}", localFile.getAbsolutePath());
+
+ try {
+ // 将文件保存到本地
+ file.transferTo(localFile);
+
+ } catch (IOException e) {
+ log.error("LocalFileUploadService uploadFile IOException", e.getMessage(), e);
+ }
+ String url = PropertiesUtil.getProperty("ftp.server.http.prefix") + path;
+ // 返回相对路径
+ return ServerResponse.createBySuccess(url);
}
diff --git a/src/main/java/com/nq/controller/backend/AdminStockDz.java b/src/main/java/com/nq/controller/backend/AdminStockDz.java
index 865dfc0..3c130fe 100644
--- a/src/main/java/com/nq/controller/backend/AdminStockDz.java
+++ b/src/main/java/com/nq/controller/backend/AdminStockDz.java
@@ -38,8 +38,9 @@
@RequestParam(value = "password")String password,
@RequestParam(value = "startTime")String startTime,
@RequestParam(value = "endTime")String endTime,
- @RequestParam(value = "discount") String discount) {
- return stockDzService.addByAdmin(stockCode,stockNum,password,startTime,endTime,discount);
+ @RequestParam(value = "discount") String discount,
+ @RequestParam(value = "discount") Integer residualShare) {
+ return stockDzService.addByAdmin(stockCode,stockNum,password,startTime,endTime,discount,residualShare);
}
/**
* 删除大宗
diff --git a/src/main/java/com/nq/pojo/StockDz.java b/src/main/java/com/nq/pojo/StockDz.java
index c0ef486..64d5f68 100644
--- a/src/main/java/com/nq/pojo/StockDz.java
+++ b/src/main/java/com/nq/pojo/StockDz.java
@@ -47,6 +47,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
private BigDecimal discount;
+ private Integer residualShare;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/src/main/java/com/nq/pojo/StockSubscribe.java b/src/main/java/com/nq/pojo/StockSubscribe.java
index 3e01bcc..0f90782 100644
--- a/src/main/java/com/nq/pojo/StockSubscribe.java
+++ b/src/main/java/com/nq/pojo/StockSubscribe.java
@@ -80,6 +80,8 @@
*/
private Integer type;
+ private Integer residualShare;
+
/**
* 是否上市
*/
diff --git a/src/main/java/com/nq/pojo/User.java b/src/main/java/com/nq/pojo/User.java
index f3faa37..5cb82c7 100644
--- a/src/main/java/com/nq/pojo/User.java
+++ b/src/main/java/com/nq/pojo/User.java
@@ -84,6 +84,8 @@
private BigDecimal djzj;
+ private String photoUrl;
+
public User(Integer id, Integer agentId, String agentName, String phone, String userPwd, String withPwd, String nickName, String realName, String idCard, Integer accountType, BigDecimal userAmt, BigDecimal enableAmt, BigDecimal enaleWithdrawAmt, BigDecimal hkAmt, BigDecimal sumChargeAmt, BigDecimal sumBuyAmt, String recomPhone, Integer isLock, Integer isLogin, Date regTime, String regIp, String regAddress, String img1Key, String img2Key, String img3Key, Integer isActive, String authMsg, BigDecimal userIndexAmt, BigDecimal enableIndexAmt, BigDecimal userFutAmt, BigDecimal enableFutAmt, String withdrawalPwd, BigDecimal tradingAmount, Integer isAuthorize, BigDecimal sgzj, BigDecimal djzj) {
this.id = id;
this.agentId = agentId;
diff --git a/src/main/java/com/nq/service/IUserService.java b/src/main/java/com/nq/service/IUserService.java
index 8cf01de..868fa4e 100644
--- a/src/main/java/com/nq/service/IUserService.java
+++ b/src/main/java/com/nq/service/IUserService.java
@@ -8,7 +8,7 @@
import javax.servlet.http.HttpServletRequest;
public interface IUserService {
- ServerResponse reg(String paramString1, String paramString2, String paramString3, String paramString4, HttpServletRequest paramHttpServletRequest);
+ ServerResponse reg(String paramString3, String paramString4, HttpServletRequest paramHttpServletRequest);
ServerResponse login(String paramString1, String paramString2, HttpServletRequest paramHttpServletRequest);
diff --git a/src/main/java/com/nq/service/StockDzService.java b/src/main/java/com/nq/service/StockDzService.java
index 4825179..a5db32c 100644
--- a/src/main/java/com/nq/service/StockDzService.java
+++ b/src/main/java/com/nq/service/StockDzService.java
@@ -16,7 +16,7 @@
ServerResponse getDzList();
- ServerResponse addByAdmin(String stockCode, String stockNum, String password, String startTime, String endTime, String discount);
+ ServerResponse addByAdmin(String stockCode, String stockNum, String password, String startTime, String endTime, String discount,Integer residualShare);
ServerResponse getDzListByAdmin(String keywords);
diff --git a/src/main/java/com/nq/service/impl/StockDzServiceImpl.java b/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
index 0d8b9f8..d29ff8a 100644
--- a/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
@@ -64,13 +64,15 @@
stockDzVo.setStockNum(stockDz.getStockNum());
stockDzVo.setStartTime(stockDz.getStartTime());
stockDzVo.setEndTime(stockDz.getEndTime());
+ stockDzVo.setDiscount(stockDz.getDiscount());
+ stockDzVo.setResidualShare(stockDz.getResidualShare());
stockDzVos.add(stockDzVo);
}
return ServerResponse.createBySuccess(stockDzVos);
}
@Override
- public ServerResponse addByAdmin(String stockCode, String stockNum, String password, String startTime, String endTime, String discount) {
+ public ServerResponse addByAdmin(String stockCode, String stockNum, String password, String startTime, String endTime, String discount,Integer residualShare) {
if (stockCode == null || stockCode.equals("")||stockNum == null || stockNum.equals("")||password == null || discount == null|| discount.equals("")||
password.equals("")|| startTime == null || startTime.equals("")||endTime == null || endTime.equals("")){
return ServerResponse.createByErrorMsg("参数不能为空");
@@ -96,6 +98,7 @@
stockDz.setStartTime(DateTimeUtil.strToDate(startTime));
stockDz.setEndTime(DateTimeUtil.strToDate(endTime));
stockDz.setDiscount(new BigDecimal(discount));
+ stockDz.setResidualShare(residualShare);
int res = stockDzMapper.insert(stockDz);
if (res > 0) {
return ServerResponse.createBySuccessMsg("添加成功");
diff --git a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
index fa4b41c..ae1770a 100644
--- a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
@@ -64,7 +64,8 @@
}
String s = DateTimeUtil.dateToStr(new Date());
//subscribe_time大于当前时间
- queryWrapper.ge("subscribe_time", DateTimeUtil.dateToStr1(new Date())).orderByAsc("subscribe_time");
+ queryWrapper.le("subscribe_time", DateTimeUtil.dateToStr1(new Date())).orderByAsc("subscribe_time");
+ queryWrapper.ge("subscription_time", DateTimeUtil.dateToStr1(new Date())).orderByAsc("subscribe_time");
List<StockSubscribe> stockSubscribeList = this.stockSubscribeMapper.selectList(queryWrapper);
// List<StockAdminListVO> stockAdminListVOS = Lists.newArrayList();
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index f632221..4288dd6 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -110,9 +110,9 @@
@Autowired
IUserRechargeService userRechargeService;
- 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))
+ public ServerResponse reg(String phone, String userPwd, HttpServletRequest request) {
+ if (StringUtils.isBlank(phone) ||
+ StringUtils.isBlank(userPwd))
{
return ServerResponse.createByErrorMsg("注册失败, 参数不能为空");
}
@@ -121,21 +121,6 @@
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("注册失败, 验证码错误");
-// }
-
-
- AgentUser agentUser = this.iAgentUserService.findByCode(agentCode);
- if (agentUser == null) {
- return ServerResponse.createByErrorMsg("注册失败, 代理不存在");
- }
- if (agentUser.getIsLock().intValue() == 1) {
- return ServerResponse.createByErrorMsg("注册失败, 代理已被锁定");
- }
-
-
User dbuser = this.userMapper.findByPhone(phone);
if (dbuser != null) {
return ServerResponse.createByErrorMsg("注册失败, 手机号已注册");
@@ -143,14 +128,12 @@
User user = new User();
- user.setAgentId(agentUser.getId());
- user.setAgentName(agentUser.getAgentName());
user.setPhone(phone);
user.setUserPwd(SymmetricCryptoUtil.encryptPassword(userPwd));
user.setAccountType(Integer.valueOf(0));
- user.setIsLock(Integer.valueOf(1));
+ user.setIsLock(Integer.valueOf(0));
user.setIsActive(Integer.valueOf(0));
user.setRegTime(new Date());
@@ -180,9 +163,6 @@
if (insertCount > 0) {
//用户注册成功重新代理机构码重新生成
- String newAgentCode = generateUniqueAgentCode();
- agentUser.setAgentCode(newAgentCode);
- iAgentUserService.updateAgentCode(agentUser);
log.info("用户注册成功 手机 {} , ip = {} 地址 = {}", new Object[] { phone, uip, uadd });
return ServerResponse.createBySuccessMsg("注册成功.请登录");
}
@@ -1842,7 +1822,7 @@
userInfoVO.setEnableIndexAmt(user.getEnableIndexAmt());
userInfoVO.setEnaleWithdrawAmt(user.getEnaleWithdrawAmt());
userInfoVO.setHkAmt(user.getHkAmt());
-
+ userInfoVO.setPhotoUrl(user.getPhotoUrl());
BigDecimal historyProfitLoss = new BigDecimal(0);
BigDecimal buyAmtAutual = new BigDecimal(0);
List<UserPosition> userPositionscc = this.userPositionMapper.findMyPositionByCodeAndSpell(user.getId(), "", "", 0);
diff --git a/src/main/java/com/nq/vo/stock/StockDzVo.java b/src/main/java/com/nq/vo/stock/StockDzVo.java
index c3a6765..8114002 100644
--- a/src/main/java/com/nq/vo/stock/StockDzVo.java
+++ b/src/main/java/com/nq/vo/stock/StockDzVo.java
@@ -30,4 +30,8 @@
private Date endTime;
+ private BigDecimal discount;
+
+ private Integer residualShare;
+
}
diff --git a/src/main/java/com/nq/vo/user/UserInfoVO.java b/src/main/java/com/nq/vo/user/UserInfoVO.java
index cfbc60e..66cc422 100644
--- a/src/main/java/com/nq/vo/user/UserInfoVO.java
+++ b/src/main/java/com/nq/vo/user/UserInfoVO.java
@@ -77,6 +77,8 @@
private BigDecimal historyProfitLoss;
+ private String photoUrl;
+
public void setAgentId(Integer agentId) {
this.agentId = agentId;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 144e247..3b2ca79 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,18 +1,77 @@
-# 数据源配置
-# 开发环境配置
server:
- # 服务器的HTTP端口，默认为8090
port: 8091
tomcat:
- # tomcat的URI编码
uri-encoding: UTF-8
- # 连接数满后的排队数，默认为100
accept-count: 1000
threads:
- # tomcat最大线程数，默认为200
max: 800
- # Tomcat启动初始化的线程数，默认值10
min-spare: 100
+
+spring:
+ profiles:
+ active: druid
+ # 文件上传
+ servlet:
+ multipart:
+ max-file-size: 10MB
+ max-request-size: 20MB
+ # 服务模块
+ devtools:
+ restart:
+ enabled: true
+ task:
+ scheduling:
+ pool:
+ size: 8
+ # redis 配置
+ redis:
+ host: localhost
+ port: 6379
+ database: 0
+ password:
+ timeout: 10s
+ lettuce:
+ pool:
+ min-idle: 100
+ max-idle: 300
+ max-active: 300
+ max-wait: -1ms
+ # 数据源配置
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/mix?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: mix
+ password: PsRwRm5nGbtS22Xp
+ druid:
+ initialSize: 5
+ minIdle: 10
+ maxActive: 20
+ maxWait: 60000
+ timeBetweenEvictionRunsMillis: 60000
+ minEvictableIdleTimeMillis: 300000
+ maxEvictableIdleTimeMillis: 900000
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ allow:
+ url-pattern: /druid/*
+ login-username: Greysparrow
+ login-password: 123456
+ filter:
+ stat:
+ enabled: true
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: false
# 日志配置
logging:
@@ -22,20 +81,14 @@
# token配置
token:
- # 令牌自定义标识
header: Authorization
- # 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
- # 令牌有效期（默认30分钟）
expireTime: 30
# MyBatis配置
mybatis:
- # 搜索指定包别名
typeAliasesPackage: com.nq.pojo
- # 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/*Mapper.xml
- # 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml
# PageHelper分页插件
@@ -43,110 +96,17 @@
helperDialect: mysql
supportMethodsArguments: true
params: count=countSql
+
wallet:
isHotWallet: false
+
# Swagger配置
swagger:
- # 是否开启swagger
enabled: true
- # 请求前缀
pathMapping: /dev-api
# 防止XSS攻击
xss:
- # 过滤开关
enabled: true
- # 排除链接（多个用逗号分隔）
excludes: /system/notice
- # 匹配链接
- urlPatterns: /system/*,/monitor/*,/tool/*
-spring:
- profiles:
- active: druid
- # 文件上传
- servlet:
- multipart:
- # 单个文件大小
- max-file-size: 10MB
- # 设置总上传的文件大小
- max-request-size: 20MB
- # 服务模块
- devtools:
- restart:
- # 热部署开关
- enabled: true
- task:
- scheduling:
- pool:
- size: 8 #配置Scheduled定时任务为多线程执行
- # redis 配置
- redis:
- # 地址
- host: localhost
- # 端口，默认为6379
- port: 6379
- # 数据库索引
- database: 0
- # 密码
- password:
- # 连接超时时间
- timeout: 10s
- lettuce:
- pool:
- # 连接池中的最小空闲连接
- min-idle: 100
- # 连接池中的最大空闲连接
- max-idle: 300
- # 连接池的最大数据库连接数
- max-active: 300
- # #连接池最大阻塞等待时间（使用负值表示没有限制）
- max-wait: -1ms
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/mix?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: mix
- password: PsRwRm5nGbtS22Xp
-# url: jdbc:mysql://127.0.0.1:3306/stock_hongta?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: root
-# password: 123456
- druid:
- # 初始连接数
- initialSize: 5
- # 最小连接池数量
- minIdle: 10
- # 最大连接池数量
- maxActive: 20
- # 配置获取连接等待超时的时间
- maxWait: 60000
- # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
- timeBetweenEvictionRunsMillis: 60000
- # 配置一个连接在池中最小生存的时间，单位是毫秒
- minEvictableIdleTimeMillis: 300000
- # 配置一个连接在池中最大生存的时间，单位是毫秒
- maxEvictableIdleTimeMillis: 900000
- # 配置检测连接是否有效
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- enabled: true
- # 设置白名单，不填则允许所有访问
- allow:
- url-pattern: /druid/*
- # 控制台管理用户名和密码
- login-username: Greysparrow
- login-password: 123456
- filter:
- stat:
- enabled: true
- # 慢SQL记录
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: false
+ urlPatterns: /system/*,/monitor/*,/tool/*
\ No newline at end of file
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 89ee336..a116406 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -122,7 +122,7 @@
</select>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
- <include refid="Base_Column_List" />
+ *
from user
where id = #{id,jdbcType=INTEGER}
</select>
--
Gitblit v1.9.3