Merge remote-tracking branch 'origin/dev_plugins' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpContextUtils.java

@@ -61,8 +61,9 @@ public class HttpContextUtils {
 		}
 
 		//请求语言
-		defaultLanguage = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE);
+		if(StringUtils.isNotBlank(request.getHeader(HttpHeaders.ACCEPT_LANGUAGE))){
-
+			defaultLanguage = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE);
+		}
 		return defaultLanguage;
 	}
 }

epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java

@@ -135,7 +135,9 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 						.header(AppClientConstant.USER_ID,baseTokenDto.getUserId())
 						;
 				if (StringUtils.equals(baseTokenDto.getApp(), "gov")) {//工作端
-					exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID, customerId);
+					if(StringUtils.isNotBlank(customerId)){
+						exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID, customerId);
+					}
 				} else if (StringUtils.equals(baseTokenDto.getApp(), "public")) {//公众号端
 					exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID, customerId);
 				}

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java

@@ -166,7 +166,9 @@ public class OperMenuServiceImpl extends BaseServiceImpl<OperMenuDao, OperMenuEn
         List<OperMenuEntity> menuList;
 
         Result<OperUserDTO> operUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId());
-
+        if(!operUserDTOResult.success()||null==operUserDTOResult.getData()){
+            return new ArrayList<>();
+        }
         //系统管理员，拥有最高权限
         if(operUserDTOResult.getData().getSuperAdmin() == SuperAdminEnum.YES.value()){
             menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage());