Merge remote-tracking branch 'origin/dev/ez-security210625' into dev/ez-security210625

# Conflicts:
#	gateway-service/src/main/resources/application.yml
#	security-center/src/main/java/com/lantone/security/config/ResourceServerConfigurer.java
#	security-center/src/main/java/com/lantone/security/dto/JwtDTO.java
#	security-center/src/main/java/com/lantone/security/facade/UserLoginFacade.java
#	security-center/src/main/java/com/lantone/security/facade/UserMenuInfoFacade.java

security-center/src/main/java/com/lantone/security/enums/CRUDEnum.java

@@ -1,6 +1,6 @@
 package com.lantone.security.enums;
 
-import com.diagbot.core.KeyedNamed;
+import com.lantone.common.constant.KeyedNamed;
 import lombok.Setter;
 
 /**

security-center/src/main/java/com/lantone/security/enums/DataAuthDataTypeEnum.java

@@ -1,6 +1,6 @@
 package com.lantone.security.enums;
 
-import com.diagbot.core.KeyedNamed;
+import com.lantone.common.constant.KeyedNamed;
 import lombok.Setter;
 
 /**

security-center/src/main/java/com/lantone/security/enums/DataAuthDetailTypeEnum.java

@@ -1,6 +1,6 @@
 package com.lantone.security.enums;
 
-import com.diagbot.core.KeyedNamed;
+import com.lantone.common.constant.KeyedNamed;
 import lombok.Setter;
 
 /**

security-center/src/main/java/com/lantone/security/enums/HospitalTypeEnum.java

@@ -1,6 +1,6 @@
 package com.lantone.security.enums;
 
-import com.diagbot.core.KeyedNamed;
+import com.lantone.common.constant.KeyedNamed;
 import lombok.Setter;
 
 /**

security-center/src/main/java/com/lantone/security/enums/ServiceEnum.java

@@ -1,6 +1,6 @@
 package com.lantone.security.enums;
 
-import com.diagbot.core.KeyedNamed;
+import com.lantone.common.constant.KeyedNamed;
 import lombok.Setter;
 
 /**

security-center/src/main/java/com/lantone/security/facade/UserLoginFacade.java

@@ -1,139 +0,0 @@
-package com.lantone.security.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
-import com.lantone.common.dto.HospitalDTO;
-import com.lantone.common.dto.MenuInfoDTO;
-import com.lantone.common.dto.RoleDTO;
-import com.lantone.dblayermbg.entity.Hospital;
-import com.lantone.dblayermbg.entity.User;
-import com.lantone.dblayermbg.entity.UserRole;
-import com.lantone.dblayermbg.facade.UserRoleFacade;
-import com.lantone.dblayermbg.service.impl.UserServiceImpl;
-import com.lantone.security.client.AuthServiceClient;
-import com.lantone.security.dto.JWT;
-import com.lantone.security.dto.JwtDTO;
-import com.lantone.security.dto.JwtStore;
-import com.lantone.security.enums.StatusEnum;
-import com.lantone.security.exception.ServiceErrorCode;
-import com.lantone.security.util.SysUserUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.factory.PasswordEncoderFactories;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Component;
-import org.springframework.util.DigestUtils;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * <p>
- * 系统用户表 服务实现类Facade
- * </p>
- */
-@Component
-public class UserLoginFacade extends UserServiceImpl {
-    @Autowired
-    private TokenFacade tokenFacade;
-    @Autowired
-    private AuthServiceClient authServiceClient;
-    @Autowired
-    private UserRoleFacade userRoleFacade;
-
-
-    /**
-     * 获取jwt
-     *
-     * @param username 用户名
-     * @param password 密码
-     * @return jwt
-     */
-    public JwtDTO getJwt(String username, String password) {
-        JwtDTO data = new JwtDTO();
-        if (StringUtil.isBlank(username)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "请输入用户名");
-        }
-        if (StringUtil.isBlank(password)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "请输入密码");
-        }
-        //使用MD5对密码进行加密
-        String MD5Password = DigestUtils.md5DigestAsHex(password.getBytes());
-        QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.eq("username", username)
-                .eq("status", StatusEnum.Enable.getKey())
-                .eq("is_deleted", IsDeleteEnum.N.getKey());
-        User user = this.getOne(userQueryWrapper, false);
-        if (null == user) {
-            throw new CommonException(ServiceErrorCode.USER_NOT_FOUND);
-        }
-        PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
-        if (!passwordEncoder.matches(MD5Password, user.getPassword())) {
-            throw new CommonException(ServiceErrorCode.USER_PASSWORD_ERROR);
-        }
-        JWT jwt = authServiceClient.getToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2",
-                "password", username, MD5Password);
-        if (null == jwt) {
-            throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
-        }
-        data.setAccessToken(jwt.getAccess_token());
-        data.setRefreshToken(jwt.getRefresh_token());
-        //获取用户组织信息
-        Long id = user.getId();
-        List<Hospital> hospitals = this.baseMapper.getUserOrganizeByUserID(id);
-        if (ListUtil.isNotEmpty(hospitals)) {
-            List<HospitalDTO> organizeDTOS = new ArrayList<>();
-            //获取用户当前组织下的角色信息
-            for (Hospital hospital: hospitals) {
-                HospitalDTO hospitalDTO = new HospitalDTO();
-                BeanUtils.copyProperties(hospital,hospitalDTO);
-                if(hospital.getId()!=null){
-                    List<RoleDTO> roles= this.baseMapper.getUserRoleByUserID(id,hospital.getId());
-                    hospitalDTO.setRoles(roles);
-                }
-                organizeDTOS.add(hospitalDTO);
-            }
-            data.setOrganizes(organizeDTOS);
-        }
-
-        //token存入redis
-        JwtStore jwtStore = new JwtStore();
-        jwtStore.setAccessToken(jwt.getAccess_token());
-        jwtStore.setRefreshToken(jwt.getRefresh_token());
-        tokenFacade.createToken(jwtStore);
-        return data;
-    }
-    /**
-     * @Author songxl
-     * @Description 获取用户显示的菜单
-     * @Date  2021/7/19
-     * @Param []
-     * @Return com.lantone.security.dto.MenuInfoDTO
-     * @MethodName getUserOrgMenu
-     */
-    public MenuInfoDTO getUserOrgMenu() {
-        MenuInfoDTO menuInfoDTO = new MenuInfoDTO();
-        Set<String> roleSet = new HashSet<>();
-        Long userId = Long.parseLong(SysUserUtils.getCurrentPrincipleID());
-        //获取当前登录用户角色
-        List<UserRole> userRoles = userRoleFacade.list(new QueryWrapper<UserRole>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("status", StatusEnum.Enable.getKey())
-                .eq("id", userId));
-        //1.超级管理员
-        if(!ListUtil.isEmpty(userRoles)&&userRoles.contains(0)){
-
-        }
-        //添加菜单信息
-        return menuInfoDTO;
-    }
-
-}

security-center/src/main/java/com/lantone/security/facade/UserMenuInfoFacade.java

@@ -1,102 +0,0 @@
-package com.lantone.security.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.lantone.common.util.ListUtil;
-import com.lantone.dblayermbg.entity.MenuInfo;
-import com.lantone.dblayermbg.service.impl.MenuInfoServiceImpl;
-import com.lantone.security.dto.MenuInfoDTO;
-import com.lantone.security.enums.ConstantEnum;
-import com.lantone.security.enums.IsDeleteEnum;
-import com.lantone.security.enums.StatusEnum;
-import org.springframework.beans.BeanUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ClassName: SysMenuInfoDTOFacade
- * @Description: 菜单管理facade
- * @Author songxl
- * @Date 2021/7/19
- * @Version 1.0
- */
-public class UserMenuInfoFacade  {
-
-//    /**
-//     * @Author songxl
-//     * @Description 获取用户显示的菜单
-//     * @Date 2021/7/20
-//     * @Param [userId]
-//     * @Return java.util.List<com.lantone.security.dto.MenuInfoDTO>
-//     * @MethodName getUserMenuList
-//     */
-//    public List<MenuInfoDTO> getUserMenuList(Long userId) {
-//
-//        //系统管理员，拥有最高权限
-//        if (userId.intValue() == ConstantEnum.SUPER_USER.getKey()) {
-//            return getAllMenuList(null);
-//        }
-//
-//        //用户菜单列表
-//        List<Long> menuIdList = this.baseMapper.queryAllMenuIdByUserId(userId, null);
-//        return getAllMenuList(menuIdList);
-//    }
-//
-//    /**
-//     * @Author songxl
-//     * @Description 获取所有菜单列表
-//     * @Date 2021/7/20
-//     * @Param [menuIdList]
-//     * @Return java.util.List<com.lantone.security.dto.MenuInfoDTO>
-//     * @MethodName getAllMenuList
-//     */
-//    private List<MenuInfoDTO> getAllMenuList(List<Long> menuIdList) {
-//        //查询根菜单列表
-//        List<MenuInfoDTO> menuList = queryListParentId(0L, menuIdList);
-//        //递归获取子菜单
-//        getMenuTreeList(menuList, menuIdList);
-//
-//        return menuList;
-//    }
-//
-//    /**
-//     * 递归
-//     */
-//    private List<MenuInfoDTO> getMenuTreeList(List<MenuInfoDTO> menuList, List<Long> menuIdList) {
-//        List<MenuInfoDTO> subMenuList = new ArrayList();
-//
-//        for (MenuInfoDTO menuInfoDTO : menuList) {
-//            menuInfoDTO.setSonMenuInfo(getMenuTreeList(queryListParentId(menuInfoDTO.getId(), menuIdList), menuIdList));
-//            subMenuList.add(menuInfoDTO);
-//        }
-//
-//        return subMenuList;
-//    }
-//
-//    public List<MenuInfoDTO> queryListParentId(Long parentId, List<Long> menuIdList) {
-//        List<MenuInfo> menuListEntity = this.list(new QueryWrapper<MenuInfo>()
-//                .eq("is_deleted", IsDeleteEnum.N.getKey())
-//                .eq("status", StatusEnum.Enable.getKey())
-//                .eq("parent_id", parentId));
-//        List<MenuInfoDTO> menuList = new ArrayList<>();
-//        if (ListUtil.isNotEmpty(menuListEntity)) {
-//            menuListEntity.stream().forEach(menuInfo -> {
-//                MenuInfoDTO menuInfoDTO = new MenuInfoDTO();
-//                BeanUtils.copyProperties(menuInfo, menuInfoDTO);
-//                menuList.add(menuInfoDTO);
-//            });
-//        }
-//
-//        if (menuIdList == null) {
-//            return menuList;
-//        }
-//
-//        List<MenuInfoDTO> userMenuList = new ArrayList<>();
-//        for (MenuInfoDTO menu : menuList) {
-//            if (menuIdList.contains(menu.getId())) {
-//                userMenuList.add(menu);
-//            }
-//        }
-//        return userMenuList;
-//    }
-}