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

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

@@ -1,10 +1,10 @@
-package com.lantone.security.enums;
+package com.lantone.common.enums;
 
 import lombok.Getter;
 import lombok.Setter;
 
 /**
- * @Description: 是否，例如：是否删除
+ * @Description: 是否删除, N:未删除，Y:删除
  * @author: gaodm
  * @time: 2018/9/3 16:01
  */
@@ -39,4 +39,5 @@ public enum IsDeleteEnum {
         IsDeleteEnum item = getEnum(key);
         return item != null ? item.name : null;
     }
-}
+
+}

common/src/main/java/com/lantone/common/enums/StatusEnum.java

@@ -0,0 +1,43 @@
+package com.lantone.common.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 状态 0:禁用，1：启用
+ * @author: gaodm
+ * @time: 2018/9/3 16:01
+ */
+public enum StatusEnum {
+
+    Disable("0", "禁用"),
+    Enable("1", "启用");
+
+    @Getter
+    @Setter
+    private String key;
+
+    @Getter
+    @Setter
+    private String name;
+
+    StatusEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static StatusEnum getEnum(int key) {
+        for (StatusEnum item : StatusEnum.values()) {
+            if (item.key.equals(key)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        StatusEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+}

common/src/main/java/com/lantone/common/vo/LoginVO.java

@@ -4,10 +4,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 
 /**
- * @Description: 用户登录参数
+ * @Description: 登录以后返回token—接口入参
  * @author: rengb
  * @time: 2021/1/5 18:27
  */
@@ -15,11 +15,11 @@ import javax.validation.constraints.NotEmpty;
 @Setter
 public class LoginVO {
 
-    @NotEmpty
+    @NotBlank(message = "用户名不能为空")
     @ApiModelProperty(value = "用户名", required = true)
     private String username;
 
-    @NotEmpty
+    @NotBlank(message = "密码不能为空")
     @ApiModelProperty(value = "密码", required = true)
     private String password;
 

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/ResourceFacade.java

@@ -2,6 +2,8 @@ package com.lantone.dblayermbg.facade;
 
 import com.google.common.collect.Maps;
 import com.lantone.common.constant.AuthConstant;
+import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.enums.StatusEnum;
 import com.lantone.common.service.RedisService;
 import com.lantone.dblayermbg.service.impl.ResourceServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +26,7 @@ public class ResourceFacade extends ResourceServiceImpl {
 
     public Map<String, List<String>> initResourceRolesMap() {
         Map<String, List<String>> resourceRolesMap = Maps.newHashMap();
-        List<String> resourceRolesList = baseMapper.getResourceRolesMap();
+        List<String> resourceRolesList = baseMapper.getResourceRolesMap(IsDeleteEnum.N.getKey(), StatusEnum.Enable.getKey());
         resourceRolesList.forEach(resourceRoles -> {
             String[] resourceRoleArray = resourceRoles.split("=");
             resourceRolesMap.put(resourceRoleArray[0], Arrays.asList(resourceRoleArray[1].split(",")));

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/ResourceMapper.java

@@ -2,6 +2,7 @@ package com.lantone.dblayermbg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lantone.dblayermbg.entity.Resource;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,6 +13,13 @@ import java.util.List;
  */
 public interface ResourceMapper extends BaseMapper<Resource> {
 
-    List<String> getResourceRolesMap();
+    /**
+     * 获取所有url、系统、角色对应关系，如：security-center/roleManage/add+运行质控ID=角色A,角色B,角色C
+     *
+     * @param isDeleted
+     * @param status
+     * @return
+     */
+    List<String> getResourceRolesMap(@Param("isDeleted") String isDeleted, @Param("status") String status);
 
 }

dblayer-mbg/src/main/resources/mapper/ResourceMapper.xml

@@ -4,27 +4,30 @@
 
     <select id="getResourceRolesMap" resultType="string">
         SELECT
-        CONCAT(t2.url,'=',GROUP_CONCAT(t1.role_id))
+        CONCAT(t2.url,'+',t2.software_id,'=',GROUP_CONCAT(concat(t1.role_id,'_',t1.role_name)))
         FROM
         (SELECT
-        b.role_id,e.resource_id
+        a.`name` as role_name,b.role_id,c.software_id,e.resource_id
         FROM sys_role a JOIN sys_role_software_menu b ON a.id=b.role_id
         JOIN sys_software_menu c ON b.software_menu_id=c.id
+		JOIN sys_software f ON c.software_id = f.id
         JOIN sys_menu d ON c.menu_id=d.id
         JOIN sys_menu_resource e ON d.id=e.menu_id
-        WHERE a.is_deleted='N' AND b.is_deleted='N' AND c.is_deleted='N'
-        AND d.is_deleted='N' AND e.is_deleted='N' AND a.`status`='1'
-        AND d.`status`='1') t1
+        WHERE a.is_deleted=#{isDeleted} AND b.is_deleted=#{isDeleted} AND c.is_deleted=#{isDeleted}
+        AND d.is_deleted=#{isDeleted} AND e.is_deleted=#{isDeleted} AND f.is_deleted=#{isDeleted}
+		AND a.`status`=#{status} AND d.`status`=#{status} AND f.`status`=#{status}) t1
         JOIN
         (SELECT
-        b.role_id,c.resource_id,d.url
+        b.role_id,c.software_id,c.resource_id,d.url
         FROM sys_role a JOIN sys_role_software_resource b ON a.id=b.role_id
         JOIN sys_software_resource c ON b.software_resource_id=c.id
+		JOIN sys_software e ON c.software_id=e.id
         JOIN sys_resource d ON c.resource_id=d.id
-        WHERE a.is_deleted='N' AND b.is_deleted='N' AND c.is_deleted='N'
-        AND d.is_deleted='N' AND a.`status`='1' AND d.`status`='1') t2
-        ON t1.role_id=t2.role_id AND t1.resource_id=t2.resource_id
-        GROUP BY t2.url
+        WHERE a.is_deleted=#{isDeleted} AND b.is_deleted=#{isDeleted} AND c.is_deleted=#{isDeleted}
+        AND d.is_deleted=#{isDeleted} AND e.is_deleted=#{isDeleted} AND a.`status`=#{status}
+		AND d.`status`=#{status} AND e.`status`=#{status}) t2
+        ON t1.role_id=t2.role_id AND t1.resource_id=t2.resource_id AND t1.software_id=t2.software_id
+        GROUP BY t2.url,t2.software_id
     </select>
 
 </mapper>

gateway-service/src/main/resources/bootstrap.yml

@@ -11,7 +11,7 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          jwk-set-uri: 'http://localhost:8869/user-auth/rsa/publicKey' #配置RSA的公钥访问地址
+          jwk-set-uri: 'http://localhost:8871/user-auth/rsa/publicKey' #配置RSA的公钥访问地址
   cloud:
     gateway:
       discovery:
@@ -84,7 +84,7 @@ secure:
       - "/actuator/**"
       - "/user-auth/oauth/token"
       - "/user-auth/rsa/publicKey"
-      - "/security-center/userAdmin/login"
+      - "/security-center/userManage/login"
       - "/security-center/dataAuthManage/getDataAuthById"
       - "/security-center/dataAuthManage/addAuth"
       - "/security-center/dataAuthManage/updateAuth"

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

@@ -1,50 +0,0 @@
-package com.lantone.security.enums;
-
-import com.lantone.common.constant.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 下午2:31:42
- */
-public enum StatusEnum implements KeyedNamed {
-    Disable(0, "禁用"),
-    Enable(1, "启用");
-
-    @Setter
-    private int key;
-
-    @Setter
-    private String name;
-
-    StatusEnum(int key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static StatusEnum getEnum(int key) {
-        for (StatusEnum item : StatusEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(int key) {
-        StatusEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
-

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

@@ -38,7 +38,7 @@ import com.lantone.dblayermbg.facade.SoftwareDataAuthFacade;
 import com.lantone.security.enums.DataAuthDataTypeEnum;
 import com.lantone.security.enums.DataAuthDetailTypeEnum;
 import com.lantone.security.enums.HospitalTypeEnum;
-import com.lantone.security.enums.IsDeleteEnum;
+import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.security.enums.ServiceEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -22,7 +22,7 @@ import java.util.Date;
  * </p>
  */
 @Component
-public class DictionaryInfoManagementFacade{
+public class DictionaryManagementFacade {
     @Autowired
     private DictionaryInfoFacade dictionaryInfoFacade;
 

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

@@ -22,7 +22,7 @@ import com.lantone.dblayermbg.facade.ResourceFacade;
 import com.lantone.dblayermbg.facade.RoleSoftwareMenuFacade;
 import com.lantone.dblayermbg.facade.SoftwareMenuFacade;
 import com.lantone.dblayermbg.facade.SoftwareResourceFacade;
-import com.lantone.security.enums.IsDeleteEnum;
+import com.lantone.common.enums.IsDeleteEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -17,7 +17,7 @@ import com.lantone.dblayermbg.entity.RegionDept;
 import com.lantone.dblayermbg.facade.DeptFacade;
 import com.lantone.dblayermbg.facade.RegionFacade;
 import com.lantone.dblayermbg.service.RegionDeptService;
-import com.lantone.security.enums.IsDeleteEnum;
+import com.lantone.common.enums.IsDeleteEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

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

@@ -27,7 +27,7 @@ import com.lantone.dblayermbg.facade.SoftwareFacade;
 import com.lantone.dblayermbg.facade.SoftwareMenuFacade;
 import com.lantone.dblayermbg.service.impl.RoleSoftwareMenuServiceImpl;
 import com.lantone.dblayermbg.service.impl.RoleSoftwareResourceServiceImpl;
-import com.lantone.security.enums.IsDeleteEnum;
+import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.security.enums.RelationEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -4,14 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.constant.AuthConstant;
+import com.lantone.common.domain.UserDto;
 import com.lantone.common.dto.GetDeptTreeDTO;
 import com.lantone.common.dto.GetHospitalDeptDTO;
 import com.lantone.common.dto.GetHospitalTreeDTO;
-import com.lantone.common.dto.GetMenusTreeDTO;
 import com.lantone.common.dto.GetUserDTO;
-import com.lantone.common.dto.HospitalDTO;
-import com.lantone.common.dto.UserMenuResourceTreeDTO;
-import com.lantone.common.dto.UserRoleDTO;
 import com.lantone.common.exception.Asserts;
 import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.EntityUtil;
@@ -21,19 +18,20 @@ import com.lantone.common.vo.AddHospitalTreeVO;
 import com.lantone.common.vo.AddUserVO;
 import com.lantone.common.vo.LoginVO;
 import com.lantone.common.vo.UpdateUserVO;
+import com.lantone.dblayermbg.entity.DeptUser;
 import com.lantone.dblayermbg.entity.Hospital;
 import com.lantone.dblayermbg.entity.HospitalUser;
 import com.lantone.dblayermbg.entity.User;
-import com.lantone.dblayermbg.entity.DeptUser;
 import com.lantone.dblayermbg.entity.UserRole;
 import com.lantone.dblayermbg.facade.DeptFacade;
+import com.lantone.dblayermbg.facade.DeptUserFacade;
 import com.lantone.dblayermbg.facade.HospitalFacade;
 import com.lantone.dblayermbg.facade.HospitalUserFacade;
-import com.lantone.dblayermbg.facade.DeptUserFacade;
+import com.lantone.dblayermbg.facade.RoleFacade;
 import com.lantone.dblayermbg.facade.UserFacade;
 import com.lantone.dblayermbg.facade.UserRoleFacade;
 import com.lantone.security.enums.HospitalTypeEnum;
-import com.lantone.security.enums.IsDeleteEnum;
+import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.security.service.AuthService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +41,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 用户管理-业务处理类
@@ -50,7 +49,7 @@ import java.util.Map;
  * @time: 2021/7/20 12:39
  */
 @Component
-public class UserAdminFacade {
+public class UserManagementFacade {
 
     @Autowired
     private AuthService authService;
@@ -66,6 +65,8 @@ public class UserAdminFacade {
     private DeptUserFacade userDeptFacade;
     @Autowired
     private UserRoleFacade userRoleFacade;
+    @Autowired
+    private RoleFacade roleFacade;
 
     public CommonResult login(LoginVO loginVO) {
         Map<String, String> params = new HashMap<>();
@@ -78,6 +79,31 @@ public class UserAdminFacade {
         return restResult;
     }
 
+    public UserDto loadUserByUsername(String username) {
+        QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
+        userQueryWrapper.eq("username", username);
+        userQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<User> userList = userFacade.list(userQueryWrapper);
+        if (userList.size() == 0) {
+            return null;
+        }
+        if (userList.size() > 1) {
+            Asserts.fail("当前账号异常！");
+        }
+        UserDto userDTO = new UserDto();
+        User user = userList.get(0);
+        QueryWrapper<UserRole> userRoleQueryWrapper = new QueryWrapper<>();
+        userRoleQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        userRoleQueryWrapper.eq("user_id", user.getId());
+        List<Long> roleIdList = userRoleFacade.list(userRoleQueryWrapper)
+                .stream()
+                .map(i -> i.getRoleId())
+                .collect(Collectors.toList());
+        BeanUtils.copyProperties(user, userDTO);
+        userDTO.setStatus(Integer.parseInt(user.getStatus()));
+        return userDTO;
+    }
+
     /**
      * @param addUserVO
      * @Description添加用户

security-center/src/main/java/com/lantone/security/web/DataAuthManagementController.java

@@ -25,14 +25,12 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
- * @ClassName: DataAuthController
  * @Description: 数据权限API
- * @Author songxl
- * @Date 2021/7/21
- * @Version 1.0
+ * @author: songxl
+ * @time: 2021/7/20 12:39
  */
 @RestController
-@Api(value = "数据权限API", tags = "DataAuthManagementController")
+@Api(value = "数据权限API", tags = { "数据权限API" })
 @RequestMapping("/dataAuthManage")
 public class DataAuthManagementController {
     @Autowired
@@ -55,7 +53,7 @@ public class DataAuthManagementController {
     @ApiOperation(value = "启用禁用数据权限[by:songxl]")
     @PostMapping("/disableAuth")
     @Transactional
-    public CommonResult<Boolean> disableAuth(@RequestParam @Valid @NotNull(message = "数据权限id为空") Long id,@RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
+    public CommonResult<Boolean> disableAuth(@RequestParam @Valid @NotNull(message = "数据权限id为空") Long id, @RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
         return CommonResult.success(dataAuthHandleFacade.disableDataAuth(id, status));
     }
 

security-center/src/main/java/com/lantone/security/web/DictionaryManagementController.java

@@ -2,10 +2,10 @@ package com.lantone.security.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
-import com.lantone.common.vo.SaveDictionaryVO;
 import com.lantone.common.vo.GetDictionaryVO;
+import com.lantone.common.vo.SaveDictionaryVO;
 import com.lantone.dblayermbg.entity.DictionaryInfo;
-import com.lantone.security.facade.DictionaryInfoManagementFacade;
+import com.lantone.security.facade.DictionaryManagementFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,18 +19,16 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
 
 /**
- * @ClassName: DictionaryManagementController
- * @Description: 字典管理
- * @Author cy
- * @Date 2021/7/29
- * @Version 1.0
+ * @Description: 字典管理API
+ * @author: cy
+ * @time: 2021/7/20 12:39
  */
 @RestController
 @Api(value = "字典管理API", tags = { "字典管理API" })
 @RequestMapping("/dictionaryManage")
 public class DictionaryManagementController {
     @Autowired
-    private DictionaryInfoManagementFacade dictionaryInfoFacade;
+    private DictionaryManagementFacade dictionaryManagementFacade;
 
     @ApiOperation(value = "新增/修改字典[by:cy]",
             notes = "id:新增操作为null<br>" +
@@ -42,7 +40,7 @@ public class DictionaryManagementController {
     @PostMapping("/saveDictionary")
     @Transactional
     public CommonResult<Object> saveDictionary(@RequestBody @Valid SaveDictionaryVO saveDictionaryVO) {
-        return CommonResult.success(dictionaryInfoFacade.saveDictionary(saveDictionaryVO));
+        return CommonResult.success(dictionaryManagementFacade.saveDictionary(saveDictionaryVO));
     }
 
     @ApiOperation(value = "查看字典管理[by:cy]",
@@ -50,7 +48,7 @@ public class DictionaryManagementController {
                     "groupType:代码类别，<br>")
     @PostMapping("/getDictionary")
     public CommonResult<IPage<DictionaryInfo>> getDictionary(@RequestBody GetDictionaryVO getDictionaryVO) {
-        return CommonResult.success(dictionaryInfoFacade.getDictionary(getDictionaryVO));
+        return CommonResult.success(dictionaryManagementFacade.getDictionary(getDictionaryVO));
     }
 
     @ApiOperation(value = "删除字典管理[by:cy]",
@@ -58,6 +56,6 @@ public class DictionaryManagementController {
     @PostMapping("/deleteDictionary")
     @Transactional
     public CommonResult<Boolean> deleteDictionary(@RequestParam Integer id) {
-        return CommonResult.success(dictionaryInfoFacade.deleteDictionary(id));
+        return CommonResult.success(dictionaryManagementFacade.deleteDictionary(id));
     }
 }

security-center/src/main/java/com/lantone/security/web/FuncManagementController.java

@@ -23,14 +23,12 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
- * @ClassName: FuncManagementController
  * @Description: 功能管理API
- * @Author songxl
- * @Date 2021/7/27
- * @Version 1.0
+ * @author: songxl
+ * @time: 2021/7/20 12:39
  */
 @RestController
-@Api(value = "功能管理API", tags = "FuncManagementController")
+@Api(value = "功能管理API", tags = { "功能管理API" })
 @RequestMapping("/funcManage")
 public class FuncManagementController {
     @Autowired
@@ -52,14 +50,14 @@ public class FuncManagementController {
     @ApiOperation(value = "修改功能菜单 [by:songxl]")
     @PostMapping("/updateMenu")
     @Transactional
-    public CommonResult<Boolean> updateMenu(@RequestBody  @Valid UpdateMenuVO updateMenuVO) {
+    public CommonResult<Boolean> updateMenu(@RequestBody @Valid UpdateMenuVO updateMenuVO) {
         return CommonResult.success(funcManagementFacade.updateMenu(updateMenuVO));
     }
 
     @ApiOperation(value = "获取菜单详情 [by:songxl]")
     @PostMapping("/getMenuById")
     public CommonResult<GetMenuByIdDTO> getMenuById(@RequestParam @Valid @NotNull(message = "功能菜单编号为空") Long id, @RequestParam @Valid @NotNull(message = "系统编号为空") Long softwareId) {
-        return CommonResult.success(funcManagementFacade.getMenuById(id,softwareId));
+        return CommonResult.success(funcManagementFacade.getMenuById(id, softwareId));
     }
 
     @ApiOperation(value = "删除功能菜单 [by:songxl]")
@@ -72,7 +70,7 @@ public class FuncManagementController {
     @ApiOperation(value = "启用禁用功能菜单 [by:songxl]")
     @PostMapping("/disableMenu")
     @Transactional
-    public CommonResult<Boolean> disableMenu(@RequestParam @Valid @NotNull(message = "功能菜单id为空") Long id,@RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
+    public CommonResult<Boolean> disableMenu(@RequestParam @Valid @NotNull(message = "功能菜单id为空") Long id, @RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
         return CommonResult.success(funcManagementFacade.disableMenu(id, status));
     }
 

security-center/src/main/java/com/lantone/security/web/HospitalManagementController.java

@@ -1,6 +1,5 @@
 package com.lantone.security.web;
 
-
 import com.lantone.security.facade.HospitalManagementFacade;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,12 +7,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 组织管理API
+ * @Description: 组织管理API
+ * @author: songxl
+ * @time: 2021/7/20 12:39
  */
 @RestController
-@Api(value = "组织管理API", tags = "HospitalManagementController")
+@Api(value = "组织管理API", tags = { "组织管理API" })
 @RequestMapping("/hospitalManage")
 public class HospitalManagementController {
     @Autowired
     private HospitalManagementFacade hospitalManagementFacade;
-}
+
+}

security-center/src/main/java/com/lantone/security/web/HospitalSetManagementController.java

@@ -1,4 +1,5 @@
 package com.lantone.security.web;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.vo.GetHospitalSetVO;
@@ -14,14 +15,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+
 import javax.validation.Valid;
 
 /**
- * @ClassName: HospitalSetManagementController
- * @Description: 参数管理
- * @Author cy
- * @Date 2021/7/30
- * @Version 1.0
+ * @Description: 参数管理API
+ * @author: cy
+ * @time: 2021/7/20 12:39
  */
 @RestController
 @Api(value = "参数管理API", tags = { "参数管理API" })

security-center/src/main/java/com/lantone/security/web/RegionManagementController.java

@@ -23,11 +23,9 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
- * @ClassName: RegionManagementController
- * @Description: 病区管理
- * @Author cy
- * @Date 2021/7/27
- * @Version 1.0
+ * @Description: 病区管理API
+ * @author: cy
+ * @time: 2021/7/20 12:39
  */
 @RestController
 @Api(value = "病区管理API", tags = { "病区管理API" })
@@ -74,7 +72,7 @@ public class RegionManagementController {
 
 
     @ApiOperation(value = "删除病区管理[by:cy]",
-            notes =  "id:病区id，必填<br>")
+            notes = "id:病区id，必填<br>")
     @PostMapping("/deleteRegion")
     @Transactional
     public CommonResult<Boolean> deleteRegion(@RequestParam Integer id) {
@@ -82,7 +80,7 @@ public class RegionManagementController {
     }
 
     @ApiOperation(value = "获取科室列表[by:cy]",
-            notes =  "标记（0-返回科室列表 1-返回互斥科室列表），必填<br>")
+            notes = "标记（0-返回科室列表 1-返回互斥科室列表），必填<br>")
     @PostMapping("/getDeptList")
     public CommonResult<List<Dept>> getDeptList(@RequestBody @Valid GetDeptListVO getDeptListVO) {
         return CommonResult.success(sysRegionFacade.getDept(getDeptListVO));

security-center/src/main/java/com/lantone/security/web/RoleManagementController.java

@@ -26,14 +26,12 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @ClassName: RoleManagementController
  * @Description: 角色管理API
- * @Author songxl
- * @Date 2021/7/27
- * @Version 1.0
+ * @author: songxl
+ * @time: 2021/7/20 12:39
  */
 @RestController
-@Api(value = "角色管理API", tags = "RoleManagementController")
+@Api(value = "角色管理API", tags = { "角色管理API" })
 @RequestMapping("/roleManage")
 public class RoleManagementController {
     @Autowired
@@ -71,8 +69,8 @@ public class RoleManagementController {
     @ApiOperation(value = "禁用|启用角色 [by:songxl]")
     @PostMapping("/disableRole")
     @Transactional
-    public CommonResult<Boolean> disableRole(@RequestParam @Valid @NotNull(message = "角色编号为空") Long roleId,@RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
-        return CommonResult.success(roleManagementFacade.disableRole(roleId,status));
+    public CommonResult<Boolean> disableRole(@RequestParam @Valid @NotNull(message = "角色编号为空") Long roleId, @RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
+        return CommonResult.success(roleManagementFacade.disableRole(roleId, status));
     }
 
     @ApiOperation(value = "通过角色id获取角色详情 [by:songxl]")
@@ -80,11 +78,13 @@ public class RoleManagementController {
     public CommonResult<GetRoleDTO> getRoleById(@RequestParam @Valid @NotNull(message = "角色编号为空") Long roleId) {
         return CommonResult.success(roleManagementFacade.getRoleById(roleId));
     }
+
     @ApiOperation(value = "获取当前登录用户的功能权限树 [by:songxl]")
     @PostMapping("/getUserMenuResourceTree")
-    public CommonResult<Map<Long,List<UserMenuResourceTreeDTO>>> getUserMenuResourceTree() {
+    public CommonResult<Map<Long, List<UserMenuResourceTreeDTO>>> getUserMenuResourceTree() {
         return CommonResult.success(roleManagementFacade.getUserMenuResourceTree());
     }
+
     @ApiOperation(value = "获取当前登录用户创建的角色列表 [by:songxl]")
     @PostMapping("/getCreateRoles")
     public CommonResult<List<GetCreateRoleDTO>> getCreateRoles() {

security-center/src/main/java/com/lantone/security/web/UserAdminController.java

@@ -1,6 +1,5 @@
 package com.lantone.security.web;
 
-import com.google.common.collect.Lists;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.domain.UserDto;
 import com.lantone.common.dto.GetHospitalTreeDTO;
@@ -8,12 +7,11 @@ import com.lantone.common.dto.GetUserDTO;
 import com.lantone.common.vo.AddUserVO;
 import com.lantone.common.vo.LoginVO;
 import com.lantone.common.vo.UpdateUserVO;
-import com.lantone.security.facade.UserAdminFacade;
+import com.lantone.security.facade.UserManagementFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,22 +25,22 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
- * @Description: 用户管理
- * @author: rengb
- * @time: 2021/1/5 18:27
+ * @Description: 用户管理API
+ * @author: songxl
+ * @time: 2021/7/20 12:39
  */
 @RestController
-@Api(tags = "UserAdminController", description = "用户管理")
-@RequestMapping("/userAdmin")
-public class UserAdminController {
+@Api(value = "用户管理API", tags = { "用户管理API" })
+@RequestMapping("/userManage")
+public class UserManagementController {
 
     @Autowired
-    private UserAdminFacade userAdminFacade;
+    private UserManagementFacade userManagementFacade;
 
     @ApiOperation(value = "登录以后返回token")
-    @RequestMapping(value = "/login", method = RequestMethod.POST)
-    public CommonResult login(@Validated @RequestBody LoginVO loginVO) {
-        return userAdminFacade.login(loginVO);
+    @PostMapping(value = "/login")
+    public CommonResult login(@Valid @RequestBody LoginVO loginVO) {
+        return userManagementFacade.login(loginVO);
     }
 
     @ApiOperation(value = "登出功能")
@@ -51,71 +49,56 @@ public class UserAdminController {
         return CommonResult.success(null);
     }
 
-    @ApiOperation(value = "登录以后返回token")
-    @RequestMapping(value = "/getMyName", method = RequestMethod.POST)
-    public CommonResult getMyName() {
-        return CommonResult.success("任国宾");
-    }
-
-
     @ApiOperation("根据用户名获取通用用户信息")
-    @RequestMapping(value = "/loadByUsername", method = RequestMethod.GET)
-    public UserDto loadUserByUsername(@RequestParam String username) {
-        if (!username.equals("lantone")) {
-            return null;
-        }
-        UserDto userDTO = new UserDto();
-        userDTO.setUsername("lantone");
-        userDTO.setPassword("$2a$10$T/ndIW6vgydYOVqj0syXeeSvgYbChiIU.azRmoZ.uqDQhYjN.yozy");
-        userDTO.setId(1l);
-        userDTO.setClientId("security-center");
-        userDTO.setStatus(1);
-        userDTO.setRoles(Lists.newArrayList("t1"));
-        return userDTO;
+    @PostMapping(value = "/loadByUsername")
+    public CommonResult<UserDto> loadUserByUsername(@RequestParam String username) {
+        return CommonResult.success(userManagementFacade.loadUserByUsername(username));
     }
 
     @ApiOperation(value = "添加用户 [by:songxl]")
     @PostMapping("/addUser")
     @Transactional
     public CommonResult<Boolean> addUser(@RequestBody @Valid AddUserVO addUserVO) {
-        return CommonResult.success(userAdminFacade.addUser(addUserVO));
+        return CommonResult.success(userManagementFacade.addUser(addUserVO));
     }
+
     @ApiOperation(value = "修改用户 [by:songxl]")
     @PostMapping("/updateUser")
     @Transactional
     public CommonResult<Boolean> updateUser(@RequestBody @Valid UpdateUserVO updateUserVO) {
-        return CommonResult.success(userAdminFacade.updateUser(updateUserVO));
+        return CommonResult.success(userManagementFacade.updateUser(updateUserVO));
     }
 
     @ApiOperation(value = "删除用户 [by:songxl]")
     @PostMapping("/deleteUser")
     @Transactional
     public CommonResult<Boolean> deleteUser(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId) {
-        return CommonResult.success(userAdminFacade.deleteUser(userId));
+        return CommonResult.success(userManagementFacade.deleteUser(userId));
     }
 
 
     @ApiOperation(value = "禁用|启用用户 [by:songxl]")
     @PostMapping("/disableUser")
     @Transactional
-    public CommonResult<Boolean> disableUser(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId,@RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
-        return CommonResult.success(userAdminFacade.disableUser(userId,status));
+    public CommonResult<Boolean> disableUser(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId, @RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
+        return CommonResult.success(userManagementFacade.disableUser(userId, status));
     }
 
     @ApiOperation(value = "查看用户 [by:songxl]")
     @PostMapping("/getUserById")
-    public CommonResult<GetUserDTO> getUserById(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId,Long local) {
-        return CommonResult.success(userAdminFacade.getUserById(userId,local));
+    public CommonResult<GetUserDTO> getUserById(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId, Long local) {
+        return CommonResult.success(userManagementFacade.getUserById(userId, local));
     }
+
     @ApiOperation(value = "获取登录用户的组织机构树 [by:songxl]")
     @PostMapping("/getHospitalTree")
     public CommonResult<List<GetHospitalTreeDTO>> getLoginUserHospitalTree() {
-        return CommonResult.success(userAdminFacade.getLoginUserHospitalTree());
+        return CommonResult.success(userManagementFacade.getLoginUserHospitalTree());
     }
 
-//    @ApiOperation(value = "获取当前用户所在组织的用户列表 [by:songxl]")
-//    @PostMapping("/getUserPage")
-//    public CommonResult<List<GetHospitalTreeDTO>> getUserPage(GetUserPageVO getUserPageVO) {
-//        return CommonResult.success(userAdminFacade.getLoginUserHospitalTree());
-//    }
+    //    @ApiOperation(value = "获取当前用户所在组织的用户列表 [by:songxl]")
+    //    @PostMapping("/getUserPage")
+    //    public CommonResult<List<GetHospitalTreeDTO>> getUserPage(GetUserPageVO getUserPageVO) {
+    //        return CommonResult.success(userAdminFacade.getLoginUserHospitalTree());
+    //    }
 }

user-auth/src/main/java/com/lantone/userauth/controller/AuthController.java

@@ -11,8 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.provider.endpoint.TokenEndpoint;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
@@ -42,7 +42,7 @@ public class AuthController {
             @ApiImplicitParam(name = "username", value = "登录用户名"),
             @ApiImplicitParam(name = "password", value = "登录密码")
     })
-    @RequestMapping(value = "/token", method = RequestMethod.POST)
+    @PostMapping(value = "/token")
     public CommonResult<Oauth2TokenDto> postAccessToken(@ApiIgnore Principal principal, @ApiIgnore @RequestParam Map<String, String> parameters) throws HttpRequestMethodNotSupportedException {
         OAuth2AccessToken oAuth2AccessToken = tokenEndpoint.postAccessToken(principal, parameters).getBody();
         Oauth2TokenDto oauth2TokenDto = Oauth2TokenDto.builder()

user-auth/src/main/java/com/lantone/userauth/service/UmsAdminService.java

@@ -1,8 +1,9 @@
 package com.lantone.userauth.service;
 
+import com.lantone.common.api.CommonResult;
 import com.lantone.common.domain.UserDto;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -11,8 +12,9 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @time: 2021/1/5 18:27
  */
 @FeignClient("security-center")
-public interface UmsAdminService {
+public interface UserManagemenService {
+
+    @PostMapping("/userManage/loadByUsername")
+    CommonResult<UserDto> loadUserByUsername(@RequestParam String username);
 
-    @GetMapping("/userAdmin/loadByUsername")
-    UserDto loadUserByUsername(@RequestParam String username);
 }

user-auth/src/main/java/com/lantone/userauth/service/impl/UserServiceImpl.java

@@ -1,10 +1,11 @@
 package com.lantone.userauth.service.impl;
 
+import com.lantone.common.api.CommonResult;
 import com.lantone.common.constant.AuthConstant;
 import com.lantone.common.domain.UserDto;
 import com.lantone.userauth.constant.MessageConstant;
 import com.lantone.userauth.domain.SecurityUser;
-import com.lantone.userauth.service.UmsAdminService;
+import com.lantone.userauth.service.UserManagemenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AccountExpiredException;
 import org.springframework.security.authentication.CredentialsExpiredException;
@@ -26,7 +27,7 @@ import javax.servlet.http.HttpServletRequest;
 public class UserServiceImpl implements UserDetailsService {
 
     @Autowired
-    private UmsAdminService adminService;
+    private UserManagemenService userManagemenService;
     @Autowired
     private HttpServletRequest request;
 
@@ -35,7 +36,8 @@ public class UserServiceImpl implements UserDetailsService {
         String clientId = request.getParameter("client_id");
         UserDto userDto = null;
         if (AuthConstant.SECURITY_CENTER_CLIENT_ID.equals(clientId)) {
-            userDto = adminService.loadUserByUsername(username);
+            CommonResult<UserDto> result = userManagemenService.loadUserByUsername(username);
+            userDto = result.getData();
         }
         if (userDto == null) {
             throw new UsernameNotFoundException(MessageConstant.USERNAME_PASSWORD_ERROR);