From 6c82b0f944a0d3547659db5ec1f640a9ec7d3fd3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 15 Jun 2022 11:08:52 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java
index 8af07a6..eed8bdb 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java
@@ -1,7 +1,6 @@
package com.xcong.farmer.cms.modules.system.controller;
import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
import com.xcong.farmer.cms.common.contants.AppContants;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminLoginDto;
@@ -14,8 +13,11 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.validation.Valid;
import java.io.File;
import java.io.IOException;
+
+import java.util.Map;
@RestController
@@ -29,17 +31,14 @@
@ApiOperation(value = "登陆接口", notes = "登陆接口")
@PostMapping("/login")
- public Result login(@RequestBody AdminLoginDto adminLoginDto) {
-
- String username = adminLoginDto.getUsername();
- if(StrUtil.isEmpty(username)){
- return Result.fail("请输入用户名");
- }
- String password = adminLoginDto.getPassword();
- if(StrUtil.isEmpty(password)){
- return Result.fail("请输入密码");
- }
+ public Result login(@RequestBody @Valid AdminLoginDto adminLoginDto) {
return iCommonService.login(adminLoginDto);
+ }
+
+ @ApiOperation(value = "获取验证码", notes = "获取验证码")
+ @GetMapping("/captcha")
+ public Result captcha() throws IOException {
+ return iCommonService.captchaCreator();
}
/**
@@ -47,7 +46,7 @@
* @return
*/
@ApiOperation(value="用户退出登录", notes="用户退出登录")
- @GetMapping(value = "/Logout")
+ @PostMapping(value = "/Logout")
public Result memberLogout() {
return iCommonService.memberLogout();
}
--
Gitblit v1.9.1