目录修改

yezhu-api/src/main/java/com/kioor/controller/ApiTestController.java → yezhu-api/src/main/java/com/kioor/common/ApiTestController.java

@@ -6,12 +6,12 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.controller;
+package com.kioor.common;
 
 import com.kioor.annotation.Login;
 import com.kioor.annotation.LoginUser;
 import com.kioor.common.utils.Result;
-import com.kioor.entity.user.UserEntity;
+import com.kioor.user.entity.UserEntity;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

yezhu-api/src/main/java/com/kioor/interceptor/AuthorizationInterceptor.java

@@ -11,8 +11,8 @@ package com.kioor.interceptor;
 import com.kioor.annotation.Login;
 import com.kioor.common.exception.ErrorCode;
 import com.kioor.common.exception.RenException;
-import com.kioor.entity.user.TokenEntity;
-import com.kioor.service.user.TokenService;
+import com.kioor.user.entity.TokenEntity;
+import com.kioor.user.service.TokenService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;

yezhu-api/src/main/java/com/kioor/entity/messageboard/MessageBoardEntity.java → yezhu-api/src/main/java/com/kioor/messageboard/entity/MessageBoardEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.messageboard;
+package com.kioor.messageboard.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/entity/messageboard/MessageEntity.java → yezhu-api/src/main/java/com/kioor/messageboard/entity/MessageEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.messageboard;
+package com.kioor.messageboard.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/entity/messageboard/NoticeEntity.java → yezhu-api/src/main/java/com/kioor/messageboard/entity/NoticeEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.messageboard;
+package com.kioor.messageboard.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/resolver/LoginUserHandlerMethodArgumentResolver.java

@@ -9,9 +9,9 @@
 package com.kioor.resolver;
 
 import com.kioor.annotation.LoginUser;
-import com.kioor.entity.user.UserEntity;
+import com.kioor.user.entity.UserEntity;
 import com.kioor.interceptor.AuthorizationInterceptor;
-import com.kioor.service.user.UserService;
+import com.kioor.user.service.UserService;
 import lombok.AllArgsConstructor;
 import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Component;

yezhu-api/src/main/java/com/kioor/entity/role/RolesEntity.java → yezhu-api/src/main/java/com/kioor/role/entity/RolesEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.role;
+package com.kioor.role.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/entity/role/UserRolesEntity.java → yezhu-api/src/main/java/com/kioor/role/entity/UserRolesEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.role;
+package com.kioor.role.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/entity/room/BuildingsEntity.java → yezhu-api/src/main/java/com/kioor/room/entity/BuildingsEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.room;
+package com.kioor.room.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/entity/room/FloorEntity.java → yezhu-api/src/main/java/com/kioor/room/entity/FloorEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.room;
+package com.kioor.room.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/entity/room/ResidentialQuartersEntity.java → yezhu-api/src/main/java/com/kioor/room/entity/ResidentialQuartersEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.room;
+package com.kioor.room.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/entity/room/RoomEntity.java → yezhu-api/src/main/java/com/kioor/room/entity/RoomEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.room;
+package com.kioor.room.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/entity/room/UnitsEntity.java → yezhu-api/src/main/java/com/kioor/room/entity/UnitsEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.room;
+package com.kioor.room.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/entity/room/UserQuartersEntity.java → yezhu-api/src/main/java/com/kioor/room/entity/UserQuartersEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.room;
+package com.kioor.room.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/controller/user/ApiLoginController.java → yezhu-api/src/main/java/com/kioor/user/controller/ApiLoginController.java

@@ -6,15 +6,15 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.controller.user;
+package com.kioor.user.controller;
 
 
 import com.kioor.annotation.Login;
 import com.kioor.common.utils.Result;
 import com.kioor.common.validator.ValidatorUtils;
-import com.kioor.dto.user.LoginDTO;
-import com.kioor.service.user.TokenService;
-import com.kioor.service.user.UserService;
+import com.kioor.user.dto.LoginDTO;
+import com.kioor.user.service.TokenService;
+import com.kioor.user.service.UserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

yezhu-api/src/main/java/com/kioor/controller/user/ApiRegisterController.java → yezhu-api/src/main/java/com/kioor/user/controller/ApiRegisterController.java

@@ -6,14 +6,14 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.controller.user;
+package com.kioor.user.controller;
 
 import cn.hutool.crypto.digest.DigestUtil;
 import com.kioor.common.utils.Result;
 import com.kioor.common.validator.ValidatorUtils;
-import com.kioor.dto.user.RegisterDTO;
-import com.kioor.entity.user.UserEntity;
-import com.kioor.service.user.UserService;
+import com.kioor.user.dto.RegisterDTO;
+import com.kioor.user.entity.UserEntity;
+import com.kioor.user.service.UserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;

yezhu-api/src/main/java/com/kioor/user/controller/ApiUserController.java

@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2018 业主系统 All rights reserved.
+ * <p>
+ * https://www.yezhu.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.kioor.user.controller;
+
+
+import com.kioor.annotation.Login;
+import com.kioor.common.utils.Result;
+import com.kioor.common.validator.ValidatorUtils;
+import com.kioor.user.dto.LoginDTO;
+import com.kioor.user.service.TokenService;
+import com.kioor.user.service.UserService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * 登录接口
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@AllArgsConstructor
+@RestController
+@RequestMapping("/api/user")
+@Tag(name = "登录接口")
+public class ApiUserController {
+    private final UserService userService;
+    private final TokenService tokenService;
+
+    @PostMapping
+    @Operation(summary = "登录")
+    public Result<Map<String, Object>> login(@RequestBody LoginDTO dto) {
+        //表单校验
+        ValidatorUtils.validateEntity(dto);
+
+        //用户登录
+        Map<String, Object> map = userService.login(dto);
+
+        return new Result().ok(map);
+    }
+
+    @Login
+    @PostMapping("logout")
+    @Operation(summary = "退出")
+    public Result logout(@Parameter(hidden = true) @RequestAttribute("userId") Long userId) {
+        tokenService.expireToken(userId);
+        return new Result();
+    }
+
+}

yezhu-api/src/main/java/com/kioor/dao/user/TokenDao.java → yezhu-api/src/main/java/com/kioor/user/dao/TokenDao.java

@@ -6,10 +6,10 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.dao.user;
+package com.kioor.user.dao;
 
 import com.kioor.common.dao.BaseDao;
-import com.kioor.entity.user.TokenEntity;
+import com.kioor.user.entity.TokenEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

yezhu-api/src/main/java/com/kioor/dao/user/UserDao.java → yezhu-api/src/main/java/com/kioor/user/dao/UserDao.java

@@ -6,10 +6,10 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.dao.user;
+package com.kioor.user.dao;
 
 import com.kioor.common.dao.BaseDao;
-import com.kioor.entity.user.UserEntity;
+import com.kioor.user.entity.UserEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

yezhu-api/src/main/java/com/kioor/dto/user/LoginDTO.java → yezhu-api/src/main/java/com/kioor/user/dto/LoginDTO.java

@@ -7,7 +7,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.dto.user;
+package com.kioor.user.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

yezhu-api/src/main/java/com/kioor/dto/user/RegisterDTO.java → yezhu-api/src/main/java/com/kioor/user/dto/RegisterDTO.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.dto.user;
+package com.kioor.user.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

yezhu-api/src/main/java/com/kioor/user/dto/UserDTO.java

@@ -0,0 +1,33 @@
+/**
+ * /**
+ * Copyright (c) 2018 业主系统 All rights reserved.
+ * <p>
+ * https://www.yezhu.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.kioor.user.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+/**
+ * 完善用户信息
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Data
+@Schema(description = "登录表单")
+public class UserDTO {
+    @Schema(description = "手机号")
+    @NotBlank(message = "手机号不能为空")
+    private String mobile;
+
+    @Schema(description = "密码")
+    @NotBlank(message = "密码不能为空")
+    private String password;
+
+}

yezhu-api/src/main/java/com/kioor/entity/user/TokenEntity.java → yezhu-api/src/main/java/com/kioor/user/entity/TokenEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.user;
+package com.kioor.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/entity/user/UserEntity.java → yezhu-api/src/main/java/com/kioor/user/entity/UserEntity.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.entity.user;
+package com.kioor.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yezhu-api/src/main/java/com/kioor/service/user/TokenService.java → yezhu-api/src/main/java/com/kioor/user/service/TokenService.java

@@ -6,10 +6,10 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.service.user;
+package com.kioor.user.service;
 
 import com.kioor.common.service.BaseService;
-import com.kioor.entity.user.TokenEntity;
+import com.kioor.user.entity.TokenEntity;
 
 /**
  * 用户Token

yezhu-api/src/main/java/com/kioor/service/user/UserService.java → yezhu-api/src/main/java/com/kioor/user/service/UserService.java

@@ -6,11 +6,11 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.service.user;
+package com.kioor.user.service;
 
 import com.kioor.common.service.BaseService;
-import com.kioor.entity.user.UserEntity;
-import com.kioor.dto.user.LoginDTO;
+import com.kioor.user.entity.UserEntity;
+import com.kioor.user.dto.LoginDTO;
 
 import java.util.Map;
 

yezhu-api/src/main/java/com/kioor/service/impl/user/TokenServiceImpl.java → yezhu-api/src/main/java/com/kioor/user/service/impl/TokenServiceImpl.java

@@ -6,13 +6,13 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.service.impl.user;
+package com.kioor.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kioor.common.service.impl.BaseServiceImpl;
-import com.kioor.dao.user.TokenDao;
-import com.kioor.entity.user.TokenEntity;
-import com.kioor.service.user.TokenService;
+import com.kioor.user.dao.TokenDao;
+import com.kioor.user.entity.TokenEntity;
+import com.kioor.user.service.TokenService;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

yezhu-api/src/main/java/com/kioor/service/impl/user/UserServiceImpl.java → yezhu-api/src/main/java/com/kioor/user/service/impl/UserServiceImpl.java

@@ -6,19 +6,19 @@
  * 版权所有，侵权必究！
  */
 
-package com.kioor.service.impl.user;
+package com.kioor.user.service.impl;
 
 import cn.hutool.crypto.digest.DigestUtil;
 import com.kioor.common.exception.ErrorCode;
 import com.kioor.common.exception.RenException;
 import com.kioor.common.service.impl.BaseServiceImpl;
 import com.kioor.common.validator.AssertUtils;
-import com.kioor.dao.user.UserDao;
-import com.kioor.dto.user.LoginDTO;
-import com.kioor.entity.user.TokenEntity;
-import com.kioor.entity.user.UserEntity;
-import com.kioor.service.user.TokenService;
-import com.kioor.service.user.UserService;
+import com.kioor.user.dao.UserDao;
+import com.kioor.user.dto.LoginDTO;
+import com.kioor.user.entity.TokenEntity;
+import com.kioor.user.entity.UserEntity;
+import com.kioor.user.service.TokenService;
+import com.kioor.user.service.UserService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

yezhu-api/src/main/resources/mapper/user/TokenDao.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.kioor.dao.user.TokenDao">
+<mapper namespace="com.kioor.user.dao.TokenDao">
 
-    <select id="getByToken" resultType="com.kioor.entity.user.TokenEntity">
+    <select id="getByToken" resultType="com.kioor.user.entity.TokenEntity">
         select * from tb_token where token = #{value}
     </select>
 
-    <select id="getByUserId" resultType="com.kioor.entity.user.TokenEntity">
+    <select id="getByUserId" resultType="com.kioor.user.entity.TokenEntity">
         select * from tb_token where user_id = #{value}
     </select>
 

yezhu-api/src/main/resources/mapper/user/UserDao.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.kioor.dao.user.UserDao">
+<mapper namespace="com.kioor.user.dao.UserDao">
 
-    <select id="getUserByMobile" resultType="com.kioor.entity.user.UserEntity">
+    <select id="getUserByMobile" resultType="com.kioor.user.entity.UserEntity">
         select * from tb_user where mobile = #{value}
     </select>
 
-    <select id="getUserByUserId" resultType="com.kioor.entity.user.UserEntity">
+    <select id="getUserByUserId" resultType="com.kioor.user.entity.UserEntity">
         select * from tb_user where id = #{value}
     </select>
 </mapper>