From 3d8c9b6f4455b4efd34812c8e66073bebfacfce7 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 05 Jun 2026 11:20:23 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/admin/model/AgentAndModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/WithdrawController.java | 5 --
trading-order-admin/src/main/java/com/yami/trading/admin/model/CmsModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/NewsModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/c2c/C2cPaymentMethodConfigUpdateModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/CheckSafeWordModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/model/SuccessModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/RestPasswordModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/c2c/C2cPaymentMethodConfigDeleteModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/UserRecomUpdateModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/ChangeAddressModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerUpdateModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/ManualReceiptModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/facade/CustomerServiceImpl.java | 3 -
trading-order-admin/src/main/java/com/yami/trading/admin/model/BannerModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserRecomController.java | 5 --
trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodUpdateModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodDeleteModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/NewsController.java | 10 -----
trading-order-admin/src/main/java/com/yami/trading/admin/model/RestSafePasswordModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/CmsController.java | 10 -----
trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java | 3 -
trading-order-admin/src/main/java/com/yami/trading/admin/controller/customer/model/ForceOfflineModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodAddModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/WithdrawExamineModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/ForceOfflineModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/RestLoginPasswrodModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/model/DeleteModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/ManualReleaseModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerAddModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerPasswordModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/BannerController.java | 10 -----
trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/AdminMinerController.java | 8 ---
trading-order-admin/src/main/java/com/yami/trading/admin/model/ResetUserLoginStateModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/GooleAuthUnbindingModel.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/controller/syspara/SysparaController.java | 3 -
trading-order-admin/src/main/java/com/yami/trading/admin/model/DeleteGooleAuthCodeModel.java | 1
37 files changed, 2 insertions(+), 83 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodAddModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodAddModel.java
index 0b62a6a..fcf768d 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodAddModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodAddModel.java
@@ -45,7 +45,6 @@
private String remark;
@ApiModelProperty("资金密码")
- @NotBlank
private String loginSafeword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodDeleteModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodDeleteModel.java
index 47d9e00..d2df613 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodDeleteModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodDeleteModel.java
@@ -16,7 +16,6 @@
@ApiModelProperty("资金密码")
- @NotBlank
private String loginSafeword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodUpdateModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodUpdateModel.java
index 9d44ed4..548c9d2 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodUpdateModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodUpdateModel.java
@@ -48,7 +48,6 @@
private String remark;
@ApiModelProperty("资金密码")
- @NotBlank
private String loginSafeword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/BannerController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/BannerController.java
index 3e9dae4..3048f9c 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/BannerController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/BannerController.java
@@ -64,11 +64,6 @@
@ApiOperation(value = "新增")
@PostMapping("add")
public Result<?> add(@RequestBody @Valid BannerModel model) {
- model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
- SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
- if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
- throw new YamiShopBindException("资金密码不正确!");
- }
if (StrUtil.isEmpty(model.getImage())){
throw new YamiShopBindException("展示图片不能为空");
}
@@ -88,11 +83,6 @@
@ApiOperation(value = "更新")
@PostMapping("update")
public Result<?> update(@RequestBody @Valid BannerModel model) {
- model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
- SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
- if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
- throw new YamiShopBindException("资金密码不正确!");
- }
if (StrUtil.isEmpty(model.getImage())){
throw new YamiShopBindException("展示图片不能为空");
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/CmsController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/CmsController.java
index 4fa3e73..84a6356 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/CmsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/CmsController.java
@@ -75,11 +75,6 @@
@ApiOperation(value = "新增")
@PostMapping("add")
public Result<?> add(@RequestBody @Valid CmsModel model) {
- model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
- SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
- if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
- throw new YamiShopBindException("资金密码不正确!");
- }
Cms cms = new Cms();
cms.setContent(model.getContent());
cms.setLanguage(model.getLanguage());
@@ -100,11 +95,6 @@
@ApiOperation(value = "更新")
@PostMapping("update")
public Result<?> update(@RequestBody @Valid CmsModel model) {
- model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
- SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
- if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
- throw new YamiShopBindException("资金密码不正确!");
- }
Cms cms = cmsService.getById(model.getId());
if (cms == null) {
throw new YamiShopBindException("参数错误!");
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/NewsController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/NewsController.java
index 61d48a5..8caf637 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/NewsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/NewsController.java
@@ -65,11 +65,6 @@
@ApiOperation(value = "新增")
@PostMapping("add")
public Result<?> add(@RequestBody @Valid NewsModel model){
- model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
- SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
- if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
- throw new YamiShopBindException("资金密码不正确!");
- }
News news=new News();
if (!StringUtils.isEmptyString(model.getUserCode())) {
User user= userService.findUserByUserCode(model.getUserCode());
@@ -98,11 +93,6 @@
@ApiOperation(value = "更新")
@PostMapping("update")
public Result<?> update(@RequestBody @Valid NewsModel model){
- model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
- SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
- if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
- throw new YamiShopBindException("资金密码不正确!");
- }
News news=newsSerivce.getById(model.getId());
if (news==null){
throw new YamiShopBindException("参数错误!");
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/model/DeleteModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/model/DeleteModel.java
index 53c22fa..cb4cc64 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/model/DeleteModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/model/DeleteModel.java
@@ -15,6 +15,5 @@
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String loginSafeword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/customer/model/ForceOfflineModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/customer/model/ForceOfflineModel.java
index 4063a4c..32802a6 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/customer/model/ForceOfflineModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/customer/model/ForceOfflineModel.java
@@ -13,7 +13,6 @@
private String id;
@ApiModelProperty("资金密码")
- @NotBlank
private String loginSafeword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/model/SuccessModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/model/SuccessModel.java
index 63dcb5f..a7a6b25 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/model/SuccessModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/model/SuccessModel.java
@@ -11,7 +11,6 @@
public class SuccessModel {
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String loginSafeword;
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/AdminMinerController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/AdminMinerController.java
index f8b9632..289dd1c 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/AdminMinerController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/AdminMinerController.java
@@ -527,13 +527,7 @@
* @param loginSafeword
*/
protected void checkLoginSafeword(User secUser,String operatorUsername,String loginSafeword) {
-// SecUser sec = this.secUserService.findUserByLoginName(operatorUsername);
- String sysSafeword = secUser.getSafePassword();
-
- String safeword_md5 = passwordEncoder.encode(loginSafeword);
- if (!safeword_md5.equals(sysSafeword)) {
- throw new BusinessException("登录人资金密码错误");
- }
+ // 登录人资金密码校验已关闭
}
// public String toDelete() {
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/syspara/SysparaController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/syspara/SysparaController.java
index b439e95..9a2a8fe 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/syspara/SysparaController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/syspara/SysparaController.java
@@ -172,9 +172,6 @@
private void verification(SysparasDto sysparasDto) {
- if (StringUtils.isEmpty(sysparasDto.getLogin_safeword())) {
- throw new YamiShopBindException("The fund password cannot be blank");
- }
if (StringUtils.isEmpty(sysparasDto.getSuper_google_auth_code())) {
throw new YamiShopBindException("谷歌验证码不能为空");
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserRecomController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserRecomController.java
index 130d33a..076c3d2 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserRecomController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserRecomController.java
@@ -66,11 +66,6 @@
@ApiOperation("修改推荐关系")
public Result<Page<UserRecomDto>> update(@Valid @RequestBody UserRecomUpdateModel model) {
- model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
- SysUser sysUser = sysUserService.getSysUserById( SecurityUtils.getSysUser().getUserId());
- if(!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
- throw new YamiShopBindException("资金密码不正确!");
- }
UserRecom userRecom= userRecomService.getById(model.getId());
if (userRecom==null){
throw new YamiShopBindException("参数错误!");
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/WithdrawController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/WithdrawController.java
index e22e788..b2f5924 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/WithdrawController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/WithdrawController.java
@@ -91,11 +91,6 @@
public Result<?> changeAddress(@RequestBody @Valid ChangeAddressModel model) {
String adminUserName = SecurityUtils.getSysUser().getUsername();
Long adminUserId = SecurityUtils.getSysUser().getUserId();
- model.setSafeWord(passwordManager.decryptPassword(model.getSafeWord()));
- SysUser user = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
- if (passwordEncoder.matches(model.getSafeWord(), user.getSafePassword())) {
- throw new YamiShopBindException("资金密码不正确!");
- }
withdrawService.updateAddress(model.getId(), adminUserName, adminUserId, model.getChangeAfterAddress());
return Result.ok(null);
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/facade/CustomerServiceImpl.java b/trading-order-admin/src/main/java/com/yami/trading/admin/facade/CustomerServiceImpl.java
index 279062d..60788d0 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/facade/CustomerServiceImpl.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/facade/CustomerServiceImpl.java
@@ -263,8 +263,7 @@
onlineChatMessageService.updateNoAnwserUser(username);
}
public void updatePersonalAutoAnswer(String username,String loginSafeword,String ip,String autoAnswer) {
- userService.checkSafeWord(loginSafeword);
- SysUser user = userService.getByUserName(username);
+ SysUser user = sysUserService.getByUserName(username);
updateAutoAnswer(user,username,ip,autoAnswer);
}
public void updateAutoAnswer(SysUser user,String operatorUsername,String ip,String autoAnswer) {
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/AgentAndModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/AgentAndModel.java
index 309b544..6459937 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/AgentAndModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/AgentAndModel.java
@@ -20,7 +20,6 @@
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String safeword;
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/BannerModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/BannerModel.java
index 352b47d..3e115b2 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/BannerModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/BannerModel.java
@@ -15,7 +15,6 @@
private String id;
@ApiModelProperty("资金密码")
- @NotBlank
private String loginSafeword;
@ApiModelProperty("语言")
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/ChangeAddressModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/ChangeAddressModel.java
index 4a5be95..a4220ac 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/ChangeAddressModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/ChangeAddressModel.java
@@ -18,7 +18,6 @@
private String changeAfterAddress;
- @NotBlank
@ApiModelProperty("资金密码")
private String safeWord;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/CheckSafeWordModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/CheckSafeWordModel.java
index 6d10c7f..fe7f27c 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/CheckSafeWordModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/CheckSafeWordModel.java
@@ -11,6 +11,5 @@
public class CheckSafeWordModel {
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String loginSafeword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/CmsModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/CmsModel.java
index c8a2ff3..1961441 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/CmsModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/CmsModel.java
@@ -15,7 +15,6 @@
private String id;
@ApiModelProperty("资金密码")
- @NotBlank
private String loginSafeword;
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/DeleteGooleAuthCodeModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/DeleteGooleAuthCodeModel.java
index ae4ef23..f4e300a 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/DeleteGooleAuthCodeModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/DeleteGooleAuthCodeModel.java
@@ -20,6 +20,5 @@
private String googleAuthCode;
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String loginSafeword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/GooleAuthUnbindingModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/GooleAuthUnbindingModel.java
index 75c3051..46893e0 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/GooleAuthUnbindingModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/GooleAuthUnbindingModel.java
@@ -10,7 +10,6 @@
@ApiModel
public class GooleAuthUnbindingModel {
- @NotBlank
@ApiModelProperty("资金密码")
private String safeWord;
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/ManualReceiptModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/ManualReceiptModel.java
index a48aeb3..8f1fdfd 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/ManualReceiptModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/ManualReceiptModel.java
@@ -20,6 +20,5 @@
private BigDecimal amount;
@ApiModelProperty("资金密码")
- @NotBlank
private String safePasssword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/ManualReleaseModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/ManualReleaseModel.java
index 57b3a70..099a79c 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/ManualReleaseModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/ManualReleaseModel.java
@@ -18,5 +18,4 @@
@ApiModelProperty("资金密码")
- @NotBlank
private String safeword;}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/NewsModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/NewsModel.java
index 67fff39..922fde6 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/NewsModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/NewsModel.java
@@ -14,7 +14,6 @@
@ApiModelProperty("修改传id 新增不传")
private String id;
@ApiModelProperty("资金密码")
- @NotBlank
private String loginSafeword;
@ApiModelProperty("标题")
@NotBlank
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/ResetUserLoginStateModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/ResetUserLoginStateModel.java
index 8c52dd6..7fb2772 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/ResetUserLoginStateModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/ResetUserLoginStateModel.java
@@ -16,7 +16,6 @@
@ApiModelProperty("资金密码")
- @NotBlank
private String loginSafeword;
@ApiModelProperty("userid")
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/RestLoginPasswrodModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/RestLoginPasswrodModel.java
index 437fc41..1436103 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/RestLoginPasswrodModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/RestLoginPasswrodModel.java
@@ -16,7 +16,6 @@
private String googleAuthCode;
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String loginSafeword;
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/RestPasswordModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/RestPasswordModel.java
index 2dd13f5..cd8edd3 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/RestPasswordModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/RestPasswordModel.java
@@ -20,6 +20,5 @@
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String safeword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/RestSafePasswordModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/RestSafePasswordModel.java
index dd46ba8..c95f284 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/RestSafePasswordModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/RestSafePasswordModel.java
@@ -21,7 +21,6 @@
private String googleAuthCode;
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String loginSafeword;
@ApiModelProperty("新资金密码")
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/UserRecomUpdateModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/UserRecomUpdateModel.java
index a9d08ab..afba71d 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/UserRecomUpdateModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/UserRecomUpdateModel.java
@@ -19,6 +19,5 @@
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String loginSafeword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/WithdrawExamineModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/WithdrawExamineModel.java
index 3d58406..b0fe284 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/WithdrawExamineModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/WithdrawExamineModel.java
@@ -16,6 +16,5 @@
@ApiModelProperty("资金密码")
- @NotBlank
private String safePasssword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/c2c/C2cPaymentMethodConfigDeleteModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/c2c/C2cPaymentMethodConfigDeleteModel.java
index 42e3bbf..d01aa18 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/c2c/C2cPaymentMethodConfigDeleteModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/c2c/C2cPaymentMethodConfigDeleteModel.java
@@ -18,7 +18,6 @@
@ApiModelProperty("登录资金人密码")
- @NotBlank
private String loginSafeword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/c2c/C2cPaymentMethodConfigUpdateModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/c2c/C2cPaymentMethodConfigUpdateModel.java
index 189ca19..806ed9a 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/c2c/C2cPaymentMethodConfigUpdateModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/c2c/C2cPaymentMethodConfigUpdateModel.java
@@ -115,7 +115,6 @@
@ApiModelProperty("登录资金人密码")
- @NotBlank
private String loginSafeword;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerAddModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerAddModel.java
index 40797da..81821c9 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerAddModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerAddModel.java
@@ -31,7 +31,6 @@
private boolean enabled;
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String loginSafeword;
@ApiModelProperty("超级管理员谷歌验证码")
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerPasswordModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerPasswordModel.java
index 1aec616..01602a9 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerPasswordModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerPasswordModel.java
@@ -19,7 +19,6 @@
private String password;
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String loginSafeword;
@ApiModelProperty("超级管理员谷歌验证码")
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerUpdateModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerUpdateModel.java
index c6958c7..e33c394 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerUpdateModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerUpdateModel.java
@@ -23,7 +23,6 @@
@ApiModelProperty("登录权限 true 开启 false 禁用")
private boolean enabled;
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String loginSafeword;
@ApiModelProperty("备注")
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/ForceOfflineModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/ForceOfflineModel.java
index 964913a..79f57ae 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/ForceOfflineModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/ForceOfflineModel.java
@@ -17,6 +17,5 @@
@ApiModelProperty("登录人资金密码")
- @NotBlank
private String loginSafeword;
}
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
index 95c0a33..958f70d 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
@@ -937,9 +937,6 @@
if (!flag && Long.valueOf(googleAuthCode) != 998899) {
throw new YamiShopBindException("谷歌验证码错误!");
}
- if (!passwordEncoder.matches(loginSafeword, user.getSafePassword())) {
- throw new YamiShopBindException("登录人资金密码错误");
- }
user.setGoogleAuthBind(false);
user.setGoogleAuthSecret("");
updateById(user);
--
Gitblit v1.9.3