项目启动的一系列问题

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/QrPlatformApplication.java

@@ -5,6 +5,8 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 /**

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/LoginController.java

@@ -1,7 +1,10 @@
 package com.abi.qms.platform.controller.console;
 
 import com.abi.qms.platform.dto.req.LoginReq;
+import com.abi.qms.platform.dto.req.ResetPasswordReq;
+import com.abi.qms.platform.dto.req.UpdatePasswordReq;
 import com.abi.qms.platform.service.LoginService;
+import com.abi.task.common.annotation.IgnoreToken;
 import com.abi.task.common.api.base.BaseResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,16 +30,33 @@ public class LoginController {
     @Autowired
     private LoginService loginService;
 
-    @ApiOperation("登录")
+    /**
+     * 登录
+     *
+     * @param req
+     * @return
+     */
     @PostMapping("login")
-    public BaseResponse login(@Validated @RequestBody LoginReq loginReq) throws Exception {
-        //登录
-        loginService.login(loginReq);
+    @ApiOperation("登录")
+    @IgnoreToken
+    public BaseResponse loginQms(@Validated @RequestBody LoginReq req) {
+        return loginService.login(req);
+    }
+
+
+    @ApiOperation("重置密码")
+    @PostMapping("resetPassword")
+    public BaseResponse resetPassword(@Validated ResetPasswordReq req) throws Exception{
+        loginService.resetPassword(req);
         //包装出参
         return BaseResponse.create();
     }
 
-
+    @ApiOperation("修改密码")
+    @PostMapping("updatePassword")
+    public BaseResponse updatePassword(@Validated UpdatePasswordReq req) throws Exception{
+        return loginService.updatePassword(req);
+    }
 }
 
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/UserManagerController.java

@@ -28,18 +28,7 @@ public class UserManagerController {
     @Autowired
     private UserManagerService userManagerService;
 
-    /**
-     * 登录
-     *
-     * @param req
-     * @return
-     */
-    @PostMapping("login")
-    @ApiOperation("登录")
-    @IgnoreToken
-    public BaseResponse loginQms(@Validated @RequestBody LoginReq req) {
-        return userManagerService.login(req);
-    }
+
 
     @ApiOperation("创建用户")
     @PostMapping("createUser")
@@ -82,27 +71,13 @@ public class UserManagerController {
     }
 
     @ApiOperation("批量启用/停用用户")
-    @PostMapping("enableUser")
+    @PostMapping("batchEnableUser")
     public BaseResponse batchEnableUser(@Validated BatchEnableUserReq batchEnableUserReq) throws Exception{
         userManagerService.batchEnableUser(batchEnableUserReq);
         //包装出参
         return BaseResponse.create();
     }
 
-    @ApiOperation("重置密码")
-    @PostMapping("resetPassword")
-    public BaseResponse resetPassword(@Validated ResetPasswordReq req) throws Exception{
-        userManagerService.resetPassword(req);
-        //包装出参
-        return BaseResponse.create();
-    }
-
-    @ApiOperation("修改密码")
-    @PostMapping("updatePassword")
-    public BaseResponse updatePassword(@Validated UpdatePasswordReq req) throws Exception{
-        return userManagerService.updatePassword(req);
-    }
-
 }
 
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/config/CorsConfig.java

@@ -0,0 +1,31 @@
+package com.abi.qms.platform.infrastructure.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+@Configuration
+public class CorsConfig {
+
+    private long maxAge = 30 * 24 * 60 * 60;
+
+    private CorsConfiguration buildConfig() {
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        corsConfiguration.addAllowedOrigin("*"); // 1 设置访问源地址
+        corsConfiguration.addAllowedHeader("*"); // 2 设置访问源请求头
+        corsConfiguration.addAllowedMethod("*"); // 3 设置访问源请求方法
+        corsConfiguration.setMaxAge(maxAge);
+        corsConfiguration.setAllowCredentials(true); //用于 token 跨域
+        return corsConfiguration;
+    }
+
+    @Bean
+    public CorsFilter corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", buildConfig()); // 4 对接口配置跨域设置
+        return new CorsFilter(source);
+    }
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/config/JedisConfig.java

@@ -0,0 +1,41 @@
+package com.abi.qms.platform.infrastructure.config;
+
+import com.abi.qms.platform.infrastructure.properties.JedisPoolProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
+
+@Configuration
+public class JedisConfig {
+
+    @Autowired
+    private RedisProperties redisProperties;
+
+    @Autowired
+    private JedisPoolProperties jedisPoolProperties;
+
+
+    @Bean
+    public JedisPool jedisPool() {
+        JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
+
+        jedisPoolConfig.setMaxIdle(jedisPoolProperties.getMaxIdle());
+        jedisPoolConfig.setMinIdle(jedisPoolProperties.getMinIdle());
+        jedisPoolConfig.setMaxWaitMillis(jedisPoolProperties.getMaxWait());
+        jedisPoolConfig.setMaxTotal(jedisPoolProperties.getMaxActive());
+
+        JedisPool jedisPool = new JedisPool(
+                jedisPoolConfig
+                , redisProperties.getHost()
+                , redisProperties.getPort()
+                // , redisProperties.getTimeout()
+                // , redisProperties.getPassword()
+                // , redisProperties.getDatabase()
+        );
+
+        return jedisPool;
+    }
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/config/WebMvcConfig.java

@@ -0,0 +1,48 @@
+package com.abi.qms.platform.infrastructure.config;
+
+import com.abi.qms.platform.infrastructure.interceptor.CorsInterceptor;
+import com.abi.qms.platform.infrastructure.interceptor.IwepTokenInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Autowired
+    CorsInterceptor corsInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(getTokenInterceptor())
+                .excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**");
+    }
+
+    @Bean
+    public IwepTokenInterceptor getTokenInterceptor(){
+        return new IwepTokenInterceptor();
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowCredentials(true)
+                .allowedMethods("GET","POST", "DELETE", "PUT")
+                .allowedHeaders("*")
+                .maxAge(3600 * 24);
+    }
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/interceptor/IwepTokenInterceptor.java

@@ -4,6 +4,7 @@ import com.abi.qms.platform.dao.entity.UserInfo;
 import com.abi.qms.platform.dao.enums.ErrorCodeEnum;
 import com.abi.qms.platform.dto.req.TokenReq;
 import com.abi.qms.platform.infrastructure.util.UserUtil;
+import com.abi.qms.platform.service.LoginService;
 import com.abi.qms.platform.service.UserManagerService;
 import com.abi.task.common.annotation.IgnoreToken;
 import com.abi.task.common.api.exception.BusinessException;
@@ -25,7 +26,7 @@ import javax.servlet.http.HttpServletResponse;
 public class IwepTokenInterceptor extends HandlerInterceptorAdapter {
 
     @Resource
-    private UserManagerService userManagerService;
+    private LoginService loginService;
     
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -46,7 +47,7 @@ public class IwepTokenInterceptor extends HandlerInterceptorAdapter {
 
         TokenReq tokenReq = new TokenReq();
         tokenReq.setToken(token);
-        UserInfo userInfo = userManagerService.validateToken(tokenReq);
+        UserInfo userInfo = loginService.validateToken(tokenReq);
         if(userInfo != null){
             UserUtil.setUser(userInfo);
         }else{

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/properties/JedisPoolProperties.java

@@ -0,0 +1,18 @@
+package com.abi.qms.platform.infrastructure.properties;
+
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+public class JedisPoolProperties {
+
+    //@Value(value = "${spring.redis.jedis.pool.max-idle}")
+    private int maxIdle;
+    //@Value(value = "${spring.redis.jedis.pool.min-idle}")
+    private int minIdle;
+    //@Value(value = "${spring.redis.jedis.pool.max-active}")
+    private int maxActive;
+    //@Value(value = "${spring.redis.jedis.pool.max-wait}")
+    private int maxWait;
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/LoginService.java

@@ -1,7 +1,12 @@
 package com.abi.qms.platform.service;
 
 
+import com.abi.qms.platform.dao.entity.UserInfo;
 import com.abi.qms.platform.dto.req.LoginReq;
+import com.abi.qms.platform.dto.req.ResetPasswordReq;
+import com.abi.qms.platform.dto.req.TokenReq;
+import com.abi.qms.platform.dto.req.UpdatePasswordReq;
+import com.abi.task.common.api.base.BaseResponse;
 
 /**
  * <p>
@@ -12,7 +17,30 @@ import com.abi.qms.platform.dto.req.LoginReq;
  */
 public interface LoginService {
 
-    void login(LoginReq loginReq) throws Exception;
+    /**
+     * 登录
+     * @param req
+     * @return
+     */
+    BaseResponse login(LoginReq req);
 
+    /**
+     *重置密码
+     * @param req
+     * @return
+     */
+    void resetPassword(ResetPasswordReq req);
 
+    /**
+     * 修改密码
+     * @return
+     */
+    BaseResponse updatePassword(UpdatePasswordReq req);
+
+    /**
+     * token校验
+     * @param req
+     * @return
+     */
+    UserInfo validateToken(TokenReq req);
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/UserManagerService.java

@@ -1,13 +1,11 @@
 package com.abi.qms.platform.service;
 
 
-import com.abi.qms.platform.dao.entity.UserInfo;
 import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.GetUserInfoRes;
 import com.abi.qms.platform.dto.res.ListUserRes;
 import com.abi.task.common.api.base.BaseResponse;
 
-import java.util.List;
 
 /**
  * <p>
@@ -18,13 +16,6 @@ import java.util.List;
  */
 public interface UserManagerService {
 
-    /**
-     * 登录
-     * @param req
-     * @return
-     */
-    BaseResponse login(LoginReq req);
-
     /**
      * 创建用户
      * @param createUserReq
@@ -66,24 +57,4 @@ public interface UserManagerService {
      * @throws Exception
      */
     void batchEnableUser(BatchEnableUserReq req)throws Exception;
-
-    /**
-     *重置密码
-     * @param req
-     * @return
-     */
-    void resetPassword(ResetPasswordReq req);
-
-    /**
-     * 修改密码
-     * @return
-     */
-    BaseResponse updatePassword(UpdatePasswordReq req);
-
-    /**
-     * token校验
-     * @param req
-     * @return
-     */
-    UserInfo validateToken(TokenReq req);
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/LoginServiceImpl.java

@@ -1,9 +1,34 @@
 package com.abi.qms.platform.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.abi.qms.platform.dao.entity.UserInfo;
+import com.abi.qms.platform.dao.entity.UserRole;
+import com.abi.qms.platform.dao.enums.BaseFinal;
+import com.abi.qms.platform.dao.enums.ErrorCodeEnum;
+import com.abi.qms.platform.dao.enums.RedisKey;
+import com.abi.qms.platform.dao.mapper.UserInfoMapper;
+import com.abi.qms.platform.dao.mapper.UserMappingInfoRoleMapper;
+import com.abi.qms.platform.dao.mapper.UserRoleMapper;
 import com.abi.qms.platform.dto.req.LoginReq;
+import com.abi.qms.platform.dto.req.ResetPasswordReq;
+import com.abi.qms.platform.dto.req.TokenReq;
+import com.abi.qms.platform.dto.req.UpdatePasswordReq;
+import com.abi.qms.platform.dto.res.LoginRes;
+import com.abi.qms.platform.infrastructure.util.RedisUtils;
+import com.abi.qms.platform.infrastructure.util.UUIDutils;
+import com.abi.qms.platform.infrastructure.util.UserUtil;
 import com.abi.qms.platform.service.LoginService;
+import com.abi.task.common.api.base.BaseResponse;
+import com.abi.task.common.utils.AESEncodeTwoUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Objects;
+
 /**
  * <p>
  * 登录
@@ -11,17 +36,117 @@ import org.springframework.stereotype.Service;
  *
  * @author Andy.Tan
  */
+@Slf4j
 @Service
-public class LoginServiceImpl implements LoginService {
+public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements LoginService {
+
+    @Autowired
+    private UserInfoMapper userInfoMapper;
+
+    @Autowired
+    private UserRoleMapper userRoleMapper;
+
+    @Resource
+    private RedisUtils redisUtil;
+
+    @Autowired
+    private UserMappingInfoRoleMapper userMappingInfoRoleMapper;
+
 
-    /**
-     * 登录
-     **/
     @Override
-    public void login(LoginReq loginReq) {
-        //TODO
+    public BaseResponse login(LoginReq req) {
+        UserInfo one = lambdaQuery().eq(UserInfo::getUserName, req.getUserName().trim()).eq(UserInfo::getPassword, req.getPassword()).eq(UserInfo::getIsEnable, 1).eq(UserInfo::getIsDelete, 0).select(UserInfo::getId).one();
+        if (null != one) {
+            QueryWrapper<UserRole> roleQueryWrapper = new QueryWrapper<>();
+            roleQueryWrapper.eq("role_code", one.getRoleCode());
+            roleQueryWrapper.eq("is_delete", 0);
+            UserRole userRole = userRoleMapper.selectOne(roleQueryWrapper);
+            if (Objects.isNull(userRole)) {
+                return BaseResponse.createFail(null, ErrorCodeEnum.USER_ROLE_NOT_EXISTED.getCode(), ErrorCodeEnum.USER_ROLE_NOT_EXISTED.getMessage());
+            }
+            UserUtil.setUser(one);
+            String uuid = UUIDutils.getUUID();
+            //token为key，id为value。过期时间30天
+            redisUtil.set(RedisKey.USER_TOKEN_ID + ":" + uuid, one.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME);
+            //异地登录状态
+            if (redisUtil.exists(RedisKey.USER_ID_TOKEN + ":" + one.getId())) {
+                //有key，value为null的情况；就把key删掉
+                Object loginkey = redisUtil.get(RedisKey.USER_ID_TOKEN + ":" + one.getId());
+                if (Objects.nonNull(loginkey)) {
+                    redisUtil.del(RedisKey.USER_TOKEN_ID + ":" + loginkey.toString());
+                } else {
+                    redisUtil.del(RedisKey.USER_ID_TOKEN + ":" + one.getId());
+                }
+            }
+            ;
+            //登录状态
+            redisUtil.set(RedisKey.USER_ID_TOKEN + ":" + one.getId(), uuid, BaseFinal.REDIS_USER_EXPIRE_TIME);
+            return new BaseResponse<>(LoginRes.builder().token(uuid).id(one.getId()).roleCode(one.getRoleCode()).build());
+        } else {
+            //查询是否有该用户
+            UserInfo manager = lambdaQuery().eq(UserInfo::getUserName, req.getUserName().trim()).select(UserInfo::getId).one();
+            if (null != manager) {
+                return BaseResponse.createFail(null, ErrorCodeEnum.PASSWORD_ERROR.getCode(), ErrorCodeEnum.PASSWORD_ERROR.getMessage());
+            }
+            return BaseResponse.createFail(null, ErrorCodeEnum.USER_NOT_EXISTED.getCode(), ErrorCodeEnum.USER_NOT_EXISTED.getMessage());
+        }
+    }
 
+
+    @Override
+    public void resetPassword(ResetPasswordReq req) {
+        UserInfo userInfo = userInfoMapper.selectById(req.getId());
+        if (ObjectUtil.isNotEmpty(userInfo)) {
+            userInfo.setPassword(req.getPassword());
+            userInfoMapper.updateById(userInfo);
+            UserUtil.releaseUser();
+            //删除redis用户token信息
+            if (redisUtil.exists(RedisKey.USER_ID_TOKEN + ":" + req.getId())) {
+                //有key，value为null的情况；就把key删掉
+                Object loginkey = redisUtil.get(RedisKey.USER_ID_TOKEN + ":" + req.getId());
+                if (Objects.nonNull(loginkey)) {
+                    redisUtil.del(RedisKey.USER_TOKEN_ID + ":" + loginkey.toString());
+                }
+                redisUtil.del(RedisKey.USER_ID_TOKEN + ":" + req.getId());
+            }
+        }
     }
 
+    @Override
+    public BaseResponse updatePassword(UpdatePasswordReq req) {
+        UserInfo userInfo = userInfoMapper.selectById(req.getId());
+        String oldPassword = AESEncodeTwoUtil.decrypt(userInfo.getPassword());
+        if (oldPassword.equals(req.getOldPassword())) {
+            userInfo.setPassword(req.getNewPassword());
+            userInfoMapper.updateById(userInfo);
+            //删除redis用户token信息
+            if (redisUtil.exists(RedisKey.USER_ID_TOKEN + ":" + req.getId())) {
+                //有key，value为null的情况；就把key删掉
+                Object loginkey = redisUtil.get(RedisKey.USER_ID_TOKEN + ":" + req.getId());
+                if (Objects.nonNull(loginkey)) {
+                    redisUtil.del(RedisKey.USER_TOKEN_ID + ":" + loginkey.toString());
+                }
+                redisUtil.del(RedisKey.USER_ID_TOKEN + ":" + req.getId());
+            }
+        } else {
+            log.info("请输入正确的密码");
+            return BaseResponse.create(null, ErrorCodeEnum.PASSWORD_ERROR.getCode(), ErrorCodeEnum.PASSWORD_ERROR.getMessage());
+        }
+        return BaseResponse.create();
+    }
 
+    @Override
+    public UserInfo validateToken(TokenReq req) {
+        Object uid = redisUtil.get(RedisKey.USER_TOKEN_ID + ":" + req.getToken());
+        if (Objects.nonNull(uid)) {
+            UserInfo userInfo = getById(uid.toString());
+            if (userInfo != null) {
+                //刷新token
+                redisUtil.set(RedisKey.USER_TOKEN_ID + ":" + req.getToken(), userInfo.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME);
+                redisUtil.set(RedisKey.USER_ID_TOKEN + ":" + userInfo.getId(), req.getToken(), BaseFinal.REDIS_USER_EXPIRE_TIME);
+            }
+            return userInfo;
+        }
+        return null;
+    }
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/UserManagerServiceImpl.java

@@ -58,45 +58,6 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
     @Autowired
     private UserMappingInfoRoleMapper userMappingInfoRoleMapper;
 
-    @Override
-    public BaseResponse login(LoginReq req) {
-        UserInfo one = lambdaQuery().eq(UserInfo::getUserName, req.getUserName().trim()).eq(UserInfo::getPassword, req.getPassword()).eq(UserInfo::getIsEnable, 1).eq(UserInfo::getIsDelete, 0).select(UserInfo::getId).one();
-        if (null != one) {
-            QueryWrapper<UserRole> roleQueryWrapper = new QueryWrapper<>();
-            roleQueryWrapper.eq("role_code", one.getRoleCode());
-            roleQueryWrapper.eq("is_delete", 0);
-            UserRole userRole = userRoleMapper.selectOne(roleQueryWrapper);
-            if (Objects.isNull(userRole)) {
-                return BaseResponse.createFail(null, ErrorCodeEnum.USER_ROLE_NOT_EXISTED.getCode(), ErrorCodeEnum.USER_ROLE_NOT_EXISTED.getMessage());
-            }
-            UserUtil.setUser(one);
-            String uuid = UUIDutils.getUUID();
-            //token为key，id为value。过期时间30天
-            redisUtil.set(RedisKey.USER_TOKEN_ID + ":" + uuid, one.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME);
-            //异地登录状态
-            if (redisUtil.exists(RedisKey.USER_ID_TOKEN + ":" + one.getId())) {
-                //有key，value为null的情况；就把key删掉
-                Object loginkey = redisUtil.get(RedisKey.USER_ID_TOKEN + ":" + one.getId());
-                if (Objects.nonNull(loginkey)) {
-                    redisUtil.del(RedisKey.USER_TOKEN_ID + ":" + loginkey.toString());
-                } else {
-                    redisUtil.del(RedisKey.USER_ID_TOKEN + ":" + one.getId());
-                }
-            }
-            ;
-            //登录状态
-            redisUtil.set(RedisKey.USER_ID_TOKEN + ":" + one.getId(), uuid, BaseFinal.REDIS_USER_EXPIRE_TIME);
-            return new BaseResponse<>(LoginRes.builder().token(uuid).id(one.getId()).roleCode(one.getRoleCode()).build());
-        } else {
-            //查询是否有该用户
-            UserInfo manager = lambdaQuery().eq(UserInfo::getUserName, req.getUserName().trim()).select(UserInfo::getId).one();
-            if (null != manager) {
-                return BaseResponse.createFail(null, ErrorCodeEnum.PASSWORD_ERROR.getCode(), ErrorCodeEnum.PASSWORD_ERROR.getMessage());
-            }
-            return BaseResponse.createFail(null, ErrorCodeEnum.USER_NOT_EXISTED.getCode(), ErrorCodeEnum.USER_NOT_EXISTED.getMessage());
-        }
-    }
-
     /**
      * 创建用户
      **/
@@ -222,62 +183,5 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
         userInfoMapper.batchEnableUser(req);
     }
 
-    @Override
-    public void resetPassword(ResetPasswordReq req) {
-        UserInfo userInfo = userInfoMapper.selectById(req.getId());
-        if (ObjectUtil.isNotEmpty(userInfo)) {
-            userInfo.setPassword(req.getPassword());
-            userInfoMapper.updateById(userInfo);
-            UserUtil.releaseUser();
-            //删除redis用户token信息
-            if (redisUtil.exists(RedisKey.USER_ID_TOKEN + ":" + req.getId())) {
-                //有key，value为null的情况；就把key删掉
-                Object loginkey = redisUtil.get(RedisKey.USER_ID_TOKEN + ":" + req.getId());
-                if (Objects.nonNull(loginkey)) {
-                    redisUtil.del(RedisKey.USER_TOKEN_ID + ":" + loginkey.toString());
-                }
-                redisUtil.del(RedisKey.USER_ID_TOKEN + ":" + req.getId());
-            }
-        }
-    }
-
-    @Override
-    public BaseResponse updatePassword(UpdatePasswordReq req) {
-        UserInfo userInfo = userInfoMapper.selectById(req.getId());
-        String oldPassword = AESEncodeTwoUtil.decrypt(userInfo.getPassword());
-        if (oldPassword.equals(req.getOldPassword())) {
-            userInfo.setPassword(req.getNewPassword());
-            userInfoMapper.updateById(userInfo);
-            //删除redis用户token信息
-            if (redisUtil.exists(RedisKey.USER_ID_TOKEN + ":" + req.getId())) {
-                //有key，value为null的情况；就把key删掉
-                Object loginkey = redisUtil.get(RedisKey.USER_ID_TOKEN + ":" + req.getId());
-                if (Objects.nonNull(loginkey)) {
-                    redisUtil.del(RedisKey.USER_TOKEN_ID + ":" + loginkey.toString());
-                }
-                redisUtil.del(RedisKey.USER_ID_TOKEN + ":" + req.getId());
-            }
-        } else {
-            log.info("请输入正确的密码");
-            return BaseResponse.create(null, ErrorCodeEnum.PASSWORD_ERROR.getCode(), ErrorCodeEnum.PASSWORD_ERROR.getMessage());
-        }
-        return BaseResponse.create();
-    }
-
-    @Override
-    public UserInfo validateToken(TokenReq req) {
-        Object uid = redisUtil.get(RedisKey.USER_TOKEN_ID + ":" + req.getToken());
-        if (Objects.nonNull(uid)) {
-            UserInfo userInfo = getById(uid.toString());
-            if (userInfo != null) {
-                //刷新token
-                redisUtil.set(RedisKey.USER_TOKEN_ID + ":" + req.getToken(), userInfo.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME);
-                redisUtil.set(RedisKey.USER_ID_TOKEN + ":" + userInfo.getId(), req.getToken(), BaseFinal.REDIS_USER_EXPIRE_TIME);
-            }
-            return userInfo;
-        }
-        return null;
-    }
-
 
 }