Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

zhaoxiaohao

2020-07-17 7f43b897106123a07eab10d9fec38d7c7bd47eed

Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java

@@ -75,7 +75,10 @@
     */
    @ApiOperation(value = "根据access_token当前登录用户")
    @GetMapping("/users/current")
    public ResultBody<LoginAppUser> getLoginAppUser(@LoginUser(isFull = true) SysUser user) {
    public ResultBody<LoginAppUser> getLoginAppUser(@LoginUser(isFull = true) SysUser user,HttpServletRequest request) {
        if(user!=null){
            loginLogs(user, request);
        }
        return ResultBody.ok().data(appUserService.getLoginAppUser(user));
    }

@@ -94,12 +97,8 @@
     */
    @GetMapping(value = "/users-anon/login", params = "username")
    @ApiOperation(value = "根据用户名查询用户")
    public LoginAppUser findByUsername(String username, HttpServletRequest request) {

    public LoginAppUser findByUsername(String username) {
        LoginAppUser loginAppUser = appUserService.findByUsername(username);
        if (loginAppUser != null) {
            loginLogs(loginAppUser, request);
        }
        return loginAppUser;
    }

@@ -109,7 +108,7 @@
     * @param sysUser
     * @return
     */
    private int loginLogs(LoginAppUser sysUser, HttpServletRequest request) {
    private int loginLogs(SysUser sysUser, HttpServletRequest request) {
        SysUserLogs sysUserLogs = new SysUserLogs();
        sysUserLogs.setClientId(ClientContextHolder.getClient());
        sysUserLogs.setLoginAgentSystem(request.getHeader(CommonConstant.USER_AGENT_SYSTEM));

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml

@@ -53,8 +53,9 @@
        second: 1800
  #多租户配置
  tenant:
    enable: false
    enable: true
    #多租户隔离字段

    tenantid: tenant_id
    ignoreTables:
      - sys_user

 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java

@@ -45,8 +45,26 @@
     * 文件服务名
     */
    String FILE_CENTER_SERVER="filecenter-server";


    /**
     * smartbox服务
     * SmartBox服务名
     */
    String SMARTBOX_SERVER="smartbox-server";

    /**
     * 报告中心服务名
     */
    String REPORT_SERVER="report-server";

    /**
     * BI分析中心服务名
     */
    String BICENTER_SERVER="bicenter-server";

    /**
     * 骨龄评价中心服务名
     */
    String EVALUATION_SERVER="evaluation-server";

}

 kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpInterceptorConfig.java

@@ -42,6 +42,7 @@
        requestHeaders.add(CommonConstant.KIDGROW_VERSION);
        requestHeaders.add(CommonConstant.USER_AGENT_BROWSER);
        requestHeaders.add(CommonConstant.USER_AGENT_IP);
        requestHeaders.add(CommonConstant.USER_AGENT_SYSTEM_SCREEN);
        requestHeaders.add(CommonConstant.USER_AGENT_SYSTEM);
        requestHeaders.add(SecurityConstants.USER_HOSPITAL_ID_HEADER);
    }

 kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpTenantInterceptorConfig.java

@@ -42,6 +42,7 @@
        requestHeaders.add(CommonConstant.KIDGROW_VERSION);
        requestHeaders.add(CommonConstant.USER_AGENT_BROWSER);
        requestHeaders.add(CommonConstant.USER_AGENT_IP);
        requestHeaders.add(CommonConstant.USER_AGENT_SYSTEM_SCREEN);
        requestHeaders.add(CommonConstant.USER_AGENT_SYSTEM);
        requestHeaders.add(SecurityConstants.USER_HOSPITAL_ID_HEADER);
    }