'合并'

src/main/java/com/futu/course/user/controller/UserController.java

@@ -16,17 +16,9 @@ import java.security.NoSuchAlgorithmException;
 import com.futu.course.common.annotation.NonLoginRequired;
 import com.futu.course.common.entity.R;
 import com.futu.course.user.dto.UserDTO;
-import com.futu.course.common.annotation.NonLoginRequired;
-import com.futu.course.common.entity.R;
-import com.futu.course.user.dto.UserDTO;
 import com.futu.course.user.dto.UserLoginDto;
-import com.futu.course.user.dto.UserRegisterDto;
-import com.futu.course.user.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+
 
 
 /**

src/main/java/com/futu/course/user/service/UserService.java

@@ -4,12 +4,7 @@ import com.futu.course.user.domain.User;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.futu.course.user.dto.UserDTO;
 import com.futu.course.user.dto.UserLoginDto;
-import com.futu.course.user.dto.UserRegisterDto;
-
 import com.futu.course.common.entity.R;
-import com.futu.course.user.domain.User;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.futu.course.user.dto.UserDTO;
 
 
 /**

src/main/java/com/futu/course/user/service/impl/UserServiceImpl.java

@@ -12,25 +12,12 @@ import com.futu.course.user.mapper.UserMapper;
 import io.minio.errors.*;
 import org.springframework.stereotype.Service;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.futu.course.common.entity.R;
-import com.futu.course.common.utils.SnowflakeIdWorker;
-import com.futu.course.common.utils.TokenUtils;
+
 import com.futu.course.common.entity.R;
 import com.futu.course.common.utils.SnowflakeIdWorker;
-import com.futu.course.common.utils.TokenUtils;
-import com.futu.course.user.domain.User;
-import com.futu.course.user.dto.LoginDTO;
-import com.futu.course.user.dto.UserDTO;
 import com.futu.course.user.dto.LoginDTO;
 import com.futu.course.user.dto.UserDTO;
 import com.futu.course.user.dto.UserLoginDto;
-import com.futu.course.user.dto.UserRegisterDto;
-import com.futu.course.user.service.UserService;
-import com.futu.course.user.mapper.UserMapper;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.security.Keys;
@@ -44,29 +31,11 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import io.jsonwebtoken.security.Keys;
-import io.lettuce.core.RedisClient;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
@@ -80,15 +49,6 @@ import java.util.concurrent.TimeUnit;
 
 import org.springframework.util.DigestUtils;
 
-import javax.annotation.Resource;
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
 * @author yuu