Igor Kulikov
5 years ago
committed by
GitHub
GitHub
101 changed files with 958 additions and 810 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1,110 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2021 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.service.edge; |
||||
|
|
||||
|
import com.fasterxml.jackson.databind.JsonNode; |
||||
|
import lombok.extern.slf4j.Slf4j; |
||||
|
import org.apache.http.HttpHost; |
||||
|
import org.apache.http.conn.ssl.DefaultHostnameVerifier; |
||||
|
import org.apache.http.impl.client.CloseableHttpClient; |
||||
|
import org.apache.http.impl.client.HttpClients; |
||||
|
import org.springframework.beans.factory.annotation.Value; |
||||
|
import org.springframework.http.ResponseEntity; |
||||
|
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; |
||||
|
import org.springframework.http.client.SimpleClientHttpRequestFactory; |
||||
|
import org.springframework.stereotype.Service; |
||||
|
import org.springframework.web.client.RestTemplate; |
||||
|
import org.thingsboard.server.queue.util.TbCoreComponent; |
||||
|
|
||||
|
import javax.annotation.PostConstruct; |
||||
|
import java.net.InetSocketAddress; |
||||
|
import java.net.Proxy; |
||||
|
import java.util.HashMap; |
||||
|
import java.util.Map; |
||||
|
|
||||
|
import static org.apache.commons.lang3.StringUtils.isNotEmpty; |
||||
|
|
||||
|
@Service |
||||
|
@TbCoreComponent |
||||
|
@Slf4j |
||||
|
public class DefaultEdgeLicenseService implements EdgeLicenseService { |
||||
|
|
||||
|
private RestTemplate restTemplate; |
||||
|
|
||||
|
private static final String EDGE_LICENSE_SERVER_ENDPOINT = "https://license.thingsboard.io"; |
||||
|
|
||||
|
@Value("${edges.enabled:false}") |
||||
|
private boolean edgesEnabled; |
||||
|
|
||||
|
@PostConstruct |
||||
|
public void init() { |
||||
|
if (edgesEnabled) { |
||||
|
initRestTemplate(); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResponseEntity<JsonNode> checkInstance(JsonNode request) { |
||||
|
return this.restTemplate.postForEntity(EDGE_LICENSE_SERVER_ENDPOINT + "/api/license/checkInstance", request, JsonNode.class); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResponseEntity<JsonNode> activateInstance(String edgeLicenseSecret, String releaseDate) { |
||||
|
Map<String, String> params = new HashMap<>(); |
||||
|
params.put("licenseSecret", edgeLicenseSecret); |
||||
|
params.put("releaseDate", releaseDate); |
||||
|
return this.restTemplate.postForEntity(EDGE_LICENSE_SERVER_ENDPOINT + "/api/license/activateInstance?licenseSecret={licenseSecret}&releaseDate={releaseDate}", null, JsonNode.class, params); |
||||
|
} |
||||
|
|
||||
|
private void initRestTemplate() { |
||||
|
boolean jdkHttpClientEnabled = isNotEmpty(System.getProperty("tb.proxy.jdk")) && System.getProperty("tb.proxy.jdk").equalsIgnoreCase("true"); |
||||
|
boolean systemProxyEnabled = isNotEmpty(System.getProperty("tb.proxy.system")) && System.getProperty("tb.proxy.system").equalsIgnoreCase("true"); |
||||
|
boolean proxyEnabled = isNotEmpty(System.getProperty("tb.proxy.host")) && isNotEmpty(System.getProperty("tb.proxy.port")); |
||||
|
if (jdkHttpClientEnabled) { |
||||
|
log.warn("Going to use plain JDK Http Client!"); |
||||
|
SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); |
||||
|
if (proxyEnabled) { |
||||
|
log.warn("Going to use Proxy Server: [{}:{}]", System.getProperty("tb.proxy.host"), System.getProperty("tb.proxy.port")); |
||||
|
factory.setProxy(new Proxy(Proxy.Type.HTTP, InetSocketAddress.createUnresolved(System.getProperty("tb.proxy.host"), Integer.parseInt(System.getProperty("tb.proxy.port"))))); |
||||
|
} |
||||
|
|
||||
|
this.restTemplate = new RestTemplate(new SimpleClientHttpRequestFactory()); |
||||
|
} else { |
||||
|
CloseableHttpClient httpClient; |
||||
|
HttpComponentsClientHttpRequestFactory requestFactory; |
||||
|
if (systemProxyEnabled) { |
||||
|
log.warn("Going to use System Proxy Server!"); |
||||
|
httpClient = HttpClients.createSystem(); |
||||
|
requestFactory = new HttpComponentsClientHttpRequestFactory(); |
||||
|
requestFactory.setHttpClient(httpClient); |
||||
|
this.restTemplate = new RestTemplate(requestFactory); |
||||
|
} else if (proxyEnabled) { |
||||
|
log.warn("Going to use Proxy Server: [{}:{}]", System.getProperty("tb.proxy.host"), System.getProperty("tb.proxy.port")); |
||||
|
httpClient = HttpClients.custom().setSSLHostnameVerifier(new DefaultHostnameVerifier()).setProxy(new HttpHost(System.getProperty("tb.proxy.host"), Integer.parseInt(System.getProperty("tb.proxy.port")), "https")).build(); |
||||
|
requestFactory = new HttpComponentsClientHttpRequestFactory(); |
||||
|
requestFactory.setHttpClient(httpClient); |
||||
|
this.restTemplate = new RestTemplate(requestFactory); |
||||
|
} else { |
||||
|
httpClient = HttpClients.custom().setSSLHostnameVerifier(new DefaultHostnameVerifier()).build(); |
||||
|
requestFactory = new HttpComponentsClientHttpRequestFactory(); |
||||
|
requestFactory.setHttpClient(httpClient); |
||||
|
this.restTemplate = new RestTemplate(requestFactory); |
||||
|
} |
||||
|
} |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
|
||||
@ -0,0 +1,26 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2021 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.service.edge; |
||||
|
|
||||
|
import com.fasterxml.jackson.databind.JsonNode; |
||||
|
import org.springframework.http.ResponseEntity; |
||||
|
|
||||
|
public interface EdgeLicenseService { |
||||
|
|
||||
|
ResponseEntity<JsonNode> checkInstance(JsonNode request); |
||||
|
|
||||
|
ResponseEntity<JsonNode> activateInstance(String licenseSecret, String releaseDate); |
||||
|
} |
||||
@ -0,0 +1,28 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2021 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.queue; |
||||
|
|
||||
|
import org.thingsboard.server.common.msg.queue.ServiceType; |
||||
|
|
||||
|
import java.util.Set; |
||||
|
|
||||
|
public interface QueueService { |
||||
|
|
||||
|
Set<String> getQueuesByServiceType(ServiceType serviceType); |
||||
|
|
||||
|
String resolve(ServiceType serviceType, String queueName); |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,62 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2021 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.queue; |
||||
|
|
||||
|
import lombok.RequiredArgsConstructor; |
||||
|
import org.springframework.stereotype.Service; |
||||
|
import org.springframework.util.StringUtils; |
||||
|
import org.thingsboard.server.common.msg.queue.ServiceQueue; |
||||
|
import org.thingsboard.server.common.msg.queue.ServiceType; |
||||
|
import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings; |
||||
|
import org.thingsboard.server.queue.settings.TbRuleEngineQueueConfiguration; |
||||
|
|
||||
|
import javax.annotation.PostConstruct; |
||||
|
import java.util.Collections; |
||||
|
import java.util.LinkedHashSet; |
||||
|
import java.util.Set; |
||||
|
import java.util.stream.Collectors; |
||||
|
|
||||
|
@Service |
||||
|
@RequiredArgsConstructor |
||||
|
public class DefaultQueueService implements QueueService { |
||||
|
|
||||
|
private final TbQueueRuleEngineSettings ruleEngineSettings; |
||||
|
private Set<String> ruleEngineQueues; |
||||
|
|
||||
|
@PostConstruct |
||||
|
public void init() { |
||||
|
ruleEngineQueues = ruleEngineSettings.getQueues().stream() |
||||
|
.map(TbRuleEngineQueueConfiguration::getName).collect(Collectors.toCollection(LinkedHashSet::new)); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public Set<String> getQueuesByServiceType(ServiceType type) { |
||||
|
if (type == ServiceType.TB_RULE_ENGINE) { |
||||
|
return ruleEngineQueues; |
||||
|
} else { |
||||
|
return Collections.emptySet(); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public String resolve(ServiceType serviceType, String queueName) { |
||||
|
if (StringUtils.isEmpty(queueName) || !getQueuesByServiceType(serviceType).contains(queueName)) { |
||||
|
return ServiceQueue.MAIN; |
||||
|
} else { |
||||
|
return queueName; |
||||
|
} |
||||
|
} |
||||
|
} |
||||
File diff suppressed because one or more lines are too long
@ -1,275 +0,0 @@ |
|||||
///
|
|
||||
/// Copyright © 2016-2021 The Thingsboard Authors
|
|
||||
///
|
|
||||
/// Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||
/// you may not use this file except in compliance with the License.
|
|
||||
/// You may obtain a copy of the License at
|
|
||||
///
|
|
||||
/// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||
///
|
|
||||
/// Unless required by applicable law or agreed to in writing, software
|
|
||||
/// distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||
/// See the License for the specific language governing permissions and
|
|
||||
/// limitations under the License.
|
|
||||
///
|
|
||||
|
|
||||
import * as leaflet from 'leaflet'; |
|
||||
|
|
||||
declare module 'leaflet' { |
|
||||
|
|
||||
/** |
|
||||
* Make geometries editable in Leaflet. |
|
||||
* |
|
||||
* This is not a plug and play UI, and will not. This is a minimal, lightweight, and fully extendable API to |
|
||||
* control editing of geometries. So you can easily build your own UI with your own needs and choices. |
|
||||
*/ |
|
||||
interface EditableStatic { |
|
||||
new (map: Map, options: EditOptions): Editable; |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* Options to pass to L.Editable when instanciating. |
|
||||
*/ |
|
||||
interface EditOptions extends leaflet.MapOptions{ |
|
||||
/** |
|
||||
* Whether to create a L.Editable instance at map init or not. |
|
||||
*/ |
|
||||
editable: boolean; |
|
||||
/** |
|
||||
* Class to be used when creating a new Polyline. |
|
||||
*/ |
|
||||
polylineClass?: object; |
|
||||
|
|
||||
/** |
|
||||
* Class to be used when creating a new Polygon. |
|
||||
*/ |
|
||||
polygonClass?: object; |
|
||||
|
|
||||
/** |
|
||||
* Class to be used when creating a new Marker. |
|
||||
*/ |
|
||||
markerClass?: object; |
|
||||
|
|
||||
/** |
|
||||
* CSS class to be added to the map container while drawing. |
|
||||
*/ |
|
||||
drawingCSSClass?: string; |
|
||||
|
|
||||
/** |
|
||||
* Layer used to store edit tools (vertex, line guide…). |
|
||||
*/ |
|
||||
editLayer?: LayerGroup<leaflet.Layer>; |
|
||||
|
|
||||
/** |
|
||||
* Default layer used to store drawn features (marker, polyline…). |
|
||||
*/ |
|
||||
featuresLayer?: LayerGroup<Polyline|Polygon|Marker>; |
|
||||
|
|
||||
/** |
|
||||
* Class to be used as vertex, for path editing. |
|
||||
*/ |
|
||||
vertexMarkerClass?: object; |
|
||||
|
|
||||
/** |
|
||||
* Class to be used as middle vertex, pulled by the user to create a new point in the middle of a path. |
|
||||
*/ |
|
||||
middleMarkerClass?: object; |
|
||||
|
|
||||
/** |
|
||||
* Class to be used as Polyline editor. |
|
||||
*/ |
|
||||
polylineEditorClass?: object; |
|
||||
|
|
||||
/** |
|
||||
* Class to be used as Polygon editor. |
|
||||
*/ |
|
||||
polygonEditorClass?: object; |
|
||||
|
|
||||
/** |
|
||||
* Class to be used as Marker editor. |
|
||||
*/ |
|
||||
markerEditorClass?: object; |
|
||||
|
|
||||
/** |
|
||||
* Options to be passed to the line guides. |
|
||||
*/ |
|
||||
lineGuideOptions?: object; |
|
||||
|
|
||||
/** |
|
||||
* Set this to true if you don't want middle markers. |
|
||||
*/ |
|
||||
skipMiddleMarkers?: boolean; |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* Make geometries editable in Leaflet. |
|
||||
* |
|
||||
* This is not a plug and play UI, and will not. This is a minimal, lightweight, and fully extendable API to |
|
||||
* control editing of geometries. So you can easily build your own UI with your own needs and choices. |
|
||||
*/ |
|
||||
interface Editable extends leaflet.Evented { |
|
||||
/** |
|
||||
* Options to pass to L.Editable when instanciating. |
|
||||
*/ |
|
||||
options: EditOptions; |
|
||||
|
|
||||
currentPolygon: Polyline|Polygon|Marker; |
|
||||
|
|
||||
/** |
|
||||
* Start drawing a polyline. If latlng is given, a first point will be added. In any case, continuing on user |
|
||||
* click. If options is given, it will be passed to the polyline class constructor. |
|
||||
*/ |
|
||||
startPolyline(latLng?: LatLng, options?: PolylineOptions): Polyline; |
|
||||
|
|
||||
/** |
|
||||
* Start drawing a polygon. If latlng is given, a first point will be added. In any case, continuing on user |
|
||||
* click. If options is given, it will be passed to the polygon class constructor. |
|
||||
*/ |
|
||||
startPolygon(latLng?: LatLng, options?: PolylineOptions): Polygon; |
|
||||
|
|
||||
/** |
|
||||
* Start adding a marker. If latlng is given, the marker will be shown first at this point. In any case, it |
|
||||
* will follow the user mouse, and will have a final latlng on next click (or touch). If options is given, |
|
||||
* it will be passed to the marker class constructor. |
|
||||
*/ |
|
||||
startMarker(latLng?: LatLng, options?: MarkerOptions): Marker; |
|
||||
|
|
||||
/** |
|
||||
* When you need to stop any ongoing drawing, without needing to know which editor is active. |
|
||||
*/ |
|
||||
stopDrawing(): void; |
|
||||
|
|
||||
/** |
|
||||
* When you need to commit any ongoing drawing, without needing to know which editor is active. |
|
||||
*/ |
|
||||
commitDrawing(): void; |
|
||||
} |
|
||||
|
|
||||
let Editable: EditableStatic; |
|
||||
|
|
||||
/** |
|
||||
* EditableMixin is included to L.Polyline, L.Polygon and L.Marker. It adds the following methods to them. |
|
||||
* |
|
||||
* When editing is enabled, the editor is accessible on the instance with the editor property. |
|
||||
*/ |
|
||||
interface EditableMixin { |
|
||||
/** |
|
||||
* Enable editing, by creating an editor if not existing, and then calling enable on it. |
|
||||
*/ |
|
||||
enableEdit(map: L.Map): any; |
|
||||
|
|
||||
/** |
|
||||
* Disable editing, also remove the editor property reference. |
|
||||
*/ |
|
||||
disableEdit(): void; |
|
||||
|
|
||||
/** |
|
||||
* Enable or disable editing, according to current status. |
|
||||
*/ |
|
||||
toggleEdit(): void; |
|
||||
|
|
||||
/** |
|
||||
* Return true if current instance has an editor attached, and this editor is enabled. |
|
||||
*/ |
|
||||
editEnabled(): boolean; |
|
||||
} |
|
||||
|
|
||||
interface Map { |
|
||||
|
|
||||
|
|
||||
/** |
|
||||
* Options to pass to L.Editable when instanciating. |
|
||||
*/ |
|
||||
editOptions: MapOptions; |
|
||||
|
|
||||
/** |
|
||||
* L.Editable plugin instance. |
|
||||
*/ |
|
||||
editTools: Editable; |
|
||||
} |
|
||||
|
|
||||
// tslint:disable-next-line:no-empty-interface
|
|
||||
interface Polyline extends EditableMixin {} |
|
||||
|
|
||||
namespace Map { |
|
||||
interface MapOptions { |
|
||||
/** |
|
||||
* Whether to create a L.Editable instance at map init or not. |
|
||||
*/ |
|
||||
editable?: boolean; |
|
||||
|
|
||||
/** |
|
||||
* Options to pass to L.Editable when instanciating. |
|
||||
*/ |
|
||||
editOptions?: MapOptions; |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* When editing a feature (marker, polyline…), an editor is attached to it. This editor basically knows |
|
||||
* how to handle the edition. |
|
||||
*/ |
|
||||
interface BaseEditor { |
|
||||
/** |
|
||||
* Set up the drawing tools for the feature to be editable. |
|
||||
*/ |
|
||||
enable(): MarkerEditor|PolylineEditor|PolygonEditor; |
|
||||
|
|
||||
/** |
|
||||
* Remove editing tools. |
|
||||
*/ |
|
||||
disable(): MarkerEditor|PolylineEditor|PolygonEditor; |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* Inherit from L.Editable.BaseEditor. |
|
||||
* Inherited by L.Editable.PolylineEditor and L.Editable.PolygonEditor. |
|
||||
*/ |
|
||||
interface PathEditor extends BaseEditor { |
|
||||
/** |
|
||||
* Rebuild edit elements (vertex, middlemarker, etc.). |
|
||||
*/ |
|
||||
reset(): void; |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* Inherit from L.Editable.PathEditor. |
|
||||
*/ |
|
||||
interface PolylineEditor extends PathEditor { |
|
||||
/** |
|
||||
* Set up drawing tools to continue the line forward. |
|
||||
*/ |
|
||||
continueForward(): void; |
|
||||
|
|
||||
/** |
|
||||
* Set up drawing tools to continue the line backward. |
|
||||
*/ |
|
||||
continueBackward(): void; |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* Inherit from L.Editable.PathEditor. |
|
||||
*/ |
|
||||
interface PolygonEditor extends PathEditor { |
|
||||
/** |
|
||||
* Set up drawing tools for creating a new hole on the polygon. If the latlng param is given, a first |
|
||||
* point is created. |
|
||||
*/ |
|
||||
newHole(latlng: LatLng): void; |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* Inherit from L.Editable.BaseEditor. |
|
||||
*/ |
|
||||
// tslint:disable-next-line:no-empty-interface
|
|
||||
interface MarkerEditor extends BaseEditor {} |
|
||||
|
|
||||
interface Marker extends EditableMixin, MarkerEditor {} |
|
||||
|
|
||||
interface Polyline extends EditableMixin, PolylineEditor {} |
|
||||
|
|
||||
interface Polygon extends EditableMixin, PolygonEditor {} |
|
||||
|
|
||||
function map(element: string | HTMLElement, options?: EditOptions): Map; |
|
||||
} |
|
||||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue