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/common/system/controller/LoginController.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java b/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
index 8e2d3d2..a5e363c 100644
--- a/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
+++ b/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
@@ -1,5 +1,6 @@
package com.xcong.excoin.common.system.controller;
+import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.IdUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.asymmetric.KeyType;
@@ -60,12 +61,8 @@
@ApiOperation(value = "登陆接口", notes = "登陆接口")
@PostMapping("/login")
public Result login(@RequestBody @Validated LoginDto loginDto) {
- // 使用md5加密前端传来的密码
- Sign sign = SecureUtil.sign(SignAlgorithm.MD5withRSA);
- byte[] pwdByte = sign.sign(loginDto.getPassword().getBytes());
-
// 将账号密码交给spring security验证，并调用userServiceDetails
- UsernamePasswordAuthenticationToken authToken = new UsernamePasswordAuthenticationToken(loginDto.getUsername(), loginDto.getPassword());
+ UsernamePasswordAuthenticationToken authToken = new UsernamePasswordAuthenticationToken(loginDto.getUsername(), SecureUtil.md5(loginDto.getPassword()));
Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authToken);
// 获取当前验证过后的用户
@@ -95,7 +92,7 @@
@ApiOperation(value = "app注册接口", notes = "app注册接口，验证码必须输入可默认为123456")
@PostMapping(value = "/register")
public Result register(@RequestBody @Validated RegisterDto registerDto) {
- return null;
+ return memberservice.register(registerDto);
}
}
--
Gitblit v1.9.1