Merge pull request #67 from is0xjh25/CI-test

Optimize import

src/main/java/tech/crm/crmserver/CrmServerApplication.java

@@ -1,6 +1,5 @@
 package tech.crm.crmserver;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;

src/main/java/tech/crm/crmserver/common/enums/BelongToStatus.java

@@ -1,8 +1,7 @@
 package tech.crm.crmserver.common.enums;
+
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.NonNull;
 
 /**
  * Status Enum for Belong To

src/main/java/tech/crm/crmserver/common/response/Result.java

@@ -4,7 +4,6 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 /**
  * <p>

src/main/java/tech/crm/crmserver/config/WebMvcConfig.java

@@ -1,21 +1,11 @@
 package tech.crm.crmserver.config;
 
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import tech.crm.crmserver.common.constants.SecurityConstants;
 
-import java.util.List;
-import java.util.TimeZone;
-
 /**
  * WebMvc configuration
  * @author Lingxiao

src/main/java/tech/crm/crmserver/controller/BelongToController.java

@@ -1,20 +1,8 @@
 package tech.crm.crmserver.controller;
 
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import tech.crm.crmserver.common.response.ResponseResult;
-import tech.crm.crmserver.dao.BelongTo;
-import tech.crm.crmserver.dao.Organization;
-import tech.crm.crmserver.service.BelongToService;
-import tech.crm.crmserver.service.OrganizationService;
-import tech.crm.crmserver.service.UserService;
 
 /**
  * <p>

src/main/java/tech/crm/crmserver/controller/ContactController.java

@@ -1,16 +1,11 @@
 package tech.crm.crmserver.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import tech.crm.crmserver.common.enums.PermissionLevel;
 import tech.crm.crmserver.common.response.ResponseResult;
-import tech.crm.crmserver.common.utils.NullAwareBeanUtilsBean;
 import tech.crm.crmserver.dao.Contact;
 import tech.crm.crmserver.dao.Department;
 import tech.crm.crmserver.dao.Permission;
@@ -24,10 +19,7 @@
 import tech.crm.crmserver.service.UserService;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

src/main/java/tech/crm/crmserver/controller/DepartmentController.java

@@ -5,7 +5,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
-
 import tech.crm.crmserver.common.enums.PermissionLevel;
 import tech.crm.crmserver.common.response.ResponseResult;
 import tech.crm.crmserver.dao.Permission;

src/main/java/tech/crm/crmserver/controller/EventController.java

@@ -2,7 +2,6 @@
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**

src/main/java/tech/crm/crmserver/controller/OrganizationController.java

@@ -3,18 +3,14 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import tech.crm.crmserver.common.enums.PermissionLevel;
 import tech.crm.crmserver.common.enums.Status;
 import tech.crm.crmserver.common.response.ResponseResult;
 import tech.crm.crmserver.common.utils.NullAwareBeanUtilsBean;
-import tech.crm.crmserver.dao.*;
+import tech.crm.crmserver.dao.BelongTo;
+import tech.crm.crmserver.dao.Department;
+import tech.crm.crmserver.dao.Organization;
+import tech.crm.crmserver.dao.Permission;
 import tech.crm.crmserver.dto.DepartmentDTO;
 import tech.crm.crmserver.dto.OrganizationDTO;
 import tech.crm.crmserver.exception.*;
@@ -23,11 +19,6 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import tech.crm.crmserver.dao.Organization;
-import tech.crm.crmserver.service.OrganizationService;
-import tech.crm.crmserver.service.UserService;
 
 /**
  * <p>

src/main/java/tech/crm/crmserver/controller/PermissionController.java

@@ -1,16 +1,11 @@
 package tech.crm.crmserver.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.http.HttpStatus;
-
-import tech.crm.crmserver.common.enums.PermissionLevel;
 import tech.crm.crmserver.common.response.ResponseResult;
 import tech.crm.crmserver.dao.Organization;
 import tech.crm.crmserver.dao.Permission;
-import tech.crm.crmserver.exception.NotEnoughPermissionException;
 import tech.crm.crmserver.exception.UserNotInDepartmentException;
 import tech.crm.crmserver.service.OrganizationService;
 import tech.crm.crmserver.service.PermissionService;

src/main/java/tech/crm/crmserver/controller/ToDoListController.java

@@ -2,7 +2,6 @@
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**

src/main/java/tech/crm/crmserver/controller/TokenKeyController.java

@@ -2,7 +2,6 @@
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**

src/main/java/tech/crm/crmserver/controller/UserController.java

@@ -11,14 +11,9 @@
 import tech.crm.crmserver.dto.LoginRequest;
 import tech.crm.crmserver.dto.ResetPasswordDTO;
 import tech.crm.crmserver.dto.UserDTO;
-import tech.crm.crmserver.exception.LoginBadCredentialsException;
-import tech.crm.crmserver.exception.UserAlreadyExistException;
-import tech.crm.crmserver.service.MailService;
 import tech.crm.crmserver.service.TokenKeyService;
 import tech.crm.crmserver.service.UserService;
 
-import javax.validation.constraints.Email;
-
 
 /**
  * <p>

src/main/java/tech/crm/crmserver/dao/BelongTo.java

@@ -1,15 +1,16 @@
 package tech.crm.crmserver.dao;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import tech.crm.crmserver.common.enums.Status;
 
+import java.io.Serializable;
+
 /**
  * <p>
  *  entity

src/main/java/tech/crm/crmserver/dao/Contact.java

@@ -1,18 +1,18 @@
 package tech.crm.crmserver.dao;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Objects;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import tech.crm.crmserver.common.enums.Status;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.Objects;
+
 /**
  * <p>
  *  entity

src/main/java/tech/crm/crmserver/dao/Department.java

@@ -1,15 +1,16 @@
 package tech.crm.crmserver.dao;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import tech.crm.crmserver.common.enums.Status;
 
+import java.io.Serializable;
+
 /**
  * <p>
  *  entity

src/main/java/tech/crm/crmserver/dao/Event.java

@@ -1,16 +1,17 @@
 package tech.crm.crmserver.dao;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import tech.crm.crmserver.common.enums.Status;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *  entity

src/main/java/tech/crm/crmserver/dao/Organization.java

@@ -1,15 +1,16 @@
 package tech.crm.crmserver.dao;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import tech.crm.crmserver.common.enums.Status;
 
+import java.io.Serializable;
+
 /**
  * <p>
  *  entity

src/main/java/tech/crm/crmserver/dao/Permission.java

@@ -1,16 +1,17 @@
 package tech.crm.crmserver.dao;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import tech.crm.crmserver.common.enums.PermissionLevel;
 import tech.crm.crmserver.common.enums.Status;
 
+import java.io.Serializable;
+
 /**
  * <p>
  *  entity

src/main/java/tech/crm/crmserver/dao/ToDoList.java

@@ -1,16 +1,17 @@
 package tech.crm.crmserver.dao;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import tech.crm.crmserver.common.enums.Status;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *  entity

src/main/java/tech/crm/crmserver/dao/TokenKey.java

@@ -1,16 +1,16 @@
 package tech.crm.crmserver.dao;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *  entity

src/main/java/tech/crm/crmserver/dao/User.java

@@ -1,15 +1,16 @@
 package tech.crm.crmserver.dao;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import tech.crm.crmserver.common.enums.Status;
 
+import java.io.Serializable;
+
 /**
  * <p>
  *  entity for data transfer with database

src/main/java/tech/crm/crmserver/dto/ContactCreateDTO.java

@@ -5,7 +5,6 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import tech.crm.crmserver.common.enums.Status;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;

src/main/java/tech/crm/crmserver/dto/ContactUpdateDTO.java

@@ -1,11 +1,9 @@
 package tech.crm.crmserver.dto;
 
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import tech.crm.crmserver.common.enums.Status;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;