From a84ddb1f5f425b5f09cc6e82dad74fc5b5dad3b8 Mon Sep 17 00:00:00 2001 From: fuqingji <51312040@qq.com> Date: Mon, 29 Aug 2022 11:27:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4user=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserInfoController.java | 47 -------- .../extend/userinfo/dao/BaseRoleMapper.java | 10 -- .../extend/userinfo/dao/BaseUserMapper.java | 10 -- .../ebtp/extend/userinfo/entity/BaseRole.java | 48 -------- .../ebtp/extend/userinfo/entity/BaseUser.java | 65 ----------- .../userinfo/service/EbtpUserInfoService.java | 23 ---- .../service/impl/EbtpUserInfoServiceImpl.java | 110 ------------------ .../controller/UserPasswordController.java | 33 ------ .../userpassword/dao/UserPasswordMapper.java | 13 --- .../dao/mapper/UserPasswordMapper.xml | 17 --- .../userpassword/entity/UserPassword.java | 33 ------ .../service/IUserPasswordService.java | 16 --- .../service/impl/UserPasswordServiceImpl.java | 25 ---- 13 files changed, 450 deletions(-) delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/dao/BaseRoleMapper.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/dao/BaseUserMapper.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/entity/BaseRole.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/entity/BaseUser.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/service/EbtpUserInfoService.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/service/impl/EbtpUserInfoServiceImpl.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/controller/UserPasswordController.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/dao/UserPasswordMapper.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/dao/mapper/UserPasswordMapper.xml delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/entity/UserPassword.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/service/IUserPasswordService.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/service/impl/UserPasswordServiceImpl.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java deleted file mode 100644 index 35f4b6c..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.userinfo.controller; - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; -import com.chinaunicom.mall.ebtp.extend.userinfo.service.EbtpUserInfoService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -@Slf4j -@RestController -@RequestMapping("/v1/userinfo/") -public class UserInfoController { - - @Autowired - private EbtpUserInfoService ebtpUserInfoService; - - /** - * 获取用户信息 - * - * @param token (认证token) - * @return - */ - @GetMapping("get") - public ResponseEntity getUserInfo( - @RequestHeader(name = "Authorization", required = false) String token) { - if (StringUtils.isEmpty(token)) { - log.error("access token is empty"); - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build(); - } - return ResponseEntity.ok(ebtpUserInfoService.getUserInfo(token)); - } - - - /** - * 刷新redis缓存的信息 - * - * @return - */ - @PostMapping("refresh") - public ResponseEntity refreshToken() { - return ResponseEntity.ok(ebtpUserInfoService.refresh()); - } - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/dao/BaseRoleMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/dao/BaseRoleMapper.java deleted file mode 100644 index 300188f..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/dao/BaseRoleMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.userinfo.dao; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chinaunicom.mall.ebtp.extend.userinfo.entity.BaseRole; - -public interface BaseRoleMapper extends BaseMapper { - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/dao/BaseUserMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/dao/BaseUserMapper.java deleted file mode 100644 index bb83810..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/dao/BaseUserMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.userinfo.dao; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chinaunicom.mall.ebtp.extend.userinfo.entity.BaseUser; - -public interface BaseUserMapper extends BaseMapper { - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/entity/BaseRole.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/entity/BaseRole.java deleted file mode 100644 index eee438c..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/entity/BaseRole.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.userinfo.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 功能模块bean - * - * @author zyx - * - */ -@Data -@Accessors(chain = true) -@ApiModel -@TableName(value = "maint_base_role", autoResultMap = true) -public class BaseRole implements Serializable { - - private static final Long serialVersionUID = 1L; - - /** - * 姓名 - */ - @ApiModelProperty(value = "角色") - private String role; - - /** - * 账号 - */ - @ApiModelProperty(value = "备注") - private String remarks; - - /** - * role_id - */ - @ApiModelProperty(value = "role_id") - private String roleId; - - /** - * 账号 - */ - @ApiModelProperty(value = "状态,0-默认") - private int status; -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/entity/BaseUser.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/entity/BaseUser.java deleted file mode 100644 index 387cc3e..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/entity/BaseUser.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.userinfo.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 功能模块bean - * - * @author zyx - * - */ -@Data -@Accessors(chain = true) -@ApiModel -@TableName(value = "maint_base_user", autoResultMap = true) -public class BaseUser implements Serializable { - - private static final Long serialVersionUID = 1L; - /** - * id - */ - @ApiModelProperty(value = "编号") - private String id; - - /** - * 姓名 - */ - @ApiModelProperty(value = "姓名") - private String name; - - /** - * 账号 - */ - @ApiModelProperty(value = "账号") - private String account; - - /** - * 密码 - */ - @ApiModelProperty(value = "密码") - private String password; - - /** - * 省份 - */ - @ApiModelProperty(value = "省份") - private String province; - - /** - * 角色 - */ - @ApiModelProperty(value = "角色") - private String role; - - /** - * 租户 - */ - @ApiModelProperty(value = "租户") - private String tenant; -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/service/EbtpUserInfoService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/service/EbtpUserInfoService.java deleted file mode 100644 index 2c00c4e..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/service/EbtpUserInfoService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.userinfo.service; - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; - -public interface EbtpUserInfoService { - - - /** - * 获取用户信息 - * - * @param token - * @return - */ - public BaseCacheUser getUserInfo(String token); - - /** - * 刷新redis缓存的信息 - * - * @return - */ - public boolean refresh(); - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/service/impl/EbtpUserInfoServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/service/impl/EbtpUserInfoServiceImpl.java deleted file mode 100644 index ef36011..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/service/impl/EbtpUserInfoServiceImpl.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.userinfo.service.impl; - -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity; -import com.chinaunicom.mall.ebtp.cloud.userinfo.starter.service.UserInfoService; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; -import com.chinaunicom.mall.ebtp.extend.userinfo.dao.BaseRoleMapper; -import com.chinaunicom.mall.ebtp.extend.userinfo.dao.BaseUserMapper; -import com.chinaunicom.mall.ebtp.extend.userinfo.entity.BaseRole; -import com.chinaunicom.mall.ebtp.extend.userinfo.entity.BaseUser; -import com.chinaunicom.mall.ebtp.extend.userinfo.service.EbtpUserInfoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -@Service -public class EbtpUserInfoServiceImpl implements EbtpUserInfoService { - - @Autowired - private UserInfoService service; - @Autowired - private BaseUserMapper baseUserMapper; - @Autowired - private BaseRoleMapper baseRoleMapper; - - @Autowired(required = false) - @Qualifier("cacheRedisTemplate") - private RedisTemplate redisTemplate; - - private static final String EXTEND_USER_KEY = "ebtpUserTableCache"; - private static final String USERS = "users"; - private static final String ROLES = "roles"; - - @Override - public BaseCacheUser getUserInfo(String token) { - //查询山分库 - BaseCacheUser user = service.getUserInfo(token); - - if (Objects.isNull(user)) { - return new BaseCacheUser(); - } - - //获取redis缓存 - Map userTable = getUserTable(); - - //获取用户信息 - List users = (List) userTable.get(USERS); - BaseUser baseUser = users.stream().filter(u -> u.getAccount().equals(user.getLoginName())).findFirst().orElse(null); - if (Objects.isNull(baseUser)) { - return user; - } - - List roles = (List) userTable.get(ROLES); - user.setProvince(baseUser.getProvince()) - //覆盖角色 - .setAuthorityList( - Optional.of(roles - .stream() - .filter(r -> baseUser.getRole().contains(r.getRole())) - .map(br -> - new AuthorityEntity() - .setRoleId(br.getRoleId()) - .setRoleCode(br.getRole()) - .setRoleName(br.getRemarks()) - .setRoleScope("EBTP") - .setAuthorities(Collections.emptyList())) - .collect(Collectors.toList())) - .orElseGet(Collections::emptyList)); - return user; - } - - - private Map getUserTable() { - Object o = redisTemplate.opsForValue().get(EXTEND_USER_KEY); - - if (Objects.isNull(o)) { - o = cacheUserTable(); - } - return (Map) o ; - } - - private Map cacheUserTable() { - Map map = new HashMap<>(); - map.put(USERS, baseUserMapper.selectList(Wrappers.lambdaQuery(BaseUser.class).eq(BaseUser::getTenant, "ebtp_mall"))); - map.put(ROLES, baseRoleMapper.selectList(Wrappers.emptyWrapper())); - redisTemplate.opsForValue().set(EXTEND_USER_KEY, map, 8, TimeUnit.HOURS); - return map; - } - - - /** - * 删除token缓存 - * - * @return - */ - @Override - public boolean refresh() { - cacheUserTable(); - return true; - } - - public EbtpUserInfoServiceImpl() { - super(); - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/controller/UserPasswordController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/controller/UserPasswordController.java deleted file mode 100644 index 5a5c097..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/controller/UserPasswordController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.userpassword.controller; - - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.userpassword.entity.UserPassword; -import com.chinaunicom.mall.ebtp.extend.userpassword.service.IUserPasswordService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -@RestController -@Api(tags = "") -@RequestMapping("/v1/userpassword") -public class UserPasswordController{ - - @Resource - private IUserPasswordService iuserPasswordService; - - /** - * 查询数据 - * @return - */ - @ApiOperation("查询数据") - @PostMapping("/validatePassword") - public BaseResponse validatePassword(@RequestParam("code") String code){ - return BaseResponse.success(iuserPasswordService.validatePassword(code)); - } - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/dao/UserPasswordMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/dao/UserPasswordMapper.java deleted file mode 100644 index f15ea6c..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/dao/UserPasswordMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.userpassword.dao; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chinaunicom.mall.ebtp.extend.userpassword.entity.UserPassword; - -/** -* @author daixc -*/ -public interface UserPasswordMapper extends BaseMapper { - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/dao/mapper/UserPasswordMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/dao/mapper/UserPasswordMapper.xml deleted file mode 100644 index 6551b85..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/dao/mapper/UserPasswordMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - update user_password - set - delete_flag="deleted" - where ID=#{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/entity/UserPassword.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/entity/UserPassword.java deleted file mode 100644 index 2613439..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/entity/UserPassword.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.userpassword.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 实体类 UserPassword - * - * @auto.generated - */ -@Data -@Accessors(chain = true) -@ApiModel -@EqualsAndHashCode(callSuper = false) -@TableName(value = "user_password", autoResultMap = true) -public class UserPassword implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @ApiModelProperty(value = "") - private String password; - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/service/IUserPasswordService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/service/IUserPasswordService.java deleted file mode 100644 index 0231fb3..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/service/IUserPasswordService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.userpassword.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.chinaunicom.mall.ebtp.extend.userpassword.entity.UserPassword; - -/** - * 对数据表 user_password 操作的 service - * @author Auto create - * - */ -public interface IUserPasswordService extends IService { - - - boolean validatePassword(String code); -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/service/impl/UserPasswordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/service/impl/UserPasswordServiceImpl.java deleted file mode 100644 index ef4d5f9..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/userpassword/service/impl/UserPasswordServiceImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend.userpassword.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chinaunicom.mall.ebtp.extend.userpassword.dao.UserPasswordMapper; -import com.chinaunicom.mall.ebtp.extend.userpassword.entity.UserPassword; -import com.chinaunicom.mall.ebtp.extend.userpassword.service.IUserPasswordService; -import org.apache.commons.lang.StringUtils; -import org.springframework.stereotype.Service; -/** - * 对数据表 user_password 操作的 serviceImpl - * @author daixc - * - */ -@Service -public class UserPasswordServiceImpl extends ServiceImpl implements IUserPasswordService { - - @Override - public boolean validatePassword(String code) { - UserPassword userPassword = this.list().get(0); - if(StringUtils.isNotBlank(code) && code.equals(userPassword.getPassword())){ - return true; - } - return false; - } -}