Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp

# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

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

@@ -77,10 +77,13 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 					case AuthTypeConstant.AUTH_TYPE_ALL:
 						externalAuthProcessor.auth(exchange, chain);
 						internalAuthProcessor.auth(exchange, chain);
+						break;
 					case AuthTypeConstant.AUTH_TYPE_EXTERNAL:
 						externalAuthProcessor.auth(exchange, chain);
+						break;
 					case AuthTypeConstant.AUTH_TYPE_INTERNAL:
 						internalAuthProcessor.auth(exchange, chain);
+						break;
 				}
 			} catch (RenException e) {
 				return response(exchange, new Result<>().error(e.getCode(), e.getMessage()));