From c17ee7624b28485794e956a17631ce2d41a623ff Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 十一月 2024 09:05:22 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index a02e3eb..752b1e7 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.controller;
+import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BaseTable;
@@ -9,6 +10,8 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -23,6 +26,8 @@
@RequestMapping("/app-user")
public class AppUserController {
+ @Resource
+ private AppUserService appUserService;
@@ -32,8 +37,7 @@
@PostMapping("/appletLogin")
@ApiOperation(value = "小程序一键登录")
public AjaxResult<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin){
- // todo 待完善 pu
- return AjaxResult.success();
+ return appUserService.appletLogin(appletLogin);
}
@@ -41,8 +45,7 @@
@PostMapping("/mobileLogin")
@ApiOperation(value = "手机号登录")
public AjaxResult<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
- // todo 待完善 pu
- return AjaxResult.success();
+ return appUserService.mobileLogin(mobileLogin);
}
@@ -51,8 +54,7 @@
@PostMapping("/getSMSCode")
@ApiOperation(value = "获取短信验证码")
public AjaxResult getSMSCode(@RequestBody SMSCode smsCode){
- // todo 待完善 pu
- return AjaxResult.success();
+ return appUserService.getSMSCode(smsCode);
}
--
Gitblit v1.7.1