1.添加邮箱登录，注册接口

src/main/java/vvpkassistant/User/controller/UserController.java

@@ -1,4 +1,5 @@
 package vvpkassistant.User.controller;
+import cn.dev33.satoken.stp.StpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import vvpkassistant.CoinRecords.CoinRecords;
@@ -7,16 +8,23 @@ import vvpkassistant.Data.ResponseData;
 import vvpkassistant.Data.ResponseInfo;
 import vvpkassistant.Data.WxChatParam;
 import vvpkassistant.User.mapper.UserDao;
+import vvpkassistant.User.model.DTO.UserModelDTO;
 import vvpkassistant.User.model.UserModel;
+import vvpkassistant.User.model.UserModelVO;
+import vvpkassistant.User.service.UserService;
 import vvpkassistant.common.ErrorCode;
 import vvpkassistant.config.FunctionConfigHolder;
 import vvpkassistant.Tools.VVRequester;
 import vvpkassistant.Tools.VVTools;
 import vvpkassistant.exception.BusinessException;
+import vvpkassistant.mail.model.MailModel;
+import vvpkassistant.mail.service.MailService;
 import vvpkassistant.pk.mapper.PkInfoDao;
 import vvpkassistant.pk.model.PkInfoModel;
 import vvpkassistant.pk.model.PkRecordDetail;
 import vvpkassistant.pk.mapper.PkRecordDetailDao;
+
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,6 +51,10 @@ public class UserController {
     @Autowired
     private VVRequester vvRequester;
 
+
+    @Resource
+    private UserService userService;
+
     // 配置用户信息
     @PostMapping("inputUserInfo")
     public ResponseData<Object> inputUserInfo(@RequestBody Map<String,Object> param) {
@@ -165,29 +177,12 @@ public class UserController {
 
     }
 
-    //todo 修改用户返回结果
 
     // 修改用户信息
     @PostMapping("updateUserInfo")
-    public ResponseData<Object> updateUserInfo(@RequestBody Map<String,Object> map) {
-        UserModel userModel = new UserModel();
-        //设置用户id
-        userModel.setId(Integer.valueOf(map.get("id").toString()));
-        //设置用户头像
-        userModel.setHeaderIcon(map.get("headerIcon").toString());
-        //设置用户昵称
-        userModel.setNickName(map.get("nickName").toString());
-
-        int i = userDao.updateById(userModel);
-        // 返回结果
-        Map<String,Object> result = new HashMap<>();
-        result.put("info", userDao.selectById(map.get("id").toString()));
-        result.put("newAccount", false);
-        if (i == 1){
-            return ResponseData.success(result);
-        }else {
-            throw  new BusinessException(ErrorCode.SYSTEM_ERROR);
-        }
+    public ResponseData<Object> updateUserInfo(@RequestBody UserModelDTO userModelDTO) {
+        UserModelVO userModelVO = userService.updateUserInfo( userModelDTO);
+        return ResponseData.success(userModelVO);
     }
 
     // 获取用户信息
@@ -367,5 +362,13 @@ public class UserController {
         return ResponseData.success(coinRecords);
     }
 
+    @PostMapping("/loginWithMail")
+    public  ResponseData<Object> loginWithMail(@RequestBody UserModelDTO model) {
+        return ResponseData.success(userService.loginWithMail(model));
+    }
 
+    @PostMapping("/registerWithMail")
+    public ResponseData<Object> mailRegister(@RequestBody UserModelDTO model){
+        return ResponseData.success(userService.addUserWithMail(model));
+    }
 }