From d961d7b85583192c22ee76546e341ac053fa616b Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 9 Apr 2020 19:09:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9,tokenDto=E6=B3=A8=E5=85=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/constant/AppClientConstant.java | 15 +++++++++++ ...oginUserHandlerMethodArgumentResolver.java | 15 ++++++++++- .../filter/CpAuthGatewayFilterFactory.java | 9 ++++++- .../comment/result/ResiCommentResultDTO.java | 3 +++ .../result/ResiTopicDetailResultDTO.java | 6 ++++- .../topic/result/ResiTopicInfoResultDTO.java | 4 ++- .../resi-group/resi-group-server/pom.xml | 2 +- .../service/impl/ResiTopicServiceImpl.java | 8 +++--- .../dto/result/UserResiInfoResultDTO.java | 1 - .../main/resources/mapper/UserResiInfoDao.xml | 26 ++++++++++++------- 10 files changed, 71 insertions(+), 18 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java index 831d52bd91..e8167f2f21 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java @@ -25,4 +25,19 @@ public interface AppClientConstant { * 微信小程序:wxmp */ String CLIENT_WXMP = "wxmp"; + + /** + * 客户来源App + * */ + String APP = "app"; + + /** + * 用户Id + * */ + String USER_ID = "userId"; + + /** + * 客户端 + * */ + String CLIENT = "client"; } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java index 4285f17cb8..7af851b8bf 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -19,6 +19,9 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.PropertySource; import org.springframework.core.MethodParameter; import org.springframework.stereotype.Service; import org.springframework.web.bind.support.WebDataBinderFactory; @@ -32,11 +35,15 @@ import org.springframework.web.method.support.ModelAndViewContainer; * @author Mark sunlightcs@gmail.com */ @Service +@PropertySource("classpath:bootstrap.yml") +@ConfigurationProperties(prefix = "redis") public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver { private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private CpUserDetailRedis cpUserDetailRedis; + @Value("${database}") + private String redisDb; public LoginUserHandlerMethodArgumentResolver(){ @@ -69,8 +76,14 @@ public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgu String app=keyArray[0]; String client=keyArray[1]; String userId=keyArray[2]; - TokenDto tokenDto = cpUserDetailRedis.get(app,client,userId); + + //TokenDto tokenDto = cpUserDetailRedis.get(app,client,userId); + TokenDto tokenDto = new TokenDto(); + tokenDto.setUserId(request.getHeader("userId")); + tokenDto.setApp(request.getHeader("app")); + tokenDto.setClient(request.getHeader("client")); logger.info("resolveArgument TokenDto:"+ JSON.toJSONString(tokenDto)); + logger.info("CURRENT-REDIS-DATABASE---------！！！！！！:"+redisDb); return tokenDto; } } diff --git a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java index 7e85cfeb03..e398b5978a 100644 --- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java +++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java @@ -3,6 +3,7 @@ package com.epmet.filter; import com.alibaba.fastjson.JSON; import com.epmet.common.token.enums.ErrorCode; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; @@ -30,6 +31,7 @@ import reactor.core.publisher.Mono; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; +import java.util.function.Consumer; /** * app接口权限过滤器 @@ -94,7 +96,12 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactoryepmet elink@833066 - 0 + 1 10.10.10.77 6379 123456 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 5cc5c61612..9822865959 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -463,10 +463,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl userInfo = epmetUserFeignClient.getUserResiInfoDTO(userParam); if(userInfo.success()){ - resultDTO.setReleaseUserName(userInfo.getData().getSurname() + userInfo.getData().getName()); + if(null != userInfo.getData()){ + resultDTO.setReleaseUserName(userInfo.getData().getShowName()); + resultDTO.setReleaseUserHeadPhoto(userInfo.getData().getHeadPhoto()); + } + - //TODO 调用EpmetUserFeign的查询用户微信信息的方法拉取头像信息 - resultDTO.setReleaseUserHeadPhoto(""); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java index abb0fbe90a..6bdc1f6d2f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java @@ -61,5 +61,4 @@ public class UserResiInfoResultDTO implements Serializable { * 用户头像 */ private String headPhoto; - } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index acc2efacfa..3c4d0b7278 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -50,22 +50,25 @@ uri.STREET, uri.DISTRICT, uri.RESI_VISIT_ID, - CONCAT_WS('-',uri.STREET,uri.SURNAME,uri.`NAME`) as show_name, - ( - select uw.HEAD_IMG_URL from user_wechat uw - where uw.DEL_FLAG='0' - and uw.USER_ID=#{userId} - order by uw.CREATED_TIME - limit 1 - )as head_photo + CONCAT( + uri.STREET, + '-', + uri.SURNAME, + ( CASE WHEN uw.SEX = '1' THEN '先生' WHEN uw.SEX = '2' THEN '女士' ELSE '先生/女士' END ) + ) AS show_name, + uw.HEAD_IMG_URL AS head_photo + FROM user_customer uc LEFT JOIN user_resi_info uri ON ( uc.USER_ID = uri.USER_ID ) + LEFT JOIN user_wechat uw ON (uc.USER_ID = uw.USER_ID) WHERE uc.DEL_FLAG = '0' AND uri.DEL_FLAG = '0' AND uc.CUSTOMER_ID = #{customerId} AND uc.USER_ID = #{userId} + AND uw.DEL_FLAG = '0' + AND uw.USER_ID = #{userId}