From fac6ec13364ef50bca00c85385db86ee38d4be8e Mon Sep 17 00:00:00 2001 From: unclekh <5177787+unclekh@user.noreply.gitee.com> Date: Mon, 25 May 2020 07:23:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/blockchain/common/base/dto/ResultDTO.java | 2 +- .../blockchain/server/user/controller/LoginController.java | 2 +- .../blockchain/server/user/service/YyyfUserService.java | 2 +- .../server/user/service/impl/YyyfUserServiceImpl.java | 3 ++- .../blockchain/server/yyyf/controller/LoginController.java | 7 ++++--- .../java/com/blockchain/server/yyyf/entity/AssessUser.java | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/blockchain-common/blockchain-common-base/src/main/java/com/blockchain/common/base/dto/ResultDTO.java b/blockchain-common/blockchain-common-base/src/main/java/com/blockchain/common/base/dto/ResultDTO.java index 53018b1..4b1d2d0 100644 --- a/blockchain-common/blockchain-common-base/src/main/java/com/blockchain/common/base/dto/ResultDTO.java +++ b/blockchain-common/blockchain-common-base/src/main/java/com/blockchain/common/base/dto/ResultDTO.java @@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest; @AllArgsConstructor public class ResultDTO extends BaseDTO { private int code;//返回码 - private String msg;//返回码描述 + private String msg="系统错误";//返回码描述 private T data;//返回数据 public static ResultDTO requstSuccess() { diff --git a/blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/controller/LoginController.java b/blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/controller/LoginController.java index 31e417c..b9da86a 100644 --- a/blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/controller/LoginController.java +++ b/blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/controller/LoginController.java @@ -330,7 +330,7 @@ public class LoginController { yyyfUserId = yyyfUserDto.getUserId(); YyyfUser yyyfUser = this.yyyfUserService.selectByYyyfUserIdAndTel(yyyfUserId, tel); if (yyyfUser == null) { - this.yyyfUserService.saveUser(yyyfUserId, userId, yyyfUserDto.getUserName()); + this.yyyfUserService.saveUser(yyyfUserId, userId,tel, yyyfUserDto.getUserName()); // this.redisTemplate.delete(yyyfTtoken); } else { if (!yyyfUser.getUserId().equals(userId)) { diff --git a/blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/service/YyyfUserService.java b/blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/service/YyyfUserService.java index 3243e58..326058f 100644 --- a/blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/service/YyyfUserService.java +++ b/blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/service/YyyfUserService.java @@ -14,7 +14,7 @@ public interface YyyfUserService { * @param email * @param hasRelation 是否有关系链信息 */ - void saveUser(Integer yyyfUserId,String userId, String yyyfName); + void saveUser(Integer yyyfUserId,String userId,String tel,String yyyfName); /** * @description diff --git a/blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/service/impl/YyyfUserServiceImpl.java b/blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/service/impl/YyyfUserServiceImpl.java index 479b7e2..400941a 100644 --- a/blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/service/impl/YyyfUserServiceImpl.java +++ b/blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/service/impl/YyyfUserServiceImpl.java @@ -41,10 +41,11 @@ public class YyyfUserServiceImpl implements YyyfUserService { @Transactional @Override - public void saveUser(Integer yyyfUserId, String userId, String yyyfName) { + public void saveUser(Integer yyyfUserId, String userId,String tel, String yyyfName) { YyyfUser yyyfUser=new YyyfUser(); yyyfUser.setYyyfUserId(yyyfUserId); yyyfUser.setUserId(userId); + yyyfUser.setMobilePhone(tel); yyyfUser.setYyyfUserName(yyyfName); yyyfUser.setCreateTime(new Date()); this.yyyfUserMapper.insert(yyyfUser); diff --git a/blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/controller/LoginController.java b/blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/controller/LoginController.java index 844412c..25d6ae0 100644 --- a/blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/controller/LoginController.java +++ b/blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/controller/LoginController.java @@ -44,7 +44,7 @@ public class LoginController { private static final Logger LOG = LoggerFactory.getLogger(LoginController.class); - private static final String SMS_TYPE_LOGIN = "LOGIN"; + private static final String REGISTER_KEY = "user:sms:register:"; private static final int TIME_OUT=10; @@ -108,10 +108,10 @@ public class LoginController { //第一次进入进行注册 String code=String.format("%06d",new Random().nextInt(1000000)); - redisTemplate.opsForValue().set(SMS_TYPE_LOGIN.concat(tel),code,TIME_OUT, TimeUnit.MINUTES); + redisTemplate.opsForValue().set(REGISTER_KEY.concat(tel),code,TIME_OUT, TimeUnit.MINUTES); yyyfLoginDto.setCode(code); - String password=IdGenerator.uuid(); + String password=String.format("%08d",new Random().nextInt(10000000)); String assessUserId = IdGenerator.uuid(); assessUser = new AssessUser(); assessUser.setId(assessUserId); @@ -209,6 +209,7 @@ public class LoginController { redisTemplate.opsForValue().set(caseKey, map); redisTemplate.expire(caseKey, 2, TimeUnit.HOURS); + yyyfLoginDto.setStatus(1); } diff --git a/blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/entity/AssessUser.java b/blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/entity/AssessUser.java index 6813f30..3e03f41 100644 --- a/blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/entity/AssessUser.java +++ b/blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/entity/AssessUser.java @@ -133,6 +133,6 @@ public class AssessUser implements Serializable { /** * 密码 */ - @Column(name = "tel") + @Column(name = "password") private String password; }