修复登录问题

src/main/java/com/mokamrp/privates/controller/LoginController.java

@@ -3,7 +3,7 @@ package com.mokamrp.privates.controller;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.LoginHandle;
 import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.service.LoginService;
+import com.mokamrp.privates.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -20,17 +20,17 @@ import java.util.Map;
  * @since 2021-04-17
  */
 @RestController
-@RequestMapping("/user")
+@RequestMapping("/login")
 public class LoginController {
     @Autowired
-    public LoginService loginService;
+    public UserService userService;
 
-    @PostMapping("/login")
+    @PostMapping("/dologin")
     public Object login(@Valid @RequestBody LoginHandle loginHandle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.LOGIN_ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Map<String, Object> res = loginService.doLogin(loginHandle.getPhone(), loginHandle.getPassword());
+        Map<String, Object> res = userService.doLogin(loginHandle.getPhone(), loginHandle.getPassword());
         String loginStatus = res.get("loginStatus").toString();
         if (loginStatus.equals("phoneNull")) {
             return AjaxResult.error(HttpStatus.LOGIN_ERROR, "账户不存在");

src/main/java/com/mokamrp/privates/controller/UserController.java

@@ -1,11 +1,21 @@
 package com.mokamrp.privates.controller;
 
 
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.LoginHandle;
+import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pojo.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
+import javax.validation.Valid;
+import java.util.Map;
+
 /**
  * <p>
  * 企微小平台系统临时账户 前端控制器
@@ -17,6 +27,5 @@ import org.springframework.stereotype.Controller;
 @Controller
 @RequestMapping("/user")
 public class UserController extends BaseController<User>{
-
 }
 

src/main/java/com/mokamrp/privates/service/LoginService.java

@@ -1,18 +0,0 @@
-package com.mokamrp.privates.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mokamrp.privates.mapper.pojo.User;
-
-import java.util.Map;
-
-/**
- * <p>
- * 企微小平台临时登录 服务类
- * </p>
- *
- * @author leon
- * @since 2021-04-17
- */
-public interface LoginService extends IService<User> {
-    public Map<String, Object> doLogin(String phone, String password);
-}

src/main/java/com/mokamrp/privates/service/UserService.java

@@ -2,6 +2,9 @@ package com.mokamrp.privates.service;
 
 import com.mokamrp.privates.mapper.pojo.User;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface UserService extends IService<User> {
 
+    public Map<String, Object> doLogin(String phone, String password);
 }

src/main/java/com/mokamrp/privates/service/impl/LoginServiceImpl.java

@@ -1,57 +0,0 @@
-package com.mokamrp.privates.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mokamrp.privates.constant.RedisKey;
-import com.mokamrp.privates.mapper.UserMapper;
-import com.mokamrp.privates.mapper.pojo.Corp;
-import com.mokamrp.privates.mapper.pojo.User;
-import com.mokamrp.privates.service.LoginService;
-import com.mokamrp.privates.service.UserService;
-import com.mokamrp.privates.utils.StringUtils;
-import com.mokamrp.privates.utils.sign.Md5Utils;
-import com.mokamrp.privates.constant.Constants;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Service;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * <p>
- * 企微小平台临时登录 服务实现类
- * </p>
- *
- * @author leon
- * @since 2021-04-17
- */
-@Service
-public class LoginServiceImpl extends ServiceImpl<UserMapper, User> implements LoginService {
-    @Autowired
-    public StringRedisTemplate redis;
-
-    public Map<String, Object> doLogin(String phone, String password) {
-        Map<String, Object> res =this.getMap(new QueryWrapper<User>().eq("phone", phone));
-        //.验证账户名和密码
-        if (res.isEmpty()) {
-            res.put("loginStatus", "phoneNull");
-            return res;
-        }
-        Object nowPass = res.get("password");
-        if (!nowPass.toString().equals(password)) {
-            res.put("loginStatus", "passwordErr");
-            return res;
-        }
-        //.登录信息缓存到redis，过期时间5小时
-        String userMd5 = Md5Utils.hash(phone);
-        String token = userMd5 + "_" + StringUtils.getRandomString(10);
-        res.remove("password");
-        String userInfoStr = JSON.toJSONString(res);
-        redis.opsForValue().set(RedisKey.AuthToken + token, userInfoStr);
-        redis.expire(RedisKey.AuthToken + token, Constants.TOKEN_EXPIRATION, TimeUnit.SECONDS);
-        res.put("token", token);
-        res.put("loginStatus", "loginSuccess");
-        return res;
-    }
-}

src/main/java/com/mokamrp/privates/service/impl/UserServiceImpl.java

@@ -1,11 +1,22 @@
 package com.mokamrp.privates.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.constant.Constants;
+import com.mokamrp.privates.constant.RedisKey;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.UserMapper;
 import com.mokamrp.privates.service.UserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mokamrp.privates.utils.StringUtils;
+import com.mokamrp.privates.utils.sign.Md5Utils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
 /**
  * <p>
  * 企微小平台系统临时账户 服务实现类
@@ -16,5 +27,30 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+    @Autowired
+    public StringRedisTemplate redis;
 
+    public Map<String, Object> doLogin(String phone, String password) {
+        Map<String, Object> res =this.getMap(new QueryWrapper<User>().eq("phone", phone));
+        //.验证账户名和密码
+        if (res.isEmpty()) {
+            res.put("loginStatus", "phoneNull");
+            return res;
+        }
+        Object nowPass = res.get("password");
+        if (!nowPass.toString().equals(password)) {
+            res.put("loginStatus", "passwordErr");
+            return res;
+        }
+        //.登录信息缓存到redis，过期时间5小时
+        String userMd5 = Md5Utils.hash(phone);
+        String token = userMd5 + "_" + StringUtils.getRandomString(10);
+        res.remove("password");
+        String userInfoStr = JSON.toJSONString(res);
+        redis.opsForValue().set(RedisKey.AuthToken + token, userInfoStr);
+        redis.expire(RedisKey.AuthToken + token, Constants.TOKEN_EXPIRATION, TimeUnit.SECONDS);
+        res.put("token", token);
+        res.put("loginStatus", "loginSuccess");
+        return res;
+    }
 }