From 7f43b897106123a07eab10d9fec38d7c7bd47eed Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 17 Jul 2020 09:46:39 +0800
Subject: [PATCH] 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 | 13 ++++++-------
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml | 3 ++-
kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpInterceptorConfig.java | 1 +
kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpTenantInterceptorConfig.java | 1 +
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java | 20 +++++++++++++++++++-
5 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index aed44e1..b87c8f8 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/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));
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
index abd77b4..944f1a9 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
+++ b/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
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
index e358340..751d23d 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
+++ b/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";
+
}
diff --git a/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpInterceptorConfig.java b/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpInterceptorConfig.java
index 53e5058..89512b1 100644
--- a/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpInterceptorConfig.java
+++ b/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);
}
diff --git a/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpTenantInterceptorConfig.java b/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpTenantInterceptorConfig.java
index 36807bf..1eb6317 100644
--- a/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpTenantInterceptorConfig.java
+++ b/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);
}
--
Gitblit v1.8.0