From 40393ae605bb5df6d4ffa136e13fd952bd936b29 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Sep 2021 17:21:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/java/cc/mrbird/febs/mall/controller/ApiLoginController.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiLoginController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiLoginController.java
index 496a308..3dc024f 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiLoginController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiLoginController.java
@@ -1,8 +1,9 @@
 package cc.mrbird.febs.mall.controller;
 
 import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.mall.dto.LoginDto;
 import cc.mrbird.febs.mall.dto.RegisterDto;
-import cc.mrbird.febs.mall.service.MallMemberService;
+import cc.mrbird.febs.mall.service.IApiMallMemberService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -23,15 +24,21 @@
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping(value = "/api/login/")
+@RequestMapping(value = "/api/login")
 @Api(value = "ApiLoginController", tags = "登录注册类")
 public class ApiLoginController {
 
-    private final MallMemberService memberService;
+    private final IApiMallMemberService memberService;
 
-    @ApiOperation(value = "app注册接口", notes = "app注册接口,验证码必须输入可默认为123456")
+    @ApiOperation(value = "app注册接口", notes = "app注册接口")
     @PostMapping(value = "/register")
     public FebsResponse register(@RequestBody RegisterDto registerDto) {
         return memberService.register(registerDto);
     }
+
+    @ApiOperation(value = "账号密码登录接口", notes = "账号密码登录接口")
+    @PostMapping(value = "/toLogin")
+    public FebsResponse login(@RequestBody LoginDto loginDto) {
+        return memberService.toLogin(loginDto);
+    }
 }

--
Gitblit v1.9.1