From cca752f0a1e88947a150b12901e096255360ed19 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 28 May 2020 11:42:31 +0800
Subject: [PATCH] 20200528   代码提交

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |    4 ++--
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java    |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index 509615d..b576ce6 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -108,8 +108,7 @@
 	 * @return
 	 */
 	@ApiOperation(value="设置交易密码", notes="设置交易密码")
-	@PostMapping(value="/memberUpdateTradePwd")
-	@RequestMapping(value="/memberTradersPwd")
+	@PostMapping(value="/memberTradersPwd")
 	public Result  memberTradersPwd(@RequestBody @Valid MemberForgetPwdDto memberForgetPwdDto) {
 		return memberService.memberTradersPwd(memberForgetPwdDto);
 	}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 89ee26b..839e353 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -390,14 +390,14 @@
 			memberEntity.setTradePassword(SecureUtil.md5(password));
 			memberDao.updateById(memberEntity);
 		}else {
-			return Result.fail(MessageSourceUtils.getString("member_service_0041"));
+			return Result.fail(MessageSourceUtils.getString("member_service_0015"));
 		}
 		if(type == 1) {
 			redisUtils.del("SMS_" + phone);
 		}else {
 			redisUtils.del("EMAIL_" + email);
 		}
-        return Result.ok(MessageSourceUtils.getString("member_service_0051"));
+        return Result.ok(MessageSourceUtils.getString("member_service_0068"));
     }
 
 

--
Gitblit v1.9.1