diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java index bad9865c86..23e04e4f9a 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java @@ -3,14 +3,14 @@ package com.epmet.service.impl; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; import com.epmet.common.token.constant.LoginConstant; -import com.epmet.common.token.dto.TokenDto; import com.epmet.common.token.dto.form.LoginByPassWordFormDTO; import com.epmet.common.token.dto.form.LoginByWxCodeFormDTO; import com.epmet.common.token.dto.result.UserTokenResultDTO; -import com.epmet.common.token.util.CpUserDetailRedis; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.password.PasswordUtils; +import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerUserDTO; import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; diff --git a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/annotation/LoginUser.java b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/annotation/LoginUser.java deleted file mode 100644 index 068ea84c2d..0000000000 --- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/annotation/LoginUser.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright 2018 人人开源 http://www.renren.io - *

- * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.epmet.common.token.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 登录用户信息 - * - * @author chenshun - * @email sunlightcs@gmail.com - * @date 2017-03-23 20:39 - */ -@Target(ElementType.PARAMETER) -@Retention(RetentionPolicy.RUNTIME) -public @interface LoginUser { - -} diff --git a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java index f4cf11b08f..efefc5e16a 100644 --- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java +++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java @@ -1,7 +1,8 @@ package com.epmet.common.token.util; -import com.epmet.common.token.dto.TokenDto; import com.epmet.common.token.property.TokenPropertise; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.CpUserDetailRedis; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -24,7 +25,7 @@ public class TokenUtil { @Autowired private CpUserDetailRedis redisUtils; - public TokenDto getTokenInfo(String app,String client,String userId) { + public TokenDto getTokenInfo(String app, String client, String userId) { TokenDto tokenDto = redisUtils.get(app,client,userId); return tokenDto; } diff --git a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/UserUtil.java b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/UserUtil.java index 1868a76674..03f2a2bb26 100644 --- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/UserUtil.java +++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/UserUtil.java @@ -1,7 +1,7 @@ package com.epmet.common.token.util; -import com.epmet.common.token.dto.TokenDto; import com.epmet.commons.tools.constant.Constant; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.WebUtil; /** diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/LoginUser.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/LoginUser.java index 1472d52d49..0a7f7b625a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/LoginUser.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/LoginUser.java @@ -16,10 +16,7 @@ package com.epmet.commons.tools.annotation; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * 登录用户信息 @@ -30,6 +27,7 @@ import java.lang.annotation.Target; */ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) +@Documented public @interface LoginUser { } diff --git a/epmet-gateway/src/main/java/com/epmet/exception/ModuleErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ModuleErrorCode.java similarity index 85% rename from epmet-gateway/src/main/java/com/epmet/exception/ModuleErrorCode.java rename to epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ModuleErrorCode.java index 36deccb213..c2b194e25f 100644 --- a/epmet-gateway/src/main/java/com/epmet/exception/ModuleErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ModuleErrorCode.java @@ -6,11 +6,9 @@ * 版权所有，侵权必究！ */ -package com.epmet.exception; +package com.epmet.commons.tools.exception; -import com.epmet.commons.tools.exception.ErrorCode; - /** * 模块错误编码，由9位数字组成，前6位为模块编码，后3位为业务编码 *

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java index b6b81f0611..d1af449333 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java @@ -8,6 +8,7 @@ package com.epmet.commons.tools.security.config; +import com.epmet.commons.tools.security.resolver.LoginUserHandlerMethodArgumentResolver; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; @@ -40,9 +41,11 @@ import java.util.TimeZone; public class WebMvcConfig implements WebMvcConfigurer { @Autowired private UserDetailHandlerMethodArgumentResolver userDetailHandlerMethodArgumentResolver; - + @Autowired + private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver; @Override public void addArgumentResolvers(List argumentResolvers) { + argumentResolvers.add(loginUserHandlerMethodArgumentResolver); argumentResolvers.add(userDetailHandlerMethodArgumentResolver); } @@ -75,4 +78,5 @@ public class WebMvcConfig implements WebMvcConfigurer { converter.setObjectMapper(mapper); return converter; } + } diff --git a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/dto/TokenDto.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/TokenDto.java similarity index 94% rename from epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/dto/TokenDto.java rename to epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/TokenDto.java index a248297b04..fb8a5dd7ec 100644 --- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/dto/TokenDto.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/TokenDto.java @@ -1,4 +1,4 @@ -package com.epmet.common.token.dto; +package com.epmet.commons.tools.security.dto; import lombok.Data; diff --git a/epmet-gateway/src/main/java/com/epmet/resolver/LoginUserHandlerMethodArgumentResolver.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java similarity index 74% rename from epmet-gateway/src/main/java/com/epmet/resolver/LoginUserHandlerMethodArgumentResolver.java rename to epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java index 10a271303b..68a6667285 100644 --- a/epmet-gateway/src/main/java/com/epmet/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -6,21 +6,21 @@ * 版权所有，侵权必究！ */ -package com.epmet.resolver; +package com.epmet.commons.tools.security.resolver; import com.alibaba.fastjson.JSON; -import com.epmet.common.token.dto.TokenDto; -import com.epmet.common.token.util.CpUserDetailRedis; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.Constant; +import com.epmet.commons.tools.exception.ModuleErrorCode; import com.epmet.commons.tools.exception.RenException; -import com.epmet.exception.ModuleErrorCode; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.CpUserDetailRedis; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.MethodParameter; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.method.support.HandlerMethodArgumentResolver; @@ -31,9 +31,10 @@ import org.springframework.web.method.support.ModelAndViewContainer; * * @author Mark sunlightcs@gmail.com */ -@Component +@Service public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver { private Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired private CpUserDetailRedis cpUserDetailRedis; @@ -43,7 +44,16 @@ public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgu @Override public boolean supportsParameter(MethodParameter parameter) { - logger.info("enter supportsParameter "); + if(parameter.getParameterType().isAssignableFrom(TokenDto.class)){ + logger.info("入参是TokenDto.class"); + }else{ + logger.info("parameter.getParameterType().isAssignableFrom(TokenDto.class)"); + } + if(parameter.hasParameterAnnotation(LoginUser.class)){ + logger.info("入参@LoginUser"); + }else { + logger.info("parameter.hasParameterAnnotation(LoginUser.class) is false"); + } return parameter.getParameterType().isAssignableFrom(TokenDto.class) && parameter.hasParameterAnnotation(LoginUser.class); } diff --git a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/CpUserDetailRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/CpUserDetailRedis.java similarity index 96% rename from epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/CpUserDetailRedis.java rename to epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/CpUserDetailRedis.java index aa1f981180..f49c9ddcb5 100644 --- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/CpUserDetailRedis.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/CpUserDetailRedis.java @@ -6,13 +6,13 @@ * 版权所有，侵权必究！ */ -package com.epmet.common.token.util; +package com.epmet.commons.tools.utils; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.map.MapUtil; -import com.epmet.common.token.dto.TokenDto; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.security.dto.TokenDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/epmet-gateway/src/main/java/com/epmet/config/WebConfig.java b/epmet-gateway/src/main/java/com/epmet/config/WebConfig.java deleted file mode 100644 index f083793b7c..0000000000 --- a/epmet-gateway/src/main/java/com/epmet/config/WebConfig.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.epmet.config; - -import com.epmet.resolver.LoginUserHandlerMethodArgumentResolver; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import java.util.List; - -/** - * MVC配置 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Configuration -public class WebConfig implements WebMvcConfigurer { - @Autowired - private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver; - - @Override - public void addArgumentResolvers(List argumentResolvers) { - argumentResolvers.add(loginUserHandlerMethodArgumentResolver); - } -} 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 bd04c0d8be..ac7a06a83d 100644 --- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java +++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java @@ -2,12 +2,11 @@ package com.epmet.filter; import com.alibaba.fastjson.JSON; -import com.epmet.common.token.dto.TokenDto; -import com.epmet.common.token.util.CpUserDetailRedis; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.exception.RenException; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.jwt.JwtTokenUtils; import io.jsonwebtoken.Claims; import org.apache.commons.lang3.StringUtils; @@ -75,8 +74,7 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory list = customerService.list(params); ExcelUtils.exportExcelToTarget(response, null, list, CustomerExcel.class); } - private Logger logger = LoggerFactory.getLogger(getClass()); + /** * @param * @return com.epmet.commons.tools.utils.Result @@ -106,7 +107,7 @@ public class CustomerController { **/ @GetMapping("getvalidcustomerlist") public Result> getValidCustomerList(@LoginUser TokenDto tokenDTO) { - logger.info("不成功便成仁===================================="+ JSON.toJSONString(tokenDTO)); + logger.info("getvalidcustomerlist:"+ JSON.toJSONString(tokenDTO)); return customerService.getValidCustomerList(); } } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml index f6fb34e1a9..4101603b76 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml @@ -51,6 +51,12 @@ spring: # - data-id: common.yaml # group: ${spring.cloud.nacos.config.group} # refresh: true + servlet: + multipart: + enabled: true + file-size-threshold: 0 + max-file-size: 10MB + max-request-size: 10MB management: endpoints: web: