diff options
Diffstat (limited to 'msb-core')
136 files changed, 397 insertions, 378 deletions
diff --git a/msb-core/apiroute/apiroute-service/pom.xml b/msb-core/apiroute/apiroute-service/pom.xml index 8eb17fb..a34b5f0 100644 --- a/msb-core/apiroute/apiroute-service/pom.xml +++ b/msb-core/apiroute/apiroute-service/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/ApiRouteApp.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/ApiRouteApp.java index 94b29ac..e5a6394 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/ApiRouteApp.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/ApiRouteApp.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/ApiRouteAppConfig.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/ApiRouteAppConfig.java index 4029c04..8338ceb 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/ApiRouteAppConfig.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/ApiRouteAppConfig.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/ConsulClientApp.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/ConsulClientApp.java index 4986e54..4d83a6d 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/ConsulClientApp.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/ConsulClientApp.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/ApiRouteInfo.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/ApiRouteInfo.java index ef22994..fcde8d7 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/ApiRouteInfo.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/ApiRouteInfo.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ public class ApiRouteInfo implements Serializable{ private String visualRange = "1"; @ApiModelProperty(value = "[LB Policy]non_ip_hash:0,ip_hash:1", allowableValues = "0,1", example = "0") - private String useOwnUpstream="0"; //负载均衡策略 + private String useOwnUpstream="0"; @ApiModelProperty(required = true) private RouteServer servers[]; diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/ConsulInfo.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/ConsulInfo.java index 68a22cf..4550b61 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/ConsulInfo.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/ConsulInfo.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/CustomDateSerializer.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/CustomDateSerializer.java index 89f51af..e7d46d4 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/CustomDateSerializer.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/CustomDateSerializer.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/CustomRouteInfo.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/CustomRouteInfo.java index 208f3ff..0d84857 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/CustomRouteInfo.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/CustomRouteInfo.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ public class CustomRouteInfo implements Serializable{ private String visualRange = "1"; @ApiModelProperty(value = "[LB Policy]non_ip_hash:0,ip_hash:1", allowableValues = "0,1", example = "0") - private String useOwnUpstream="0"; //负载均衡策略 + private String useOwnUpstream="0"; @ApiModelProperty(required = true) private RouteServer servers[]; diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/DiscoverInfo.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/DiscoverInfo.java index dc6ec40..5e71b29 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/DiscoverInfo.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/DiscoverInfo.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/IuiRouteInfo.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/IuiRouteInfo.java index 9e40783..64676d3 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/IuiRouteInfo.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/IuiRouteInfo.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ public class IuiRouteInfo implements Serializable{ private String visualRange = "1"; @ApiModelProperty(value = "[LB Policy]non_ip_hash:0,ip_hash:1", allowableValues = "0,1", example = "0") - private String useOwnUpstream="0"; //负载均衡策略 + private String useOwnUpstream="0"; @ApiModelProperty(required = true) private RouteServer servers[]; diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/MetricsInfo.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/MetricsInfo.java index 339bb31..981dfe6 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/MetricsInfo.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/MetricsInfo.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/MicroServiceFullInfo.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/MicroServiceFullInfo.java index 14cea47..3817395 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/MicroServiceFullInfo.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/MicroServiceFullInfo.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/MicroServiceInfo.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/MicroServiceInfo.java index 02609f9..725df2e 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/MicroServiceInfo.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/MicroServiceInfo.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/Node.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/Node.java index 0879c61..6273ea1 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/Node.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/Node.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/NodeInfo.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/NodeInfo.java index e3a30e7..c1a5d68 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/NodeInfo.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/NodeInfo.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/RouteServer.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/RouteServer.java index 675bc69..0a38c7f 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/RouteServer.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/RouteServer.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/Service.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/Service.java index 8969e1d..6e19a71 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/Service.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/Service.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,24 +25,24 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Service<T> implements Serializable { private static final long serialVersionUID = 1L; - // 服务名 + @ApiModelProperty(required = true) private String serviceName; - // 版本号 + @ApiModelProperty(example = "v1") private String version=""; - // 服务url + @ApiModelProperty(value = "Target Service URL,start with /",example = "/api/serviceName/v1", required = true) private String url=""; - // 服务对应协议，比如REST、UI、MQ、FTP、SNMP、TCP、UDP + @ApiModelProperty(value = "Service Protocol", allowableValues = "REST,UI, MQ, FTP,SNMP,TCP,UDP", example = "REST",required = true) private String protocol = ""; - //服务的可见范围 系统间:0 系统内:1 + @ApiModelProperty(value = "[visual Range]interSystem:0,inSystem:1", allowableValues = "0,1", example = "1") private String visualRange = "1"; - //负载均衡策略类型 + @ApiModelProperty(value = "lb policy", allowableValues = "round-robin,hash,least_conn", example = "hash") private String lb_policy=""; diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/ServiceAccessInfo.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/ServiceAccessInfo.java index bb375ac..58f907a 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/ServiceAccessInfo.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/ServiceAccessInfo.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/exception/ExtendedInternalServerErrorException.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/exception/ExtendedInternalServerErrorException.java index a377c4c..f30cde5 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/exception/ExtendedInternalServerErrorException.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/exception/ExtendedInternalServerErrorException.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/exception/ExtendedNotFoundException.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/exception/ExtendedNotFoundException.java index e3e74ea..92956d1 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/exception/ExtendedNotFoundException.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/exception/ExtendedNotFoundException.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/exception/ExtendedNotSupportedException.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/exception/ExtendedNotSupportedException.java index e0c7805..3d8c90e 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/exception/ExtendedNotSupportedException.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/api/exception/ExtendedNotSupportedException.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/health/ApiRouteHealthCheck.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/health/ApiRouteHealthCheck.java index cd7ecda..e4f0135 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/health/ApiRouteHealthCheck.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/health/ApiRouteHealthCheck.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/ApiRouteResource.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/ApiRouteResource.java index cc1e4de..a71b978 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/ApiRouteResource.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/ApiRouteResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/CustomRouteResource.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/CustomRouteResource.java index 48545fe..01a4291 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/CustomRouteResource.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/CustomRouteResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/IuiRouteResource.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/IuiRouteResource.java index 7635579..057d15d 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/IuiRouteResource.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/IuiRouteResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/MetricsResource.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/MetricsResource.java index 7377c86..def36e2 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/MetricsResource.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/MetricsResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/MicroServiceResource.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/MicroServiceResource.java index 45328f0..dd560ff 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/MicroServiceResource.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/MicroServiceResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/ServiceAccessResource.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/ServiceAccessResource.java index 814f979..65da72b 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/ServiceAccessResource.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/ServiceAccessResource.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/ApiRouteServiceWrapper.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/ApiRouteServiceWrapper.java index 9680a1a..6bd104b 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/ApiRouteServiceWrapper.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/ApiRouteServiceWrapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,14 +39,6 @@ import org.slf4j.LoggerFactory; import redis.clients.jedis.Jedis; - -/** - * @ClassName: ApiRouteServiceWrapper - * @Description: TODO(ApiRoute服务类) - * @author tanghua10186366 - * @date 2015年9月25日 上午9:44:04 - * - */ public class ApiRouteServiceWrapper { private static final Logger LOGGER = LoggerFactory.getLogger(ApiRouteServiceWrapper.class); @@ -60,12 +52,7 @@ public class ApiRouteServiceWrapper { return instance; } - /** - * @Title: getAllApiRouteInstances - * @Description: TODO(获取全部服务列表) - * @param: @return - * @return: ApiRouteInfoBean[] - */ + public ApiRouteInfo[] getAllApiRouteInstances() { @@ -78,7 +65,7 @@ public class ApiRouteServiceWrapper { "fetch from jedis pool failed,null object!"); } - // 获取全部服务列表 + String routekey = RouteUtil .getPrefixedKey("", RouteUtil.APIROUTE, "*", RouteUtil.ROUTE_PATH_INFO); @@ -126,14 +113,7 @@ public class ApiRouteServiceWrapper { return false; } - /** - * @Title: getApiRouteInstance - * @Description: TODO(通过服务名+版本号获取单个服务对象信息) - * @param: @param serviceName - * @param: @param version - * @param: @return - * @return: ApiRouteInfo - */ + public ApiRouteInfo getApiRouteInstance(String serviceName, String version) { if (StringUtils.isBlank(serviceName)) { @@ -191,7 +171,7 @@ public class ApiRouteServiceWrapper { ApiRouteInfo apiRouteInfo = null; - // 获取info信息 + String routekey = RouteUtil.getPrefixedKey("", RouteUtil.APIROUTE, serviceName, version, RouteUtil.ROUTE_PATH_INFO); @@ -210,7 +190,7 @@ public class ApiRouteServiceWrapper { apiRouteInfo.setUseOwnUpstream(infomap.get("useOwnUpstream")); - // 获取负载均衡信息 + String serviceLBkey = RouteUtil.getPrefixedKey("", RouteUtil.APIROUTE, serviceName, version, RouteUtil.ROUTE_PATH_LOADBALANCE); @@ -230,34 +210,14 @@ public class ApiRouteServiceWrapper { apiRouteInfo.setServers(apiRouteServerList); - // 获取生命周期信息 - -// ApiRouteLifeCycle lifeCycle = new ApiRouteLifeCycle(); -// String serviceLifekey = -// RouteUtil.getPrefixedKey("", RouteUtil.APIROUTE, serviceName, version, -// RouteUtil.APIROUTE_PATH_LIFE); -// Map<String, String> serviceLifeMap = jedis.hgetAll(serviceLifekey); -// -// lifeCycle.setInstallPath(serviceLifeMap.get("path")); -// lifeCycle.setStartScript(serviceLifeMap.get("start")); -// lifeCycle.setStopScript(serviceLifeMap.get("stop")); -// -// apiRouteInfo.setLifeCycle(lifeCycle); + } return apiRouteInfo; } - /** - * @Title: updateApiRouteInstance - * @Description: TODO(更新单个服务信息) - * @param: @param serviceName - * @param: @param version - * @param: @param apiRouteInfo - * @param: @return - * @return: ApiRouteInfo - */ + public synchronized ApiRouteInfo updateApiRouteInstance(String serviceName, String version, ApiRouteInfo apiRouteInfo, String serverPort) { @@ -284,12 +244,12 @@ public class ApiRouteServiceWrapper { if (serviceName.equals(apiRouteInfo.getServiceName()) && version.equals(apiRouteInfo.getVersion())) { - // 删除已存在负载均衡服务器信息 + deleteApiRoute(serviceName, version, RouteUtil.ROUTE_PATH_LOADBALANCE + "*", serverPort); } else { - // 如果已修改服务名或者版本号，先删除此服务全部已有信息 + deleteApiRoute(serviceName, version, "*", serverPort); } @@ -310,15 +270,7 @@ public class ApiRouteServiceWrapper { } - /** - * @Title updateApiRouteStatus - * @Description TODO(更新单个服务状态) - * @param serviceName - * @param version - * @param status - * @return - * @return RouteResult - */ + public synchronized ApiRouteInfo updateApiRouteStatus(String serviceName, String version, String status) { @@ -346,7 +298,7 @@ public class ApiRouteServiceWrapper { ApiRouteInfo new_apiRouteInfo = getApiRouteInstance(serviceName, version); - // 准备info信息 + String serviceInfokey = RouteUtil.getPrefixedKey("", RouteUtil.APIROUTE, serviceName, version, RouteUtil.ROUTE_PATH_INFO); @@ -360,7 +312,7 @@ public class ApiRouteServiceWrapper { if (jedis == null) { throw new Exception("fetch from jedis pool failed,null object!"); } - // 保存info信息 + jedis.hmset(serviceInfokey, serviceInfoMap); new_apiRouteInfo.setStatus(status); @@ -378,13 +330,7 @@ public class ApiRouteServiceWrapper { } - /** - * @Title: saveApiRouteInstance - * @Description: TODO(存储单个服务信息) - * @param: @param apiRouteInfo - * @param: @return - * @return: ApiRouteInfo - */ + public synchronized ApiRouteInfo saveApiRouteInstance(ApiRouteInfo apiRouteInfo, String serverPort) { @@ -435,7 +381,7 @@ public class ApiRouteServiceWrapper { + RouteUtil.show(RouteUtil.useOwnUpstreamRangeMatches) + ")"); } - // 检查服务实例格式 + RouteServer[] serverList = apiRouteInfo.getServers(); for (int i = 0; i < serverList.length; i++) { RouteServer server = serverList[i]; @@ -450,7 +396,7 @@ public class ApiRouteServiceWrapper { } } - // 准备info信息 + String serviceInfokey = RouteUtil.getPrefixedKey(serverPort, RouteUtil.APIROUTE, apiRouteInfo.getServiceName().trim(), apiRouteInfo.getVersion().trim(), @@ -466,7 +412,7 @@ public class ApiRouteServiceWrapper { serviceInfoMap.put("visualRange", apiRouteInfo.getVisualRange()); serviceInfoMap.put("useOwnUpstream", apiRouteInfo.getUseOwnUpstream()); - // 准备负载均衡信息 + String serviceLBkey = RouteUtil.getPrefixedKey(serverPort, RouteUtil.APIROUTE, apiRouteInfo.getServiceName(), apiRouteInfo.getVersion(), @@ -480,10 +426,9 @@ public class ApiRouteServiceWrapper { throw new ExtendedInternalServerErrorException( "fetch from jedis pool failed,null object!"); } - // 保存info信息 jedis.hmset(serviceInfokey, serviceInfoMap); - // 保存负载均衡信息 + for (int i = 0; i < serverList.length; i++) { Map<String, String> servermap = new HashMap<String, String>(); RouteServer server = serverList[i]; @@ -494,22 +439,7 @@ public class ApiRouteServiceWrapper { jedis.hmset(serviceLBkey + ":server" + (i + 1), servermap); } - // 保存生命周期信息 - -// ApiRouteLifeCycle lifeCycle = apiRouteInfo.getLifeCycle(); -// if (lifeCycle != null) { -// String serviceLifekey = -// RouteUtil.getPrefixedKey(serverPort, RouteUtil.APIROUTE, -// apiRouteInfo.getServiceName(), apiRouteInfo.getVersion(), -// RouteUtil.APIROUTE_PATH_LIFE); -// Map<String, String> serviceLifeMap = new HashMap<String, String>(); -// serviceLifeMap.put("path", lifeCycle.getInstallPath()); -// serviceLifeMap.put("start", lifeCycle.getStartScript()); -// serviceLifeMap.put("stop", lifeCycle.getStopScript()); -// jedis.hmset(serviceLifekey, serviceLifeMap); -// } - - + } catch (Exception e) { LOGGER.error("call redis throw exception", e); @@ -525,16 +455,7 @@ public class ApiRouteServiceWrapper { - /** - * @Title: deleteApiRoute - * @Description: TODO(删除单个服务信息) - * @param: @param type - * @param: @param serviceName - * @param: @param version - * @param: @param delKey - * @param: @return - * @return: void - */ + public synchronized void deleteApiRoute(String serviceName, String version, String delKey, String serverPort) { @@ -562,7 +483,7 @@ public class ApiRouteServiceWrapper { "fetch from jedis pool failed,null object!"); } - // 获取info信息 + String routekey = RouteUtil.getPrefixedKey(serverPort, RouteUtil.APIROUTE, serviceName, version, delKey); @@ -575,7 +496,7 @@ public class ApiRouteServiceWrapper { String[] paths = new String[infoSet.size()]; - // Set-->数组 + infoSet.toArray(paths); jedis.del(paths); @@ -594,12 +515,7 @@ public class ApiRouteServiceWrapper { } - /** - * @Title: getAllApiDocs - * @Description: TODO(获取本地ext\initSwaggerJson目录的全部json文件目录) - * @param: @return - * @return: String[] - */ + public String[] getAllApiDocs() { URL apiDocsPath = ApiRouteServiceWrapper.class.getResource("/ext/initSwaggerJson"); if (apiDocsPath != null) { @@ -625,9 +541,6 @@ public class ApiRouteServiceWrapper { return null; } - /** - * 读取某个文件夹下的所有文件 - */ public String[] readfile(String filepath) throws FileNotFoundException, IOException { File file = new File(filepath); if (file.isDirectory()) { diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/CustomRouteServiceWrapper.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/CustomRouteServiceWrapper.java index f5a642b..d0d4250 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/CustomRouteServiceWrapper.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/CustomRouteServiceWrapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,12 +47,7 @@ public class CustomRouteServiceWrapper { } - /** - * @Title: getAllCustomRouteService - * @Description: TODO(获取全部内容服务列表) - * @param: @return - * @return: CustomRouteInfo[] - */ + public CustomRouteInfo[] getAllCustomRouteInstances() { @@ -65,7 +60,6 @@ public class CustomRouteServiceWrapper { "fetch from jedis pool failed,null object!"); } - // 获取全部服务列表 String routekey = RouteUtil.getPrefixedKey("", RouteUtil.CUSTOMROUTE, "*", RouteUtil.ROUTE_PATH_INFO); @@ -95,13 +89,6 @@ public class CustomRouteServiceWrapper { - /** - * @Title: getCustomRouteInstance - * @Description: TODO(通过服务名获取单个内容服务对象信息) - * @param: @param serviceName - * @param: @return - * @return: CustomRouteInfo - */ public CustomRouteInfo getCustomRouteInstance(String serviceName) { if (StringUtils.isBlank(serviceName)) { @@ -146,7 +133,6 @@ public class CustomRouteServiceWrapper { CustomRouteInfo customRouteInfo = null; - // 获取info信息 String routekey = RouteUtil.getPrefixedKey("", RouteUtil.CUSTOMROUTE, serviceName, RouteUtil.ROUTE_PATH_INFO); @@ -161,7 +147,6 @@ public class CustomRouteServiceWrapper { customRouteInfo.setUseOwnUpstream(infomap.get("useOwnUpstream")); - // 获取负载均衡信息 String serviceLBkey = RouteUtil.getPrefixedKey("", RouteUtil.CUSTOMROUTE, serviceName, RouteUtil.ROUTE_PATH_LOADBALANCE); @@ -186,14 +171,6 @@ public class CustomRouteServiceWrapper { return customRouteInfo; } - /** - * @Title: updateCustomRouteInstance - * @Description: TODO(更新单个服务信息) - * @param: @param serviceName - * @param: @param CustomRouteInfo - * @param: @return - * @return: CustomRouteInfo - */ public synchronized CustomRouteInfo updateCustomRouteInstance(String serviceName, CustomRouteInfo customRouteInfo, String serverPort) { if (StringUtils.isBlank(serviceName)) { @@ -203,10 +180,8 @@ public class CustomRouteServiceWrapper { try { if (serviceName.equals(customRouteInfo.getServiceName())) { - // 删除已存在负载均衡服务器信息 deleteCustomRoute(serviceName, RouteUtil.ROUTE_PATH_LOADBALANCE + "*", serverPort); } else { - // 如果已修改服务名，先删除此服务全部已有信息 deleteCustomRoute(serviceName, "*", serverPort); } @@ -228,14 +203,6 @@ public class CustomRouteServiceWrapper { } - /** - * @Title updateCustomRouteStatus - * @Description TODO(更新单个服务状态) - * @param serviceName - * @param status - * @return - * @return RouteResult - */ public synchronized CustomRouteInfo updateCustomRouteStatus(String serviceName, String status) { if (StringUtils.isBlank(serviceName)) { @@ -252,7 +219,6 @@ public class CustomRouteServiceWrapper { - // 准备info信息 String serviceInfokey = RouteUtil.getPrefixedKey("", RouteUtil.CUSTOMROUTE, serviceName, RouteUtil.ROUTE_PATH_INFO); @@ -267,7 +233,6 @@ public class CustomRouteServiceWrapper { throw new ExtendedInternalServerErrorException( "fetch from jedis pool failed,null object!"); } - // 保存info信息 jedis.hmset(serviceInfokey, serviceInfoMap); new_customRouteInfo.setStatus(status); @@ -284,13 +249,6 @@ public class CustomRouteServiceWrapper { return new_customRouteInfo; } - /** - * @Title: saveCustomRouteInstance - * @Description: TODO(存储单个服务信息) - * @param: @param CustomRouteInfo - * @param: @return - * @return: CustomRouteInfo - */ public synchronized CustomRouteInfo saveCustomRouteInstance(CustomRouteInfo customRouteInfo, String serverPort) { @@ -339,7 +297,6 @@ public class CustomRouteServiceWrapper { + RouteUtil.show(RouteUtil.useOwnUpstreamRangeMatches) + ")"); } - // 检查服务实例格式 RouteServer[] serverList = customRouteInfo.getServers(); for (int i = 0; i < serverList.length; i++) { RouteServer server = serverList[i]; @@ -355,7 +312,6 @@ public class CustomRouteServiceWrapper { } - // 准备info信息 String serviceInfokey = RouteUtil.getPrefixedKey(serverPort, RouteUtil.CUSTOMROUTE, customRouteInfo.getServiceName().trim(), RouteUtil.ROUTE_PATH_INFO); @@ -370,7 +326,6 @@ public class CustomRouteServiceWrapper { - // 准备负载均衡信息 String serviceLBkey = RouteUtil.getPrefixedKey(serverPort, RouteUtil.CUSTOMROUTE, customRouteInfo.getServiceName(), RouteUtil.ROUTE_PATH_LOADBALANCE); @@ -383,10 +338,8 @@ public class CustomRouteServiceWrapper { throw new ExtendedInternalServerErrorException( "fetch from jedis pool failed,null object!"); } - // 保存info信息 jedis.hmset(serviceInfokey, serviceInfoMap); - // 保存负载均衡信息 for (int i = 0; i < serverList.length; i++) { Map<String, String> servermap = new HashMap<String, String>(); @@ -414,15 +367,6 @@ public class CustomRouteServiceWrapper { - /** - * @Title: deleteCustomRoute - * @Description: TODO(删除单个服务信息) - * @param: @param type - * @param: @param serviceName - * @param: @param delKey - * @param: @return - * @return: void - */ public synchronized void deleteCustomRoute(String serviceName, String delKey, String serverPort) { if (StringUtils.isBlank(serviceName)) { @@ -438,7 +382,6 @@ public class CustomRouteServiceWrapper { "fetch from jedis pool failed,null object!"); } - // 获取info信息 String routekey = RouteUtil .getPrefixedKey(serverPort, RouteUtil.CUSTOMROUTE, serviceName, delKey); @@ -452,7 +395,6 @@ public class CustomRouteServiceWrapper { String[] paths = new String[infoSet.size()]; - // Set-->数组 infoSet.toArray(paths); jedis.del(paths); diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/IuiRouteServiceWrapper.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/IuiRouteServiceWrapper.java index c3419a0..f70a126 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/IuiRouteServiceWrapper.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/IuiRouteServiceWrapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,13 +46,6 @@ public class IuiRouteServiceWrapper { return instance; } - - /** - * @Title: getAllIuiRouteService - * @Description: TODO(获取全部内容服务列表) - * @param: @return - * @return: IuiRouteInfo[] - */ public IuiRouteInfo[] getAllIuiRouteInstances() { @@ -65,7 +58,6 @@ public class IuiRouteServiceWrapper { "fetch from jedis pool failed,null object!"); } - // 获取全部服务列表 String routekey = RouteUtil .getPrefixedKey("", RouteUtil.IUIROUTE, "*", RouteUtil.ROUTE_PATH_INFO); @@ -93,14 +85,6 @@ public class IuiRouteServiceWrapper { } - - /** - * @Title: getIuiRouteInstance - * @Description: TODO(通过服务名获取单个内容服务对象信息) - * @param: @param serviceName - * @param: @return - * @return: IuiRouteInfo - */ public IuiRouteInfo getIuiRouteInstance(String serviceName) { if (StringUtils.isBlank(serviceName)) { @@ -145,7 +129,6 @@ public class IuiRouteServiceWrapper { IuiRouteInfo iuiRouteInfo = null; - // 获取info信息 String routekey = RouteUtil.getPrefixedKey("", RouteUtil.IUIROUTE, serviceName, RouteUtil.ROUTE_PATH_INFO); @@ -160,7 +143,6 @@ public class IuiRouteServiceWrapper { iuiRouteInfo.setUseOwnUpstream(infomap.get("useOwnUpstream")); - // 获取负载均衡信息 String serviceLBkey = RouteUtil.getPrefixedKey("", RouteUtil.IUIROUTE, serviceName, RouteUtil.ROUTE_PATH_LOADBALANCE); @@ -185,14 +167,6 @@ public class IuiRouteServiceWrapper { return iuiRouteInfo; } - /** - * @Title: updateIuiRouteInstance - * @Description: TODO(更新单个服务信息) - * @param: @param serviceName - * @param: @param IuiRouteInfo - * @param: @return - * @return: IuiRouteInfo - */ public synchronized IuiRouteInfo updateIuiRouteInstance(String serviceName, IuiRouteInfo iuiRouteInfo) { @@ -202,11 +176,9 @@ public class IuiRouteServiceWrapper { try { if (serviceName.equals(iuiRouteInfo.getServiceName())) { - // 删除已存在负载均衡服务器信息 deleteIuiRoute(serviceName, RouteUtil.ROUTE_PATH_LOADBALANCE + "*"); } else { - // 如果已修改服务名，先删除此服务全部已有信息 deleteIuiRoute(serviceName, "*"); } saveIuiRouteInstance(iuiRouteInfo); @@ -223,14 +195,6 @@ public class IuiRouteServiceWrapper { } - /** - * @Title updateIuiRouteStatus - * @Description TODO(更新单个服务状态) - * @param serviceName - * @param status - * @return - * @return RouteResult - */ public synchronized IuiRouteInfo updateIuiRouteStatus(String serviceName, String status) { @@ -246,7 +210,6 @@ public class IuiRouteServiceWrapper { IuiRouteInfo new_iuiRouteInfo = getIuiRouteInstance(serviceName); - // 准备info信息 String serviceInfokey = RouteUtil.getPrefixedKey("", RouteUtil.IUIROUTE, serviceName, RouteUtil.ROUTE_PATH_INFO); @@ -261,7 +224,6 @@ public class IuiRouteServiceWrapper { throw new ExtendedInternalServerErrorException( "fetch from jedis pool failed,null object!"); } - // 保存info信息 jedis.hmset(serviceInfokey, serviceInfoMap); new_iuiRouteInfo.setStatus(status); @@ -277,13 +239,6 @@ public class IuiRouteServiceWrapper { return new_iuiRouteInfo; } - /** - * @Title: saveIuiRouteInstance - * @Description: TODO(存储单个服务信息) - * @param: @param IuiRouteInfo - * @param: @return - * @return: IuiRouteInfo - */ public synchronized IuiRouteInfo saveIuiRouteInstance(IuiRouteInfo iuiRouteInfo) { if (StringUtils.isBlank(iuiRouteInfo.getServiceName()) @@ -324,7 +279,6 @@ public class IuiRouteServiceWrapper { + RouteUtil.show(RouteUtil.useOwnUpstreamRangeMatches) + ")"); } - // 检查服务实例格式 RouteServer[] serverList = iuiRouteInfo.getServers(); for (int i = 0; i < serverList.length; i++) { RouteServer server = serverList[i]; @@ -340,7 +294,6 @@ public class IuiRouteServiceWrapper { } - // 准备info信息 String serviceInfokey = RouteUtil.getPrefixedKey("", RouteUtil.IUIROUTE, iuiRouteInfo.getServiceName().trim(), RouteUtil.ROUTE_PATH_INFO); @@ -353,7 +306,6 @@ public class IuiRouteServiceWrapper { serviceInfoMap.put("useOwnUpstream", iuiRouteInfo.getUseOwnUpstream()); - // 准备负载均衡信息 String serviceLBkey = RouteUtil.getPrefixedKey("", RouteUtil.IUIROUTE, iuiRouteInfo.getServiceName(), RouteUtil.ROUTE_PATH_LOADBALANCE); @@ -366,10 +318,8 @@ public class IuiRouteServiceWrapper { throw new ExtendedInternalServerErrorException( "fetch from jedis pool failed,null object!"); } - // 保存info信息 jedis.hmset(serviceInfokey, serviceInfoMap); - // 保存负载均衡信息 for (int i = 0; i < serverList.length; i++) { Map<String, String> servermap = new HashMap<String, String>(); RouteServer server = serverList[i]; @@ -395,15 +345,6 @@ public class IuiRouteServiceWrapper { - /** - * @Title: deleteIuiRoute - * @Description: TODO(删除单个服务信息) - * @param: @param type - * @param: @param serviceName - * @param: @param delKey - * @param: @return - * @return: void - */ public synchronized void deleteIuiRoute(String serviceName, String delKey) { if (StringUtils.isBlank(serviceName)) { @@ -418,7 +359,6 @@ public class IuiRouteServiceWrapper { "fetch from jedis pool failed,null object!"); } - // 获取info信息 String routekey = RouteUtil.getPrefixedKey("", RouteUtil.IUIROUTE, serviceName, delKey); Set<String> infoSet = jedis.keys(routekey); @@ -429,7 +369,6 @@ public class IuiRouteServiceWrapper { String[] paths = new String[infoSet.size()]; - // Set-->数组 infoSet.toArray(paths); jedis.del(paths); diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MetricsServiceWrapper.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MetricsServiceWrapper.java index d0d9ed9..edab97b 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MetricsServiceWrapper.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MetricsServiceWrapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MicroServiceWrapper.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MicroServiceWrapper.java index 08e3e26..2611605 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MicroServiceWrapper.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/MicroServiceWrapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -256,7 +256,6 @@ public class MicroServiceWrapper { public synchronized MicroServiceFullInfo saveMicroServiceInstance( MicroServiceInfo microServiceInfo, boolean createOrUpdate,String requestIP,String serverPort) { - // 保存数据格式判断 if (StringUtils.isBlank(microServiceInfo.getServiceName()) || StringUtils.isBlank(microServiceInfo.getProtocol()) diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/ServiceAccessWrapper.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/ServiceAccessWrapper.java index 69be552..23a02a1 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/ServiceAccessWrapper.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/ServiceAccessWrapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/CatalogClient.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/CatalogClient.java index cd881b0..67115a8 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/CatalogClient.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/CatalogClient.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/Consul.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/Consul.java index 67c9ef3..46cfc00 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/Consul.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/Consul.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/ConsulException.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/ConsulException.java index 9fd62a6..a17d68f 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/ConsulException.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/ConsulException.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/HealthClient.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/HealthClient.java index 96d62e6..9fde7ee 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/HealthClient.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/HealthClient.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/async/ConsulResponseCallback.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/async/ConsulResponseCallback.java index c74f4a2..d823e98 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/async/ConsulResponseCallback.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/async/ConsulResponseCallback.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/CatalogCache.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/CatalogCache.java index e928dcf..346ba1d 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/CatalogCache.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/CatalogCache.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/ConsulCache.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/ConsulCache.java index 1e0071c..500579a 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/ConsulCache.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/ConsulCache.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/ConsulCache4Map.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/ConsulCache4Map.java index ec0e54a..349cbdd 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/ConsulCache4Map.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/ConsulCache4Map.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/HealthCache.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/HealthCache.java index 54caab6..cc4d7cb 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/HealthCache.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/HealthCache.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/ServiceCache.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/ServiceCache.java index 78c4b92..5d16e24 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/ServiceCache.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/cache/ServiceCache.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/ConsulResponse.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/ConsulResponse.java index 3ee15f1..b19f37c 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/ConsulResponse.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/ConsulResponse.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/CatalogNode.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/CatalogNode.java index 1a33a4f..5ffc97b 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/CatalogNode.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/CatalogNode.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/CatalogService.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/CatalogService.java index ec6ecfe..9d62f02 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/CatalogService.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/CatalogService.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/ImmutableCatalogNode.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/ImmutableCatalogNode.java index de872df..18830d5 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/ImmutableCatalogNode.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/ImmutableCatalogNode.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/ImmutableCatalogService.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/ImmutableCatalogService.java index 738b094..c16b94f 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/ImmutableCatalogService.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/ImmutableCatalogService.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/ServiceInfo.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/ServiceInfo.java index 285b997..dcf67a2 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/ServiceInfo.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/catalog/ServiceInfo.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/ImmutableNode.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/ImmutableNode.java index 56d2cb1..ed0340e 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/ImmutableNode.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/ImmutableNode.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/ImmutableService.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/ImmutableService.java index f350510..ec8f2d3 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/ImmutableService.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/ImmutableService.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/Node.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/Node.java index 0933c5b..9f603c5 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/Node.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/Node.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/Service.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/Service.java index 0af11f8..6ac3d4b 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/Service.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/Service.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/ServiceHealth.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/ServiceHealth.java index c543203..4693256 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/ServiceHealth.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/model/health/ServiceHealth.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/CatalogOptions.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/CatalogOptions.java index 1408cca..daba73c 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/CatalogOptions.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/CatalogOptions.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ConsistencyMode.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ConsistencyMode.java index 7320e8a..ea47c65 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ConsistencyMode.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ConsistencyMode.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ImmutableCatalogOptions.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ImmutableCatalogOptions.java index 3e530f1..89048d5 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ImmutableCatalogOptions.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ImmutableCatalogOptions.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ImmutableQueryOptions.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ImmutableQueryOptions.java index 23fc5e7..c39b578 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ImmutableQueryOptions.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ImmutableQueryOptions.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/Options.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/Options.java index 2593c48..1f04c09 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/Options.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/Options.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ParamAdder.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ParamAdder.java index 188f04e..dc9a9fa 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ParamAdder.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/ParamAdder.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/QueryOptions.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/QueryOptions.java index 0d7abe8..688728e 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/QueryOptions.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/option/QueryOptions.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/Base64EncodingDeserializer.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/Base64EncodingDeserializer.java index 2502c2f..4770b6d 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/Base64EncodingDeserializer.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/Base64EncodingDeserializer.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/ClientUtil.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/ClientUtil.java index 03264c0..c45f0dd 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/ClientUtil.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/ClientUtil.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/Jackson.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/Jackson.java index d573c50..f49ba12 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/Jackson.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/Jackson.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/ObjectMapperContextResolver.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/ObjectMapperContextResolver.java index 4a5cd1b..9887bfe 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/ObjectMapperContextResolver.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/ObjectMapperContextResolver.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/SecondsDeserializer.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/SecondsDeserializer.java index 2c34e37..8bb04a6 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/SecondsDeserializer.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/SecondsDeserializer.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/SecondsSerializer.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/SecondsSerializer.java index 1d1f9e3..8c0ba85 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/SecondsSerializer.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/SecondsSerializer.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/UnsignedLongDeserializer.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/UnsignedLongDeserializer.java index f3aeb09..7bdee6f 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/UnsignedLongDeserializer.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/consul/util/UnsignedLongDeserializer.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/serviceListener/IMicroServiceChangeListener.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/serviceListener/IMicroServiceChangeListener.java index 30b179b..e37bb06 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/serviceListener/IMicroServiceChangeListener.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/serviceListener/IMicroServiceChangeListener.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/serviceListener/MicroServiceChangeListener.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/serviceListener/MicroServiceChangeListener.java index 45c085c..412b4e6 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/serviceListener/MicroServiceChangeListener.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/serviceListener/MicroServiceChangeListener.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/FileUtil.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/FileUtil.java index e739ceb..baf3a1a 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/FileUtil.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/FileUtil.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/JacksonJsonUtil.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/JacksonJsonUtil.java index 9f6f236..5157187 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/JacksonJsonUtil.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/JacksonJsonUtil.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/JedisUtil.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/JedisUtil.java index 97309e8..46d071e 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/JedisUtil.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/JedisUtil.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,7 +80,7 @@ public static void main(String[] args) { } - // 设置连接池基本信息 + String strHost = bundle.getString("redis.host"); if(StringUtils.isNotEmpty(strHost)){ host = strHost; diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MetricsUtil.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MetricsUtil.java index 6a579b1..df21f3e 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MetricsUtil.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MetricsUtil.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MicroServiceDB.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MicroServiceDB.java index 98e051f..cec948c 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MicroServiceDB.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MicroServiceDB.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MicroServiceUtil.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MicroServiceUtil.java index 044ce9c..3da82ed 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MicroServiceUtil.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MicroServiceUtil.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/RegExpTestUtil.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/RegExpTestUtil.java index d7a8116..90c8cba 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/RegExpTestUtil.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/RegExpTestUtil.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/RouteUtil.java b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/RouteUtil.java index f14908a..e505e16 100644 --- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/RouteUtil.java +++ b/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/RouteUtil.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/resources/api-doc/WEB-INF/web.xml b/msb-core/apiroute/apiroute-service/src/main/resources/api-doc/WEB-INF/web.xml index 38811b2..057b722 100644 --- a/msb-core/apiroute/apiroute-service/src/main/resources/api-doc/WEB-INF/web.xml +++ b/msb-core/apiroute/apiroute-service/src/main/resources/api-doc/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/main/resources/iui-route/img/conductor-logo.png b/msb-core/apiroute/apiroute-service/src/main/resources/iui-route/img/conductor-logo.png Binary files differindex 5d78c45..d4476b2 100644 --- a/msb-core/apiroute/apiroute-service/src/main/resources/iui-route/img/conductor-logo.png +++ b/msb-core/apiroute/apiroute-service/src/main/resources/iui-route/img/conductor-logo.png diff --git a/msb-core/apiroute/apiroute-service/src/main/resources/iui-route/img/logo.png b/msb-core/apiroute/apiroute-service/src/main/resources/iui-route/img/logo.png Binary files differindex d899116..d4476b2 100644 --- a/msb-core/apiroute/apiroute-service/src/main/resources/iui-route/img/logo.png +++ b/msb-core/apiroute/apiroute-service/src/main/resources/iui-route/img/logo.png diff --git a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/ApiRouteServiceWrapperTest.java b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/ApiRouteServiceWrapperTest.java index 5b0867c..6815f16 100644 --- a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/ApiRouteServiceWrapperTest.java +++ b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/ApiRouteServiceWrapperTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/CustomRouteServiceWrapperTest.java b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/CustomRouteServiceWrapperTest.java index 09935a0..38a63c7 100644 --- a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/CustomRouteServiceWrapperTest.java +++ b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/CustomRouteServiceWrapperTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/IuiRouteServiceWrapperTest.java b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/IuiRouteServiceWrapperTest.java index 33dc01c..343b26e 100644 --- a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/IuiRouteServiceWrapperTest.java +++ b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/IuiRouteServiceWrapperTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/MicroServiceWrapperTest.java b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/MicroServiceWrapperTest.java index 3832bd0..20be0b4 100644 --- a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/MicroServiceWrapperTest.java +++ b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/MicroServiceWrapperTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/util/JacksonJsonUtilTest.java b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/util/JacksonJsonUtilTest.java index 255cc77..1d36fc6 100644 --- a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/util/JacksonJsonUtilTest.java +++ b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/util/JacksonJsonUtilTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/util/RegExpTestUtilTest.java b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/util/RegExpTestUtilTest.java index c744026..e3c4d3e 100644 --- a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/util/RegExpTestUtilTest.java +++ b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/util/RegExpTestUtilTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/util/RouteUtilTest.java b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/util/RouteUtilTest.java index af5c28b..f665bd3 100644 --- a/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/util/RouteUtilTest.java +++ b/msb-core/apiroute/apiroute-service/src/test/java/org/openo/msb/wrapper/util/RouteUtilTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + * Copyright 2016 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-standalone/pom.xml b/msb-core/apiroute/apiroute-standalone/pom.xml index c4e1b76..0d9c092 100644 --- a/msb-core/apiroute/apiroute-standalone/pom.xml +++ b/msb-core/apiroute/apiroute-standalone/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/apirouteService.xml b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/apirouteService.xml index ab92b2f..617c66e 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/apirouteService.xml +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/apirouteService.xml @@ -1,6 +1,6 @@ <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/find_kill_process.bat b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/find_kill_process.bat index 34e5823..6700cfe 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/find_kill_process.bat +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/find_kill_process.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.bat b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.bat index 83a76cb..a67407a 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.bat +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.sh b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.sh index 7201c05..4094bb9 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.sh +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.bat b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.bat index e37210a..2782930 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.bat +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.sh b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.sh index 9895070..d9b33e9 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.sh +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/msb-core/apiroute/pom.xml b/msb-core/apiroute/pom.xml index 63e79a7..3b7fdda 100644 --- a/msb-core/apiroute/pom.xml +++ b/msb-core/apiroute/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/pom.xml b/msb-core/distributions/pom.xml index ace200a..316d763 100644 --- a/msb-core/distributions/pom.xml +++ b/msb-core/distributions/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/pom.xml b/msb-core/distributions/standalone/pom.xml index e6f6872..97f6a7c 100644 --- a/msb-core/distributions/standalone/pom.xml +++ b/msb-core/distributions/standalone/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat b/msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat index 2c80731..d04d064 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/servicesInstall.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat b/msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat index 71f702f..c66a6e3 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/servicesRestart.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat b/msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat index d143759..3415747 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/servicesStatus.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat b/msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat index 0f1a89e..5a5bc0b 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/servicesUninstall.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/src/assembly/resource/startup.bat b/msb-core/distributions/standalone/src/assembly/resource/startup.bat index a85ace7..30e23de 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/startup.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/startup.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/src/assembly/resource/startup.sh b/msb-core/distributions/standalone/src/assembly/resource/startup.sh index e0fee7d..aa4117d 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/startup.sh +++ b/msb-core/distributions/standalone/src/assembly/resource/startup.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/src/assembly/resource/shutdown.bat b/msb-core/distributions/standalone/src/assembly/resource/stop.bat index c2cce3b..0ebe78e 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/shutdown.bat +++ b/msb-core/distributions/standalone/src/assembly/resource/stop.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/distributions/standalone/src/assembly/resource/shutdown.sh b/msb-core/distributions/standalone/src/assembly/resource/stop.sh index 0c19f3f..b7c570b 100644 --- a/msb-core/distributions/standalone/src/assembly/resource/shutdown.sh +++ b/msb-core/distributions/standalone/src/assembly/resource/stop.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/msb-core/eag-openresty-ext/pom.xml b/msb-core/eag-openresty-ext/pom.xml index 16e76e7..228f3cb 100644 --- a/msb-core/eag-openresty-ext/pom.xml +++ b/msb-core/eag-openresty-ext/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/eag-openresty-ext/src/assembly/resources/openresty/nginx/luaext/msbconf.lua b/msb-core/eag-openresty-ext/src/assembly/resources/openresty/nginx/luaext/msbconf.lua index 4e820f5..dfcfe37 100644 --- a/msb-core/eag-openresty-ext/src/assembly/resources/openresty/nginx/luaext/msbconf.lua +++ b/msb-core/eag-openresty-ext/src/assembly/resources/openresty/nginx/luaext/msbconf.lua @@ -1,6 +1,6 @@ --[[ - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/pom.xml b/msb-core/openresty-ext/pom.xml index 09b6bca..8685fb2 100644 --- a/msb-core/openresty-ext/pom.xml +++ b/msb-core/openresty-ext/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/customrouter.lua b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/customrouter.lua index d6b67f3..46d0b8a 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/customrouter.lua +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/customrouter.lua @@ -1,6 +1,6 @@ --[[ - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/execute_auth.lua b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/execute_auth.lua index c8ea047..946f561 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/execute_auth.lua +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/execute_auth.lua @@ -1,6 +1,6 @@ --[[ - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/msbconf.lua b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/msbconf.lua index de8a402..48b04c7 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/msbconf.lua +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/msbconf.lua @@ -1,6 +1,6 @@ --[[ - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openoadminrouter.lua b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openoadminrouter.lua index d2f0895..938a017 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openoadminrouter.lua +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openoadminrouter.lua @@ -1,6 +1,6 @@ --[[ - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openoapijsonrouter.lua b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openoapijsonrouter.lua index 1a061f0..9255a65 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openoapijsonrouter.lua +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openoapijsonrouter.lua @@ -1,6 +1,6 @@ --[[ - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openoapirouter.lua b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openoapirouter.lua index 9dec2a9..717bd1a 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openoapirouter.lua +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openoapirouter.lua @@ -1,6 +1,6 @@ --[[ - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openouirouter.lua b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openouirouter.lua index 736aacd..c36057e 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openouirouter.lua +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/openouirouter.lua @@ -1,6 +1,6 @@ --[[ - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/auth.lua b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/auth.lua index 546f1dc..0bec85c 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/auth.lua +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/auth.lua @@ -17,10 +17,149 @@ ]] local _M = {} _M._VERSION = '1.0.0' +local auth_url = '/openoapi/auth/v1'; +local auth_token_url = auth_url..'/tokens'; +local auth_token_key = "X-Auth-Token"; +local redirect_url = "/openoui/auth/v1/login/html/login.html" -function _M.access() - --add your own code here - ngx.log(ngx.INFO, "running auth plugin") +local white_list= { + auth_token_url, + redirect_url, + '/openoui/auth/v1/login/' +}; + +local function verify_value(value) + if (nil == value or 0 == #value) + then + return false; + else + return true; + end +end + +--[[checks str2 starts with str1]]-- +local function starts_with(str1, str2) + return string.sub(str2, 1, string.len(str1)) == str1; end +-- Check and ignore the request if it is from auth module.-- +local function is_white_list(url) + for i, value in ipairs(white_list) + do + if (starts_with(value, url)) + then + return true; + end + end + return false; +end + +local function set_header(tokens) + for key,value in pairs(tokens) + do + ngx.log (ngx.ERR, "Headers: ", key, value); + ngx.req.set_header(key, value); + end + +end +--[[ validates the token with auth ]]-- +local function validate_token(tokens) + -- auth expects the token in header. + set_header(tokens); + -- call auth token check url to validate. + local res = ngx.location.capture(auth_token_url, { method = ngx.HTTP_HEAD}); + ngx.log (ngx.ERR, "Auth Result:", res.status); + if (nil == res) + then + return false; + end + return (ngx.HTTP_OK == res.status); +end + +--[[ get auth token from cookies ]]-- +local function get_cookies() + local cookie_name = "cookie_"..auth_token_key; + local auth_token = ngx.var[cookie_name]; + local tokens = {}; + -- verify whether its empty or null. + if (verify_value(auth_token)) + then + ngx.log(ngx.ERR, "token : ", auth_token ); + tokens[auth_token_key] = auth_token; + end + return tokens; +end + +local function get_service_url() + -- get host. + local host = ngx.var.host; + --get port + local port = ":"..ngx.var.server_port; + local proto = ""; + --get protocol + if (ngx.var.https == "on") + then + proto = "https://"; + else + proto = "http://"; + end + --get url + local uri = ngx.var.rui; + --form complete service url. + --local complete_url = proto..host..port..url + local complete_url = uri; + local service = "?service=" + --add arguments if any. + if ngx.var.args ~= nil + then + complete_url = complete_url.."?"..ngx.var.args; + end + ngx.log(ngx.ERR, "service url : ", complete_url); + return service..ngx.escape_uri(complete_url); +end + +local function redirect(url) + local service = get_service_url(); + ngx.log(ngx.ERR, "redirect: ", url..service); + ngx.redirect(url..service); +end + +function _M.access() + + ngx.log(ngx.ERR, "==============start check token===============: "); + local url = ngx.var.uri; + ngx.log(ngx.ERR, "Url : ", url); + + -- ignore token validation if auth request. + if (is_white_list(url)) + then + return; + end + + + + -- get auth token from cookies. + local auth_tokens = get_cookies(); + + -- check if auth token is empty, + -- redirect it to login page in that case. + if (nil == next(auth_tokens)) + then + ngx.log(ngx.ERR, "Token Invalidate, redirect to ", redirect_url); + redirect(redirect_url); + return; + end + + -- validate the token with auth module. + -- continue if success, else redirect to login page. + if(validate_token(auth_tokens)) + then + ngx.log(ngx.ERR, "Token Validate."); + return; + else + redirect(redirect_url); + end + ngx.log(ngx.INFO, "running auth plugin") + end + return _M
\ No newline at end of file diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/driver_manager.lua b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/driver_manager.lua index d337a25..4caa9e2 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/driver_manager.lua +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/driver_manager.lua @@ -17,11 +17,98 @@ ]] local _M = {} _M._VERSION = '1.0.0' +local _HEADER = "X-Driver-Parameter" + +--extract driver header if present in request +local function get_driver_header() + local header = "" + local driver_header = ngx.req.get_headers()[_HEADER] + if (driver_header ~= nil) + then + header = driver_header + end + return header +end + +-- generate query url +local function get_query_url(x_driver_header) + local drivermgr_uri = '/openoapi/drivermgr/v1/drivers' + local url = drivermgr_uri.."?".._HEADER.."="..tostring(ngx.escape_uri(x_driver_header)).."&service_url="..ngx.var.uri + return url +end + +-- generate driver url +local function get_driver_url(driver_header) + local cjson = require "cjson" + local query_url = get_query_url(driver_header) + local res = ngx.location.capture(query_url, { method = ngx.HTTP_GET}) + ngx.log (ngx.ERR, "Driver manager resp url : ", tostring(res.body)) + if (res.status == 200 and res.body ~= nil and res.body ~= '') + then + return tostring(cjson.new().decode(res.body).url) + else + return '' + end +end + +-- get headers +local function get_headers() + local headers = {} + local h = ngx.req.get_headers() + for k, value in pairs(h) + do + headers[k] = value + end + return headers +end + +local function get_body_params() + ngx.req.read_body() + local actual_body = "" + local body_param = ngx.req.get_body_data() + if(body_param ~= nil) + then + actual_body = tostring(body_param) + end + return actual_body +end function _M.access() - ngx.log(ngx.INFO, "running driver_manager plugin") - --add your own code here - --choose the right backend server,and then tell nginx, e.g. ngx.var.backend = XX.XX.XX.XX:8888 + ngx.log(ngx.ERR, "DRIVER MANAGER LUA", "***********************") + + -- extract X-Driver-Parameter header param + local driver_header = get_driver_header() + ngx.log(ngx.ERR, "X-Driver-Parameter: ", driver_header) + + + -- ignore driver redirection if not driver manager request. + if (driver_header ~= "") + then + + local driver_url = get_driver_url(driver_header) + ngx.log (ngx.ERR, "Driver manager URl:: ", driver_url) + + local http = require "resty.http" + local actual_headers = get_headers() + local actual_body = get_body_params() + + ngx.log(ngx.ERR, "HTTP request to driver... ", " Request to driver manager") + local res, err = http.new():request_uri(driver_url, { + method = ngx.req.get_method(), + body = actual_body, + headers = actual_headers + }) + + if not res then + ngx.say("Request to driver failed : ", err) + return + end + ngx.log(ngx.ERR, "Response from driver : ", tostring(res.body)) + ngx.say(res.body) + + else + ngx.log(ngx.ERR, "X-Driver-Parameter not present", " Redirect to same url") + end end return _M
\ No newline at end of file diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/setnocacheflag.lua b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/setnocacheflag.lua index e8c75cd..8b57660 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/setnocacheflag.lua +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/setnocacheflag.lua @@ -1,6 +1,6 @@ --[[ - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/reload.sh b/msb-core/openresty-ext/src/assembly/resources/openresty/reload.sh index 644f057..63e6854 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/reload.sh +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/reload.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/run.bat b/msb-core/openresty-ext/src/assembly/resources/openresty/run.bat index 17302ce..0efc55a 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/run.bat +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/run.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/run.sh b/msb-core/openresty-ext/src/assembly/resources/openresty/run.sh index 5c7dbc8..cdf2d92 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/run.sh +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/run.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/stop.bat b/msb-core/openresty-ext/src/assembly/resources/openresty/stop.bat index 9fa6522..3609162 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/stop.bat +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/stop.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/stop.sh b/msb-core/openresty-ext/src/assembly/resources/openresty/stop.sh index c5d0f19..6057d48 100644 --- a/msb-core/openresty-ext/src/assembly/resources/openresty/stop.sh +++ b/msb-core/openresty-ext/src/assembly/resources/openresty/stop.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/msb-core/openresty/pom.xml b/msb-core/openresty/pom.xml index 7ecbfd1..843c0c7 100644 --- a/msb-core/openresty/pom.xml +++ b/msb-core/openresty/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/pom.xml b/msb-core/pom.xml index 0fc1b94..23f9a03 100644 --- a/msb-core/pom.xml +++ b/msb-core/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/redis-ext/pom.xml b/msb-core/redis-ext/pom.xml index 465203c..4aac0fd 100644 --- a/msb-core/redis-ext/pom.xml +++ b/msb-core/redis-ext/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.bat b/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.bat index 718d756..2fd7cc0 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.bat +++ b/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.sh b/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.sh index 3b92d26..d6d0b1b 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.sh +++ b/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/msb-core/redis-ext/src/assembly/resources/redis/redisService.xml b/msb-core/redis-ext/src/assembly/resources/redis/redisService.xml index cd85369..af24dab 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/redisService.xml +++ b/msb-core/redis-ext/src/assembly/resources/redis/redisService.xml @@ -1,6 +1,6 @@ <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/msb-core/redis-ext/src/assembly/resources/redis/run.bat b/msb-core/redis-ext/src/assembly/resources/redis/run.bat index f62f110..fb92460 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/run.bat +++ b/msb-core/redis-ext/src/assembly/resources/redis/run.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/redis-ext/src/assembly/resources/redis/run.sh b/msb-core/redis-ext/src/assembly/resources/redis/run.sh index 09bfddc..ff3e676 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/run.sh +++ b/msb-core/redis-ext/src/assembly/resources/redis/run.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/msb-core/redis-ext/src/assembly/resources/redis/stop.bat b/msb-core/redis-ext/src/assembly/resources/redis/stop.bat index 32da2f0..7d8ed4b 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/stop.bat +++ b/msb-core/redis-ext/src/assembly/resources/redis/stop.bat @@ -1,5 +1,5 @@ @REM -@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM Copyright 2016 ZTE Corporation. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. diff --git a/msb-core/redis-ext/src/assembly/resources/redis/stop.sh b/msb-core/redis-ext/src/assembly/resources/redis/stop.sh index 7ae204c..94ab13e 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/stop.sh +++ b/msb-core/redis-ext/src/assembly/resources/redis/stop.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# Copyright 2016 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/msb-core/redis/pom.xml b/msb-core/redis/pom.xml index dd271d9..3080439 100644 --- a/msb-core/redis/pom.xml +++ b/msb-core/redis/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + Copyright 2016 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. |
