From 63368d374f7c57bd05eb65eac2023e4698d1a7af Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Thu, 21 May 2020 19:29:27 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

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 b9008e1..cf19f1b 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
@@ -1,5 +1,6 @@
 package com.xcong.excoin.modules.member.service.impl;
 
+import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.asymmetric.Sign;
@@ -14,6 +15,7 @@
 import com.xcong.excoin.modules.member.entity.*;
 import com.xcong.excoin.modules.member.service.MemberService;
 import com.xcong.excoin.utils.ShareCodeUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,6 +25,7 @@
  * @author wzy
  * @date 2020-05-18
  **/
+@Slf4j
 @Service
 public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> implements MemberService {
 
@@ -46,14 +49,12 @@
     public Result register(RegisterDto registerDto) {
         // 查询是否存在该账号用户
         MemberEntity member = memberDao.selectMemberInfoByAccount(registerDto.getAccount());
-        if (member == null) {
+        if (member != null) {
             return Result.fail("账号已存在");
         }
 
         member = new MemberEntity();
-        Sign sign = SecureUtil.sign(SignAlgorithm.MD5withRSA);
-        byte[] signByte = sign.sign(registerDto.getPassword().getBytes());
-        member.setPassword(new String(signByte));
+        member.setPassword(SecureUtil.md5(registerDto.getPassword()));
 
         // 判断账号类型
         if (MemberEntity.ACCOUNT_TYPE_PHONE == registerDto.getType()) {

--
Gitblit v1.9.1