Merge branch 'develop' of

https://zhangguoping@gitlab.dituhui.com/bsh/project/project.git into
develop

project-user/src/main/java/com/dituhui/pea/user/controller/UserController.java

@@ -4,21 +4,17 @@ package com.dituhui.pea.user.controller;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.common.Result;
-import com.dituhui.pea.enums.RedisKeyGroup;
 import com.dituhui.pea.enums.StatusCodeEnum;
 import com.dituhui.pea.enums.StatusCodeEnum;
 import com.dituhui.pea.enums.ThirdPartyEnum;
 import com.dituhui.pea.enums.ThirdPartyEnum;
 import com.dituhui.pea.pojo.ThirdUserInfo;
 import com.dituhui.pea.pojo.ThirdUserInfo;
-import com.dituhui.pea.pojo.UserAuthInfo;
 import com.dituhui.pea.pojo.UserInfo;
 import com.dituhui.pea.pojo.UserInfo;
 import com.dituhui.pea.pojo.UserLoginDTO;
 import com.dituhui.pea.pojo.UserLoginDTO;
 import com.dituhui.pea.pojo.UserLoginParam;
 import com.dituhui.pea.pojo.UserLoginParam;
 import com.dituhui.pea.pojo.WebResult;
 import com.dituhui.pea.pojo.WebResult;
 import com.dituhui.pea.user.IUser;
 import com.dituhui.pea.user.IUser;
-import com.dituhui.pea.user.commom.RedisService;
 import com.dituhui.pea.user.service.UserService;
 import com.dituhui.pea.user.service.UserService;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;