Showing
100 changed files
with
1318 additions
and
84 deletions
Too many changes to show.
To preserve performance only 100 of 143 files are displayed.
CHANGELOG.md
0 → 100644
1 | +### 2021-02-18 | |
2 | +- Modified file: `DeviceController.java` | |
3 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
4 | + - Description: | |
5 | + - Batch modify the device configuration of devices | |
6 | + - Batch set devices as private | |
7 | + - Batch set devices as public | |
8 | + - Batch import devices through files | |
9 | + | |
10 | +### 2021-12-06 | |
11 | +- Modified file: `pom.xml` | |
12 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
13 | + - Description: Add dependencies related to thingskit | |
14 | +- Modified file: `common/data/pom.xml` | |
15 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
16 | + - Description: Add SMS, Excel SDK and other configurations | |
17 | +- Modified file: `dao/pom.xml` | |
18 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
19 | + - Description: Add script-api,javax.mail,javax.sip,mybatis-plus dependency | |
20 | +- Modified file: `RefreshTokenAuthenticationProvider.java`、`RestAuthenticationProvider.java` | |
21 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
22 | + - Description: | |
23 | + - You can log in without an email | |
24 | + - Users who have an account on Thingskit but do not have an account on Thingsboard can also log in to the platform | |
25 | + - Login through SMS verification code | |
26 | +- Modified file: `JwtTokenFactory.java`、`SecurityUser.java` | |
27 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
28 | + - Description: User credential information required to add thingskit | |
29 | +- Modified file: `UserPrincipal.java` | |
30 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
31 | + - Description: Add enum SMS_CODE | |
32 | + | |
33 | + | |
34 | +### 2021-12-07 | |
35 | +- Modified file: `application/thingsboard.yml` | |
36 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
37 | + - Description: | |
38 | + - Add ThingsKit cache configuration | |
39 | + - Add GBT28181、TCP protocol configuration | |
40 | + - Add file storage configuration | |
41 | + - Add thingskit email suffix configuration | |
42 | + - Add ThingsKit and other related configurations | |
43 | + | |
44 | +### 2021-12-08 | |
45 | +- Modified file: `BaseController.java` | |
46 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
47 | + - Description: | |
48 | + - Internationalization of messages intercepted by anomaly interceptors | |
49 | + - Get tenant's public ID and set cache | |
50 | + - Change the exception prompt information to Chinese | |
51 | + | |
52 | +### 2021-12-24 | |
53 | +- Modified file: `JpaDaoConfig.java` | |
54 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
55 | + - Description: scan thingskit entity. | |
56 | + | |
57 | +### 2021-12-27 | |
58 | +- Modified file: `DefaultDeviceStateService.java` | |
59 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
60 | + - Description: Add device upper and lower limit log records | |
61 | + | |
62 | +### 2021-12-30 | |
63 | +- Modified file: `root_rule_chain.json` | |
64 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
65 | + - Description: | |
66 | + - Add Yunteng alarm notification node | |
67 | + - Add Yunteng msg event node | |
68 | + | |
69 | +### 2022-01-20 | |
70 | +- Modified file: `ThingsboardSecurityConfiguration.java` | |
71 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
72 | + - Description: | |
73 | + - Allow mobile verification code login. | |
74 | + - Adding yt URL does not require interception. | |
75 | + - add i18 Interceptor. | |
76 | + | |
77 | +### 2022-01-25 | |
78 | +- Modified file: `TbContext.java`、`AlarmState.java` | |
79 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
80 | + - Description: new method for tkdevice inform. | |
81 | + | |
82 | +### 2022-02-21 | |
83 | +- Modified file: `JsonConverter.java`、`EntityKeyValue.java`、`SnapshotUpdate.java` | |
84 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
85 | + - Description: function for scene react . | |
86 | + | |
87 | +### 2022-03-04 | |
88 | +- Modified file: `banner.txt` | |
89 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
90 | + - Description: thingsboard banner change to thingskit banner | |
91 | +- Modified file: `TokenOutdatingTest.java`、`DefaultDeviceStateServiceTest` | |
92 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
93 | + - Description: Modify input parameters for unit testing | |
94 | + | |
95 | +### 2022-03-08 | |
96 | +- Modified file: `ThingsboardErrorResponseHandler.java` | |
97 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
98 | + - Description: | |
99 | + - set character encoding is utf-8. | |
100 | + - Add internationalization of exception returns in both Chinese and English. | |
101 | + - Add thingskit's exception capture. | |
102 | + | |
103 | +### 2022-03-09 | |
104 | +- Modified file: `JsonConverter.java` | |
105 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
106 | + - Description: function for rpc. | |
107 | + | |
108 | +### 2022-04-12 | |
109 | +- Modified file: `RpcV2Controller.java` | |
110 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
111 | + - Description: | |
112 | + - Add paging parameters | |
113 | + - Add open api role authority send rpc command | |
114 | + | |
115 | +### 2022-05-09 | |
116 | +- Modified file: `JsonConverter.java` | |
117 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
118 | + - Description: function for rpc. | |
119 | + | |
120 | +### 2022-05-17 | |
121 | +- Modified file: `ModelConstants.java` | |
122 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
123 | + - Description: extend constant for table. | |
124 | + | |
125 | +### 2022-06-29 | |
126 | +- Modified file: `ThingsboardInstallApplication.java` | |
127 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
128 | + - Description: Add scanning directory | |
129 | + | |
130 | +### 2022-07-18 | |
131 | +- Modified file: `ThingsboardErrorResponseHandler.java` | |
132 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
133 | + - Description: | |
134 | + - set character encoding is utf-8. | |
135 | + - Add internationalization of exception returns in both Chinese and English. | |
136 | + - Add thingskit's exception capture. | |
137 | +- Modified file: `DefaultTransportApiService.java` | |
138 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
139 | + - Description: | |
140 | + - Add logic for GBT28181, Modbus RTU, and TCP non-standard protocol authentication. | |
141 | + - The logic of TCP non-standard protocol uplink script. | |
142 | + - When automatically creating gateway sub devices, use default device configuration. | |
143 | + | |
144 | +### 2022-09-20 | |
145 | +- Modified file: `DefaultAccessControlService.java` | |
146 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
147 | + - Description: | |
148 | + - Translate the prompt content into Chinese. | |
149 | + - Add open API user permissions. | |
150 | +- Modified file: `UserController.java` | |
151 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
152 | + - Description: Translate the prompt content into Chinese | |
153 | + | |
154 | +### 2022-10-19 | |
155 | +- Modified file: `common/transport/pom.xml`、`transport/pom.xml` | |
156 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
157 | + - Description: Add tcp gbt28181 model | |
158 | + | |
159 | +### 2022-10-20 | |
160 | +- Modified file: `DefaultSystemDataLoaderService.java` | |
161 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
162 | + - Description: Change default email suffix and password | |
163 | + | |
164 | +### 2022-10-25 | |
165 | +- Modified file: `device.models.ts`、`locale.constant-zh_CN.json` | |
166 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
167 | + - Description: extend deviceprofile create method. add function for tcp transport. | |
168 | +- Modified file: `DeviceTransportConfiguration.java` | |
169 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
170 | + - Description: extend transport protocol for TCP. | |
171 | + | |
172 | +### 2022-10-28 | |
173 | +- Modified file: `common/transport/transport-api/pom.xml` | |
174 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
175 | + - Description: Add SIP dependency | |
176 | + | |
177 | +### 2022-11-11 | |
178 | +- Modified file: `TenantServiceImpl.java` | |
179 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
180 | + - Description: modify create tenant logic. | |
181 | + | |
182 | +### 2023-02-01 | |
183 | +- Modified file: `ThingsboardInstallService.java` | |
184 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
185 | + - Description: Installing DataBase schema for thingskit | |
186 | + | |
187 | +### 2023-02-19 | |
188 | +- Modified file: `MqttTopics.java` | |
189 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
190 | + - Description: mqtt topic for device publish event. | |
191 | +- Modified file: `SessionMsgType.java` | |
192 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
193 | + - Description: extent request POST_EVENT_REQUEST. | |
194 | +- Modified file: `MqttTransportHandler.java`、`MqttTransportAdaptor.java`、`JsonMqttAdaptor.java`、`BackwardCompatibilityAdaptor.java`、`ProtoMqttAdaptor.java`、`TransportService.java`、`DefaultTransportService.java` | |
195 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
196 | + - Description: add mqtt process event. | |
197 | + | |
198 | +### 2023-02-21 | |
199 | +- Modified file: `DefaultTelemetrySubscriptionService.java`、`InternalTelemetryService.java` | |
200 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
201 | + - Description: Add event reporting logic | |
202 | +- Modified file: `JsonConverter.java`、`RuleEngineTelemetryService.java`、`TelemetryNodeCallback.java` | |
203 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
204 | + - Description: new function for device event. | |
205 | + | |
206 | +### 2023-04-25 | |
207 | +- Modified file: `DeviceActorMessageProcessor.java` | |
208 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
209 | + - Description: Send rpc command to sensor | |
210 | +- Modified file: `DefaultTbClusterService.java` | |
211 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
212 | + - Description: When JsScript is changed, the broadcast entity is changed to transport | |
213 | + | |
214 | +### 2023-07-11 | |
215 | +- Modified file: `DefaultTbContext.java`、`ActorSystemContext.java` | |
216 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
217 | + - Description: provide tkdevice service | |
218 | +- Modified file: `ProtoUtils.java`、`TbSendRPCRequestNode.java` | |
219 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
220 | + - Description: save rpc inform. | |
221 | + | |
222 | + | |
223 | +### 2023-08-09 | |
224 | +- Modified file: `AbstractRpcController.java` | |
225 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
226 | + - Description: change rpc command | |
227 | + | |
228 | +### 2023-09-14 | |
229 | +- Modified file: `AlarmController.java` | |
230 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
231 | + - Description: Add batch clearing of alarms and batch confirmation of alarms | |
232 | + | |
233 | +### 2023-12-05 | |
234 | +- Modified file: `AlarmConditionKeyType.java` | |
235 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
236 | + - Description: extend alarm condition type DEVICE_EVENT. | |
237 | +- Modified file: `TbMsgType.java` | |
238 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
239 | + - Description: function device event. | |
240 | + | |
241 | +### 2024-02-07 | |
242 | +- Modified file: `DeviceProfileService.java`、`DeviceProfileServiceImpl.java`、`DeviceServiceImpl.java` | |
243 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
244 | + - Description: extend deviceprofile create method. add function for tcp transport. | |
245 | +- Modified file: `DeviceTransportConfiguration.java` | |
246 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
247 | + - Description: extend transport protocol for TCP and GBT28181. | |
248 | + | |
249 | +### 2024-06-05 | |
250 | +- Modified file: `msa/black-box-tests/pom.xml` | |
251 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
252 | + - Description: Add tcp gbt28181 dependency | |
253 | +- Modified file: `msa/transport/pom.xml` | |
254 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
255 | + - Description: Add tcp gbt28181 model | |
256 | +- Modified file: `schema-entities.sql` | |
257 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
258 | + - Description: add is_data_combination column | |
259 | +- Modified file: `RuleChainController.java` | |
260 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
261 | + - Description: | |
262 | + - The conversion script for deleting rule chains when deleting device configurations. | |
263 | + - When calling script testing, filter the output data by parameters to see if it contains metadata. | |
264 | +- Modified file: `AssetBulkImportService.java` | |
265 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
266 | + - Description: Batch add device adjustment | |
267 | +- Modified file: `DeviceBulkImportService.java` | |
268 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
269 | + - Description: | |
270 | + - Batch add device adjustment. | |
271 | + - Improve the extension information of the device and add the association between gateway and gateway sub devices. | |
272 | +- Modified file: `EdgeBulkImportService.java`、`AbstractBulkImportService.java` | |
273 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
274 | + - Description: Batch import adds thingskit parameters | |
275 | +- Modified file: `DefaultTbMailConfigTemplateService.java` | |
276 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
277 | + - Description: Failed to load mail_ config_templates.json in the environment where the project is running with a jar package | |
278 | +- Modified file: `MockJsInvokeService.java` | |
279 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
280 | + - Description: Add unit testing | |
281 | +- Modified file: `DeviceProfileData.java` | |
282 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
283 | + - Description: extend method for thingsmods. | |
284 | +- Modified file: `TbClusterService.java` | |
285 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
286 | + - Description: extend deviceprofile create method. | |
287 | +- Modified file: `DeviceProfileDao.java`、`JpaDeviceProfileDao.java`、`DeviceProfileRepository.java` | |
288 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
289 | + - Description: add function for tcp transport. | |
290 | +- Modified file: `DeviceProfileData.java` | |
291 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
292 | + - Description: extend method for thingsmods. | |
293 | +- Modified file: `DeviceProfileEntity.java` | |
294 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
295 | + - Description: extend deviceprofile fileds, example: isDataCombination. | |
296 | +- Modified file: `Authority.java` | |
297 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
298 | + - Description: extend account role:PLATFORM_USER、COMMON_TENANT、OPENAPI_USER. | |
299 | +- Modified file: `BulkImportRequest.java` | |
300 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
301 | + - Description: add device info TkDeviceMapping. | |
302 | +- Modified file: `ScriptType.java` | |
303 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
304 | + - Description: extend script type for transport. | |
305 | +- Modified file: `AbstractJsInvokeService.java` | |
306 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
307 | + - Description: javascript for transport service tcp. | |
308 | +- Modified file: `AbstractScriptInvokeService.java`、`ScriptInvokeService.java` | |
309 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
310 | + - Description: refact javascript method eval. | |
311 | + | |
312 | + | |
313 | +### 2024-07-01 | |
314 | +- Modified file: `DefaultDataUpdateService.java` | |
315 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
316 | + - Description: Restore 3.5.1 Edge Migration Events | |
317 | + | |
318 | +### 2024-08-19 | |
319 | +- Modified file: `common/pom.xml` | |
320 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
321 | + - Description: Add spring-boot-maven-plugin plugin | |
322 | +- Modified file: `edge_root_rule_chain.json` | |
323 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
324 | + - Description: Add Yunteng alarm notification node | |
325 | +- Modified file: `schema-views-and-functions.sql` | |
326 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
327 | + - Description: drop view device_info_view and change device status | |
328 | +- Modified file: `schema_update.sql` | |
329 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
330 | + - Description: add is_data_combination default value | |
331 | +- Modified files: `AppActor.java`、`TenantActor.java`、`DefaultTbCoreConsumerService.java` | |
332 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
333 | + - Description: add edge log | |
334 | +- Modified file: `EdgeController.java` | |
335 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
336 | + - Description: | |
337 | + - change edge active status. | |
338 | + - set Error Result i18n. | |
339 | +- Modified file: `BaseDeviceMsgConstructor.java` | |
340 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
341 | + - Description: Adjust the way JsonNode converts String | |
342 | +- Modified files: `AssetProfilesEdgeEventFetcher.java`、`AssetsEdgeEventFetcher.java`、`BasePageableEdgeEventFetcher.java`、`BaseUsersEdgeEventFetcher.java`、`BaseWidgetsBundlesEdgeEventFetcher.java`、`BaseWidgetTypesEdgeEventFetcher.java`、`DashboardsEdgeEventFetcher.java`、`DeviceProfilesEdgeEventFetcher.java`、`DevicesEdgeEventFetcher.java`、`EntityViewsEdgeEventFetcher.java`、`OtaPackagesEdgeEventFetcher.java`、`QueuesEdgeEventFetcher.java`、`TenantEdgeEventFetcher.java`、`TenantResourcesEdgeEventFetcher.java` | |
343 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
344 | + - Description: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
345 | +- Modified file: `RuleChainsEdgeEventFetcher.java` | |
346 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
347 | + - Description: | |
348 | + - Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
349 | + - EdgeEventActionType ADDED change to ASSIGNED_TO_EDGE | |
350 | +- Modified file: `EdgeGrpcService.java` | |
351 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
352 | + - Description: | |
353 | + - Add @DependsOn ThingsKitInitConfiguration for class | |
354 | + - Modify the edge state of the database | |
355 | +- Modified file: `BaseEdgeProcessor.java` | |
356 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
357 | + - Description: If the edge stores data offline in the database, it is convenient for synchronization during the next startup | |
358 | +- Modified file: `EdgeGrpcSession.java` | |
359 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
360 | + - Description: | |
361 | + - Add ThingsKit and new tables, cloud edge collaborative upstream and downstream data processing logic. | |
362 | + - Add edge lifecycle records | |
363 | +- Modified file: `EdgeSyncCursor.java` | |
364 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
365 | + - Description: Add manual synchronization and connection synchronization of ThingsKit cloud to edge database table logic | |
366 | +- Modified file: `DefaultEdgeNotificationService.java` | |
367 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
368 | + - Description: Add notification logic for synchronizing ThingsKit database tables from the cloud to the edge | |
369 | +- Modified file: `EdgeContextComponent.java` | |
370 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
371 | + - Description: Provide services and repositories required for ThingsKit cloud synchronization to the edge end | |
372 | +- Modified file: `DefaultTbDeviceProfileService.java` | |
373 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
374 | + - Description: | |
375 | + - Restricting TCP device configuration to only import physical model attributes | |
376 | + - Internationalization of abnormal message content | |
377 | +- Modified file: `DefaultTbDeviceService.java` | |
378 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
379 | + - Description: Invalidate cache when saving and deleting devices | |
380 | +- Modified file: `EdgeInfo.java` | |
381 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
382 | + - Description: add filed active for edge status. | |
383 | +- Modified file: `EdgeEventType.java` | |
384 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
385 | + - Description: extend more EdgeEventType for business. | |
386 | +- Modified file: `EntityIdFactory.java` | |
387 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
388 | + - Description: | |
389 | + - extend entity type for SCENE_ACT. | |
390 | + - cache uuid. | |
391 | +- Modified file: `EntityIdSerializer.java` | |
392 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
393 | + - Description: fix id null exception. | |
394 | +- Modified file: `edge.proto` | |
395 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
396 | + - Description: message for TkUpdateMsg and TkRpcCallMsg. | |
397 | +- Modified file: `AbstractDeviceEntity.java`、`DeviceInfoEntity.java`、`AbstractDeviceEntity.java``DeviceRepository.java` | |
398 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
399 | + - Description: extend device infor, example:organizationId and so on. | |
400 | + | |
401 | +### 2024-09-05 | |
402 | +- Modified file: `TelemetryController.java` | |
403 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
404 | + - Description: Provide OpenApi to query device historical data | |
405 | +- Modified file: `EdgeInfo.java` | |
406 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
407 | + - Description: add filed needSaveRuleNode. | |
408 | + | |
409 | +### 2024-09-06 | |
410 | +- Modified file: `DeviceProfileController.java` | |
411 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
412 | + - Description: Rule chain for batch updating device configuration | |
413 | + | |
414 | +### 2024-09-09 | |
415 | +- Modified file: `JwtTokenAuthenticationProcessingFilter.java` | |
416 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
417 | + - Description: Add i18n internationalization interceptor | |
418 | +- Modified file: `EdgeInfo.java` | |
419 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
420 | + - Description: add filed needSaveRuleNode. | |
421 | +- Modified file: `EdgeServiceImpl.java`、`DeviceCredentialsDataValidator.java`、`RuleChainDataValidator.java` | |
422 | + - Modified by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
423 | + - Description: message for i18n. | |
424 | +### 扩展pom.xml文件 | |
\ No newline at end of file | ... | ... |
NOTICE
0 → 100644
1 | +NOTICE | |
2 | +Chengdu Yunteng Wuzhou Technology Co., Ltd. (hereinafter referred to as "the Company") has developed the ThingsKit product, which includes the following third-party software: | |
3 | +1. ThingsBoard | |
4 | + ○ Copyright: Copyright © 2016-2024 ThingsBoard, Inc. | |
5 | + ○ License: Apache License 2.0 | |
6 | + ○ License Link: http://www.apache.org/licenses/LICENSE-2.0 | |
7 | + ○ Description: ThingsBoard is an open-source IoT platform used for data collection, processing, and visualization. | |
8 | + ○ Website: https://thingsboard.io/ | |
9 | + ○ Open-source address: https://github.com/thingsboard/thingsboard | |
10 | + | |
11 | +The Company respects and complies with the Apache License 2.0 of ThingsBoard. The source code and related documentation for ThingsBoard can be obtained from its official website. The Company has made certain modifications and enhancements to ThingsBoard to meet the specific needs of the ThingsKit product. | |
12 | +Please note that the original copyright notice and license statement for ThingsBoard are included in the ThingsKit product. Modifications to ThingsBoard have been clearly indicated in the relevant source code files. | |
13 | + | |
14 | +Chengdu Yunteng Wuzhou Technology Co., Ltd. | |
15 | +2021-06-20 | |
16 | + | |
17 | + | |
18 | +Additional Statement: | |
19 | +● The Company’s modifications and enhancements to ThingsBoard also adhere to the Apache License 2.0. | |
20 | +● The Company does not provide any warranties for the original code of ThingsBoard or the Company's modifications, including but not limited to warranties of merchantability, fitness for a particular purpose, or non-infringement. | |
21 | +● The Company encourages users to follow the norms of the open-source community, respect intellectual property rights, and comply with the Apache License 2.0 when distributing the ThingsKit product. | |
22 | + | |
23 | +NOTICE | |
24 | +成都云腾五洲科技有限公司(以下简称“本公司”)开发的ThingsKit产品包含以下第三方软件: | |
25 | +1. ThingsBoard | |
26 | + ○ 版权所有:Copyright © 2016-2024 ThingsBoard, Inc. | |
27 | + ○ 许可证:Apache License 2.0 | |
28 | + ○ 许可证链接:http://www.apache.org/licenses/LICENSE-2.0 | |
29 | + ○ 描述:ThingsBoard是一个开源物联网平台,用于数据的收集、处理和可视化。 | |
30 | + ○ 网址:https://thingsboard.io/ | |
31 | + ○ 开源地址:https://github.com/thingsboard/thingsboard | |
32 | + | |
33 | +本公司尊重并遵守ThingsBoard的Apache License 2.0协议。ThingsBoard的源代码和相关文档可在其官方网站上获取。本公司对ThingsBoard进行了部分修改和增强,以满足ThingsKit产品的特定需求。 | |
34 | +请注意,ThingsBoard的原始版权声明和许可证声明已包含在ThingsKit产品中。对ThingsBoard的修改已在相应的源代码文件中进行了明确标注。 | |
35 | + | |
36 | + | |
37 | +成都云腾五洲科技有限公司 | |
38 | +2021-06-20 | |
39 | + | |
40 | +附加声明: | |
41 | +● 本公司对ThingsBoard的修改和增强部分同样遵循Apache License 2.0协议。 | |
42 | +● 本公司不对ThingsBoard的原始代码或本公司的修改部分提供任何形式的保证,包括但不限于适销性、特定用途的适用性或非侵权性的保证。 | |
43 | +● 本公司鼓励用户遵循开源社区的规范,尊重知识产权,并在分发ThingsKit产品时遵循Apache License 2.0协议。 | |
\ No newline at end of file | ... | ... |
... | ... | @@ -15,7 +15,7 @@ |
15 | 15 | |
16 | 16 | ## ThingsKit简介 |
17 | 17 | |
18 | -ThingsKit是面向中小型企业开箱即用的低代码物联网平台,提供N+1+N(N个终端产品+1个物联网平台+N个行业方案)的产品服务矩阵,帮助用户快速搭建稳定可靠的物联网系统。ThingsKit物联网平台架构具备边云一体化、低代码、模板化等特性,让企业只需少量的技术投入,就能缩短物联网项目的交付周期,为企业节约大量的时间及人力成本。 | |
18 | +ThingsKit是一个开箱即用的物联网平台,基于ThingsBoard社区版(ThingsBoard Community Edition)开发,它可以帮助您快速实现物联网的数据收集、分析处理、可视化和设备管理,支持通过行业标准物联网协议(MQTT、TCP、UDP、CoAP和 HTTP)实现设备连接,帮助您屏蔽物联网的复杂特性,让您专注业务应用开发,缩短物联网项目的交付周期。 | |
19 | 19 | |
20 | 20 |  |
21 | 21 | |
... | ... | @@ -105,52 +105,53 @@ ThingsKit迚ゥ閨皮ス大ケウ蜿ー蜿ッ謠蝉セ幄キィ荳榊酔隶セ螟柱謨ー謐ョ貅千噪騾夂畑PaaS譛榊苅 |
105 | 105 | |
106 | 106 | ### 后端 |
107 | 107 | |
108 | -| 序号 | 技术名 | 版本 | 说明 | | |
109 | -| ---- | ----------------------------- |--------------| ------------------------------------------------------------ | | |
110 | -| 1 | java jdk | 11.0.2 | 基于java开发 | | |
111 | -| 2 | maven | 3.8.4 | 项目编译管理工具 | | |
112 | -| 3 | gradle | 6.6.1 | 项目编译管理工具 | | |
113 | -| 4 | guava | 31.1-jre | 对Java API的补充,对Java开发中常用功能进行更优雅的实现。 | | |
114 | -| 5 | grpc | 1.42.1 | google开发的一个高性能、通用的开源RPC框架 | | |
115 | -| 6 | lombok | 1.18.18 | java实体构建工具。 | | |
116 | -| 7 | gson | 2.9.0 | Java对象序列化为JSON的工具。 | | |
117 | -| 8 | jackson | 2.13.4 | Java对象序列化为JSON的工具。 | | |
118 | -| 9 | protobuf | 3.21.9 | 结构化数据的序列化工具。用于物联网设备的数据传输。 | | |
119 | -| 10 | slf4j | 1.7.32 | 日志管理工具 | | |
120 | -| 11 | log4j | 2.17.1 | 日志管理工具 | | |
121 | -| 12 | logback | 1.2.10 | 日志管理工具 | | |
122 | -| 13 | spring-boot | 2.7.10 | 简化spring配置的开发插件 | | |
123 | -| 14 | spring-security | 5.7.7 | 基于Spring的企业应用系统提供声明式的安全访问控制解决方案的安全框架。 | | |
124 | -| 15 | jjwt | 0.7.0 | 访问令牌管理工具。 | | |
125 | -| 16 | minio | 8.3.1 | 对象存储服务器 | | |
126 | -| 17 | spring-data-redis | 2.7.10 | 缓存工具。微服务模式推荐使用redis缓存。 | | |
127 | -| 18 | jedis | 3.8.0 | redis连接池管理工具 | | |
128 | -| 19 | caffeine | 2.6.1 | 缓存工具。 | | |
129 | -| 20 | PostgreSQL | pg14 | 数据存储。 | | |
130 | -| 21 | timescalDB | 2.1.0 | PostgreSQL的时序数据库插件。 | | |
131 | -| 22 | Cassandra | 4.15.0 | 数据存储。 | | |
132 | -| 23 | elasticsearch | 5.0.2 | 数据存储。 | | |
133 | -| 24 | Zookeeper | 3.5.5 | 微服务部署的服务管理中心。 | | |
134 | -| 25 | Kafka | 3.2.0 | 消息中间件,可选用。 | | |
135 | -| 26 | RabbitMQ | 4.8.0 | 消息中间件,可选用。 | | |
136 | -| 27 | json-schema-validator | 2.2.6 | 表单数据校验 | | |
137 | -| 28 | validation-api | 2.0.1 | 表单数据校验 | | |
138 | -| 29 | antisamy | 1.7.2 | 安全防御工具 | | |
139 | -| 30 | micrometer | 1.9.0 | 服务性能监控 | | |
140 | -| 31 | netty | 4.1.91.Final | 提供异步的、事件驱动的网络应用程序框架和工具。 | | |
141 | -| 32 | netty-codec-mqtt | 4.1.91.Final | mqtt协议处理工具 | | |
142 | -| 33 | netty-handler | 4.1.91.Final | 数据加工处理器 | | |
143 | -| 34 | commons-codec | 1.15 | 加解密工具 | | |
144 | -| 35 | snmp4j | 2.8.5 | 简单网络管理协议管理工具 | | |
145 | -| 36 | Zookeeper | 3.9.2 | 高度可靠的分布式协调。 | | |
146 | -| 37 | freemarker | 2.3.30 | 模板引擎 | | |
147 | -| 38 | spring-boot-starter-websocket | 2.7.10 | 实时通信 | | |
148 | -| 39 | quartz | 2.3.2 | 定时任务相关工具 | | |
149 | -| 40 | mybatis-plus-boot-starter | 3.5.3.2 | 持久层管理工具 | | |
150 | -| 41 | spring-boot-starter-data-jpa | 2.7.10 | 持久层管理工具 | | |
151 | -| 42 | delight-nashorn-sandbox | 0.2.1 | js脚本解析引擎。 | | |
152 | -| 43 | metrics-jmx | 4.0.5 | 服务状态监控 | | |
153 | -| 44 | javax.mail | 2.0.1 | 邮件推送服务 | | |
108 | +| 序号 | 技术名 | 版本 | 说明 | | |
109 | +|----|-------------------------------|--------------| ------------------------------------------------------------ | | |
110 | +| 0 | ThingsBoard | v3.6.4 | ThingsBoard是一个开源物联网平台,用于数据的收集、处理和可视化。 | | |
111 | +| 1 | java jdk | 11.0.2 | 基于java开发 | | |
112 | +| 2 | maven | 3.8.4 | 项目编译管理工具 | | |
113 | +| 3 | gradle | 6.6.1 | 项目编译管理工具 | | |
114 | +| 4 | guava | 31.1-jre | 对Java API的补充,对Java开发中常用功能进行更优雅的实现。 | | |
115 | +| 5 | grpc | 1.42.1 | google开发的一个高性能、通用的开源RPC框架 | | |
116 | +| 6 | lombok | 1.18.18 | java实体构建工具。 | | |
117 | +| 7 | gson | 2.9.0 | Java对象序列化为JSON的工具。 | | |
118 | +| 8 | jackson | 2.13.4 | Java对象序列化为JSON的工具。 | | |
119 | +| 9 | protobuf | 3.21.9 | 结构化数据的序列化工具。用于物联网设备的数据传输。 | | |
120 | +| 10 | slf4j | 1.7.32 | 日志管理工具 | | |
121 | +| 11 | log4j | 2.17.1 | 日志管理工具 | | |
122 | +| 12 | logback | 1.2.10 | 日志管理工具 | | |
123 | +| 13 | spring-boot | 2.7.10 | 简化spring配置的开发插件 | | |
124 | +| 14 | spring-security | 5.7.7 | 基于Spring的企业应用系统提供声明式的安全访问控制解决方案的安全框架。 | | |
125 | +| 15 | jjwt | 0.7.0 | 访问令牌管理工具。 | | |
126 | +| 16 | minio | 8.3.1 | 对象存储服务器 | | |
127 | +| 17 | spring-data-redis | 2.7.10 | 缓存工具。微服务模式推荐使用redis缓存。 | | |
128 | +| 18 | jedis | 3.8.0 | redis连接池管理工具 | | |
129 | +| 19 | caffeine | 2.6.1 | 缓存工具。 | | |
130 | +| 20 | PostgreSQL | pg14 | 数据存储。 | | |
131 | +| 21 | timescalDB | 2.1.0 | PostgreSQL的时序数据库插件。 | | |
132 | +| 22 | Cassandra | 4.15.0 | 数据存储。 | | |
133 | +| 23 | elasticsearch | 5.0.2 | 数据存储。 | | |
134 | +| 24 | Zookeeper | 3.5.5 | 微服务部署的服务管理中心。 | | |
135 | +| 25 | Kafka | 3.2.0 | 消息中间件,可选用。 | | |
136 | +| 26 | RabbitMQ | 4.8.0 | 消息中间件,可选用。 | | |
137 | +| 27 | json-schema-validator | 2.2.6 | 表单数据校验 | | |
138 | +| 28 | validation-api | 2.0.1 | 表单数据校验 | | |
139 | +| 29 | antisamy | 1.7.2 | 安全防御工具 | | |
140 | +| 30 | micrometer | 1.9.0 | 服务性能监控 | | |
141 | +| 31 | netty | 4.1.91.Final | 提供异步的、事件驱动的网络应用程序框架和工具。 | | |
142 | +| 32 | netty-codec-mqtt | 4.1.91.Final | mqtt协议处理工具 | | |
143 | +| 33 | netty-handler | 4.1.91.Final | 数据加工处理器 | | |
144 | +| 34 | commons-codec | 1.15 | 加解密工具 | | |
145 | +| 35 | snmp4j | 2.8.5 | 简单网络管理协议管理工具 | | |
146 | +| 36 | Zookeeper | 3.9.2 | 高度可靠的分布式协调。 | | |
147 | +| 37 | freemarker | 2.3.30 | 模板引擎 | | |
148 | +| 38 | spring-boot-starter-websocket | 2.7.10 | 实时通信 | | |
149 | +| 39 | quartz | 2.3.2 | 定时任务相关工具 | | |
150 | +| 40 | mybatis-plus-boot-starter | 3.5.3.2 | 持久层管理工具 | | |
151 | +| 41 | spring-boot-starter-data-jpa | 2.7.10 | 持久层管理工具 | | |
152 | +| 42 | delight-nashorn-sandbox | 0.2.1 | js脚本解析引擎。 | | |
153 | +| 43 | metrics-jmx | 4.0.5 | 服务状态监控 | | |
154 | +| 44 | javax.mail | 2.0.1 | 邮件推送服务 | | |
154 | 155 | |
155 | 156 | ### 前端 |
156 | 157 | ... | ... |
... | ... | @@ -15,6 +15,15 @@ |
15 | 15 | limitations under the License. |
16 | 16 | |
17 | 17 | --> |
18 | +<!-- | |
19 | + This file has been modified from its original version. | |
20 | + Source: ThingsBoard Community Edition | |
21 | + Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
22 | + Modification date: 2022-10-22 | |
23 | + Description of changes: | |
24 | + Add GBT28181、TCP model | |
25 | + Add packaging configuration | |
26 | +--> | |
18 | 27 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
19 | 28 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
20 | 29 | <modelVersion>4.0.0</modelVersion> | ... | ... |
... | ... | @@ -14,6 +14,12 @@ |
14 | 14 | -- limitations under the License. |
15 | 15 | -- |
16 | 16 | |
17 | +-- This file has been modified from its original version. | |
18 | +-- Source: ThingsBoard Community Edition | |
19 | +-- Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | +-- Modification date: 2024-06-05 | |
21 | +-- Description of changes: add is_data_combination column | |
22 | + | |
17 | 23 | CREATE TABLE IF NOT EXISTS tb_schema_settings |
18 | 24 | ( |
19 | 25 | schema_version bigint NOT NULL, | ... | ... |
... | ... | @@ -14,7 +14,13 @@ |
14 | 14 | -- limitations under the License. |
15 | 15 | -- |
16 | 16 | |
17 | +-- This file has been modified from its original version. | |
18 | +-- Source: ThingsBoard Community Edition | |
19 | +-- Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | +-- Modification date: 2024-08-19 | |
21 | +-- Description of changes: drop view device_info_view and change device status | |
17 | 22 | |
23 | +--Modification date: 2024-08-19 by Chengdu Yunteng Wuzhou Technology Co., Ltd drop view device_info_view | |
18 | 24 | DROP VIEW IF EXISTS device_info_view CASCADE; |
19 | 25 | DROP VIEW IF EXISTS device_info_active_attribute_view CASCADE; |
20 | 26 | CREATE OR REPLACE VIEW device_info_active_attribute_view AS | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | -- See the License for the specific language governing permissions and |
14 | 14 | -- limitations under the License. |
15 | 15 | -- |
16 | +-- This file has been modified from its original version. | |
17 | +-- Source: ThingsBoard Community Edition | |
18 | +-- Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
19 | +-- Modification date: 2024-08-19 | |
20 | +-- Description of changes: add is_data_combination default value | |
21 | + | |
22 | +--Modification date: 2024-08-19 by Chengdu Yunteng Wuzhou Technology Co., Ltd add is_data_combination default value | |
16 | 23 | |
17 | 24 | -- NOTIFICATIONS UPDATE START |
18 | 25 | ALTER TABLE device_profile ADD is_data_combination boolean DEFAULT false; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2022-06-29 | |
21 | + * Description of changes: Add scanning directory | |
22 | + */ | |
16 | 23 | package org.thingsboard.server; |
17 | 24 | |
18 | 25 | import lombok.extern.slf4j.Slf4j; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2023-07-11 | |
21 | + * Description of changes: provide tkdevice service | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.actors; |
17 | 24 | |
18 | 25 | import com.google.common.util.concurrent.FutureCallback; |
... | ... | @@ -749,7 +756,9 @@ public class ActorSystemContext { |
749 | 756 | } |
750 | 757 | |
751 | 758 | |
752 | - //Thingskit function | |
759 | + //Source: ThingsBoard Community Edition | |
760 | + //The code has been modified | |
761 | + //Modification date: 2023-07-11 by Chengdu Yunteng Wuzhou Technology Co., Ltd provide tkdevice service | |
753 | 762 | @Autowired |
754 | 763 | @Getter |
755 | 764 | private TkCommonDeviceService tkDeviceService; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: add edge log | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.actors.app; |
17 | 24 | |
18 | 25 | import lombok.extern.slf4j.Slf4j; |
... | ... | @@ -207,7 +214,11 @@ public class AppActor extends ContextAwareActor { |
207 | 214 | () -> true)); |
208 | 215 | } |
209 | 216 | |
217 | + //Source: ThingsBoard Community Edition | |
218 | + //The code has been modified | |
210 | 219 | private void onToEdgeSessionMsg(EdgeSessionMsg msg) { |
220 | + //Modification date: 2024-08-19 by Chengdu Yunteng Wuzhou Technology Co., Ltd | |
221 | + //add edge lo | |
211 | 222 | if(msg instanceof EdgeEventUpdateMsg) { |
212 | 223 | log.info("云边同步 AppActor get msg : EdgeId= {}",((EdgeEventUpdateMsg) msg).getEdgeId()); |
213 | 224 | } | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2023-04-25 | |
21 | + * Description of changes: send rpc command to sensor | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.actors.device; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.JsonNode; |
... | ... | @@ -262,10 +269,11 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso |
262 | 269 | return true; |
263 | 270 | } |
264 | 271 | } |
265 | - | |
272 | + //Source: ThingsBoard Community Edition | |
273 | + //The code has been modified | |
266 | 274 | private void createRpc(ToDeviceRpcRequest request, RpcStatus status) { |
267 | - // Thingskit function | |
268 | - ObjectNode additional = (ObjectNode) JacksonUtil.toJsonNode(request.getAdditionalInfo()); | |
275 | + //Modification date: 2023-04-25 by Chengdu Yunteng Wuzhou Technology Co., Ltd send rpc command to sensor | |
276 | + ObjectNode additional = (ObjectNode) JacksonUtil.toJsonNode(request.getAdditionalInfo()); | |
269 | 277 | DeviceId saveDeviceId = deviceId; |
270 | 278 | if (additional.has(FastIotConstants.Rpc.TARGET_ID)) { |
271 | 279 | saveDeviceId = | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2023-07-11 | |
21 | + * Description of changes: provide tkdevice service | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.actors.ruleChain; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.node.ArrayNode; |
... | ... | @@ -988,7 +995,9 @@ class DefaultTbContext implements TbContext { |
988 | 995 | return failureMessage; |
989 | 996 | } |
990 | 997 | |
991 | - //Thingskit function | |
998 | + //Source: ThingsBoard Community Edition | |
999 | + //The code has been modified | |
1000 | + //Modification date: 2023-07-11 by Chengdu Yunteng Wuzhou Technology Co., Ltd provide tkdevice service | |
992 | 1001 | @Override |
993 | 1002 | public TkCommonDeviceService getTkCommonDeviceService() { |
994 | 1003 | return mainCtx.getTkDeviceService(); | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: add edge log | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.actors.tenant; |
17 | 24 | |
18 | 25 | import lombok.extern.slf4j.Slf4j; |
... | ... | @@ -310,6 +317,9 @@ public class TenantActor extends RuleChainManagerActor { |
310 | 317 | () -> true); |
311 | 318 | } |
312 | 319 | |
320 | + //Source: ThingsBoard Community Edition | |
321 | + //The code has been modified | |
322 | + //Modification date: 2024-08-19 by Chengdu Yunteng Wuzhou Technology Co., Ltd add edge log | |
313 | 323 | private void onToEdgeSessionMsg(EdgeSessionMsg msg) { |
314 | 324 | if(msg instanceof EdgeEventUpdateMsg) { |
315 | 325 | log.info("云边同步 TenantActor get msg : EdgeId= "+ ((EdgeEventUpdateMsg) msg).getEdgeId()); | ... | ... |
... | ... | @@ -13,6 +13,16 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2022-01-20 | |
21 | + * Description of changes: | |
22 | + * 1、Allow mobile verification code login | |
23 | + * 2、Adding yt URL does not require interception | |
24 | + * 3、add i18 Interceptor | |
25 | + */ | |
16 | 26 | package org.thingsboard.server.config; |
17 | 27 | |
18 | 28 | import org.springframework.beans.factory.annotation.Autowired; |
... | ... | @@ -77,7 +87,6 @@ public class ThingsboardSecurityConfiguration { |
77 | 87 | public static final String DEVICE_API_ENTRY_POINT = "/api/v1/**"; |
78 | 88 | public static final String FORM_BASED_LOGIN_ENTRY_POINT = "/api/auth/login"; |
79 | 89 | |
80 | - //Thingskit function | |
81 | 90 | public static final String CODE_BASED_LOGIN_ENTRY_POINT = "/api/yt/auth/code/login"; |
82 | 91 | |
83 | 92 | @Value("${file.storage.local.staticUrl}") |
... | ... | @@ -148,6 +157,9 @@ public class ThingsboardSecurityConfiguration { |
148 | 157 | filter.setAuthenticationManager(this.authenticationManager); |
149 | 158 | return filter; |
150 | 159 | } |
160 | + //Source: ThingsBoard Community Edition | |
161 | + //The code has been modified | |
162 | + //Modification date: 2022-01-20 by Chengdu Yunteng Wuzhou Technology Co., Ltd Allow mobile verification code login | |
151 | 163 | |
152 | 164 | @Bean |
153 | 165 | protected CodeLoginProcessingFilter buildSmsCodeLoginProcessingFilter() throws Exception{ |
... | ... | @@ -162,16 +174,18 @@ public class ThingsboardSecurityConfiguration { |
162 | 174 | filter.setAuthenticationManager(this.authenticationManager); |
163 | 175 | return filter; |
164 | 176 | } |
165 | - | |
177 | + //Source: ThingsBoard Community Edition | |
178 | + //The code has been modified | |
166 | 179 | protected JwtTokenAuthenticationProcessingFilter buildJwtTokenAuthenticationProcessingFilter() throws Exception { |
167 | 180 | List<String> pathsToSkip = new ArrayList<>(Arrays.asList(NON_TOKEN_BASED_AUTH_ENTRY_POINTS)); |
168 | 181 | pathsToSkip.addAll(Arrays.asList(WS_ENTRY_POINT, TOKEN_REFRESH_ENTRY_POINT, FORM_BASED_LOGIN_ENTRY_POINT, |
169 | 182 | PUBLIC_LOGIN_ENTRY_POINT, DEVICE_API_ENTRY_POINT, WEBJARS_ENTRY_POINT, MAIL_OAUTH2_PROCESSING_ENTRY_POINT, |
170 | 183 | DEVICE_CONNECTIVITY_CERTIFICATE_DOWNLOAD_ENTRY_POINT)); |
171 | - //Thingskit function | |
184 | + //Modification date: 2022-04-22 by Chengdu Yunteng Wuzhou Technology Co., Ltd Adding yt URL does not require interception | |
172 | 185 | pathsToSkip.addAll(Arrays.asList(YT_NOT_AUTH_API)); |
173 | 186 | pathsToSkip.add(ossStaticUrl); |
174 | 187 | SkipPathRequestMatcher matcher = new SkipPathRequestMatcher(pathsToSkip, TOKEN_BASED_AUTH_ENTRY_POINT); |
188 | + //Modification date: 2024-09-09 by Chengdu Yunteng Wuzhou Technology Co., Ltd add i18 Interceptor | |
175 | 189 | JwtTokenAuthenticationProcessingFilter filter |
176 | 190 | = new JwtTokenAuthenticationProcessingFilter(failureHandler, jwtHeaderTokenExtractor, matcher,myI18nInterceptor); |
177 | 191 | filter.setAuthenticationManager(this.authenticationManager); |
... | ... | @@ -214,7 +228,9 @@ public class ThingsboardSecurityConfiguration { |
214 | 228 | .sessionManagement().disable(); |
215 | 229 | return http.build(); |
216 | 230 | } |
217 | - | |
231 | + //Source: ThingsBoard Community Edition | |
232 | + //The code has been modified | |
233 | + //Modification date: 2024-08-19 by Chengdu Yunteng Wuzhou Technology Co., Ltd Allow mobile verification code login | |
218 | 234 | @Bean |
219 | 235 | SecurityFilterChain filterChain(HttpSecurity http) throws Exception { |
220 | 236 | http.headers().cacheControl().and().frameOptions().disable() | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2023-08-09 | |
21 | + * Description of changes: change rpc command | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.controller; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.JsonNode; |
... | ... | @@ -74,11 +81,14 @@ public abstract class AbstractRpcController extends BaseController { |
74 | 81 | @Value("${server.rest.server_side_rpc.default_timeout:10000}") |
75 | 82 | protected long defaultTimeout; |
76 | 83 | |
84 | + //Source: ThingsBoard Community Edition | |
85 | + //The code has been modified | |
77 | 86 | protected DeferredResult<ResponseEntity> handleDeviceRPCRequest(boolean oneWay, DeviceId deviceId, String requestBody, HttpStatus timeoutStatus, HttpStatus noActiveConnectionStatus) throws ThingsboardException { |
78 | 87 | try { |
79 | 88 | JsonNode rpcRequestBody = JacksonUtil.toJsonNode(requestBody); |
80 | 89 | |
81 | - //Thingskit function | |
90 | + | |
91 | + //Modification date: 2023-08-09 by Chengdu Yunteng Wuzhou Technology Co., Ltd change rpc command | |
82 | 92 | JsonNode paramJson = rpcRequestBody.get("params"); |
83 | 93 | String paramStr =paramJson.isTextual()?paramJson.asText():JacksonUtil.toString(paramJson); |
84 | 94 | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2023-09-14 | |
21 | + * Description of changes: Add batch clearing of alarms and batch confirmation of alarms | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.controller; |
17 | 24 | |
18 | 25 | import io.swagger.annotations.Api; | ... | ... |
... | ... | @@ -13,6 +13,16 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2021-12-08 | |
21 | + * Description of changes: | |
22 | + * 1、Internationalization of messages intercepted by anomaly interceptors | |
23 | + * 2、Get tenant's public ID and set cache | |
24 | + * 3、Change the exception prompt information to Chinese | |
25 | + */ | |
16 | 26 | package org.thingsboard.server.controller; |
17 | 27 | |
18 | 28 | import com.fasterxml.jackson.databind.node.ObjectNode; | ... | ... |
... | ... | @@ -13,6 +13,17 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2021-12-28 | |
21 | + * Description of changes: | |
22 | + * 1、Batch modify the device configuration of devices | |
23 | + * 2、Batch set devices as private | |
24 | + * 3、Batch set devices as public | |
25 | + * 4、Batch import devices through files | |
26 | + */ | |
16 | 27 | package org.thingsboard.server.controller; |
17 | 28 | |
18 | 29 | import com.google.common.util.concurrent.FutureCallback; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-09-06 | |
21 | + * Description of changes:Rule chain for batch updating device configuration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.controller; |
17 | 24 | |
18 | 25 | import io.swagger.annotations.ApiOperation; | ... | ... |
1 | 1 | /** |
2 | 2 | * Copyright © 2016-2024 The Thingsboard Authors |
3 | - * <p> | |
3 | + * | |
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | * you may not use this file except in compliance with the License. |
6 | 6 | * You may obtain a copy of the License at |
7 | - * <p> | |
8 | - * http://www.apache.org/licenses/LICENSE-2.0 | |
9 | - * <p> | |
7 | + * | |
8 | + * http://www.apache.org/licenses/LICENSE-2.0 | |
9 | + * | |
10 | 10 | * Unless required by applicable law or agreed to in writing, software |
11 | 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
12 | 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: | |
22 | + * 1、change edge active status | |
23 | + * 2、set Error Result i18n | |
24 | + */ | |
16 | 25 | package org.thingsboard.server.controller; |
17 | 26 | |
18 | 27 | import com.google.common.util.concurrent.ListenableFuture; | ... | ... |
... | ... | @@ -13,6 +13,15 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2022-04-12 | |
21 | + * Description of changes: | |
22 | + * 1、Add paging parameters | |
23 | + * 2、add open api role authority send rpc command | |
24 | + */ | |
16 | 25 | package org.thingsboard.server.controller; |
17 | 26 | |
18 | 27 | import com.fasterxml.jackson.databind.JsonNode; | ... | ... |
... | ... | @@ -13,6 +13,15 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: | |
22 | + * 1、The conversion script for deleting rule chains when deleting device configurations | |
23 | + * 2、When calling script testing, filter the output data by parameters to see if it contains metadata | |
24 | + */ | |
16 | 25 | package org.thingsboard.server.controller; |
17 | 26 | |
18 | 27 | import com.fasterxml.jackson.core.JsonProcessingException; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-09-05 | |
21 | + * Description of changes: Provide OpenApi to query device historical data | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.controller; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.JsonNode; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2022-09-20 | |
21 | + * Description of changes: Translate the prompt content into Chinese | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.controller; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.JsonNode; | ... | ... |
... | ... | @@ -13,6 +13,16 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2022-03-08 | |
21 | + * Description of changes: | |
22 | + * 1、set character encoding is utf-8 | |
23 | + * 2、Add internationalization of exception returns in both Chinese and English | |
24 | + * 3、Add thingskit's exception capture | |
25 | + */ | |
16 | 26 | package org.thingsboard.server.exception; |
17 | 27 | |
18 | 28 | import lombok.extern.slf4j.Slf4j; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2023-02-01 | |
21 | + * Description of changes: Installing DataBase schema for thingskit | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.install; |
17 | 24 | |
18 | 25 | import lombok.extern.slf4j.Slf4j; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: Batch add device adjustment | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.asset; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.node.ObjectNode; | ... | ... |
... | ... | @@ -13,6 +13,15 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: | |
22 | + * 1、Batch add device adjustment | |
23 | + * 2、Improve the extension information of the device and add the association between gateway and gateway sub devices | |
24 | + */ | |
16 | 25 | package org.thingsboard.server.service.device; |
17 | 26 | |
18 | 27 | import com.fasterxml.jackson.databind.node.BooleanNode; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Add notification logic for synchronizing ThingsKit database tables from the cloud to the edge | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.node.ObjectNode; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: Batch import adds thingskit parameters | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.node.ObjectNode; | ... | ... |
1 | 1 | /** |
2 | 2 | * Copyright © 2016-2024 The Thingsboard Authors |
3 | - * <p> | |
3 | + * | |
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | * you may not use this file except in compliance with the License. |
6 | 6 | * You may obtain a copy of the License at |
7 | - * <p> | |
8 | - * http://www.apache.org/licenses/LICENSE-2.0 | |
9 | - * <p> | |
7 | + * | |
8 | + * http://www.apache.org/licenses/LICENSE-2.0 | |
9 | + * | |
10 | 10 | * Unless required by applicable law or agreed to in writing, software |
11 | 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
12 | 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Provide services and repositories required for ThingsKit cloud synchronization to the edge end | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge; |
17 | 24 | |
18 | 25 | import lombok.Data; | ... | ... |
1 | 1 | /** |
2 | 2 | * Copyright © 2016-2024 The Thingsboard Authors |
3 | - * <p> | |
3 | + * | |
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | * you may not use this file except in compliance with the License. |
6 | 6 | * You may obtain a copy of the License at |
7 | - * <p> | |
8 | - * http://www.apache.org/licenses/LICENSE-2.0 | |
9 | - * <p> | |
7 | + * | |
8 | + * http://www.apache.org/licenses/LICENSE-2.0 | |
9 | + * | |
10 | 10 | * Unless required by applicable law or agreed to in writing, software |
11 | 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
12 | 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: | |
22 | + * 1、add @DependsOn ThingsKitInitConfiguration for class | |
23 | + * 2、Modify the edge state of the database | |
24 | + */ | |
16 | 25 | package org.thingsboard.server.service.edge.rpc; |
17 | 26 | |
18 | 27 | import com.fasterxml.jackson.databind.node.ObjectNode; | ... | ... |
1 | 1 | /** |
2 | 2 | * Copyright © 2016-2024 The Thingsboard Authors |
3 | - * <p> | |
3 | + * | |
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | * you may not use this file except in compliance with the License. |
6 | 6 | * You may obtain a copy of the License at |
7 | - * <p> | |
8 | - * http://www.apache.org/licenses/LICENSE-2.0 | |
9 | - * <p> | |
7 | + * | |
8 | + * http://www.apache.org/licenses/LICENSE-2.0 | |
9 | + * | |
10 | 10 | * Unless required by applicable law or agreed to in writing, software |
11 | 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
12 | 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: | |
22 | + * Add ThingsKit and new tables, cloud edge collaborative upstream and downstream data processing logic | |
23 | + * Add edge lifecycle records | |
24 | + */ | |
16 | 25 | package org.thingsboard.server.service.edge.rpc; |
17 | 26 | |
18 | 27 | import com.datastax.oss.driver.api.core.uuid.Uuids; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Add manual synchronization and connection synchronization of ThingsKit cloud to edge database table logic | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc; |
17 | 24 | |
18 | 25 | import org.thingsboard.server.common.data.Customer; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Adjust the way JsonNode converts String | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.constructor.device; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.JsonNode; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.extern.slf4j.Slf4j; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DevicesEdgeEventFetcher.java
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,15 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: | |
22 | + * 1、Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
23 | + * 2、EdgeEventActionType ADDED change to ASSIGNED_TO_EDGE | |
24 | + */ | |
16 | 25 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 26 | |
18 | 27 | import com.fasterxml.jackson.databind.node.ObjectNode; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Modify class method modifiers to allow other directory classes to use them. For example, Yunteng's cloud edge collaboration | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.fetch; |
17 | 24 | |
18 | 25 | import lombok.AllArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: If the edge stores data offline in the database, it is convenient for synchronization during the next startup | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.edge.rpc.processor; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.JsonNode; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Invalidate cache when saving and deleting devices | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.entitiy.device; |
17 | 24 | |
18 | 25 | import com.google.common.util.concurrent.Futures; | ... | ... |
... | ... | @@ -13,6 +13,15 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: | |
22 | + * 1、Restricting TCP device configuration to only import physical model attributes | |
23 | + * 2、Internationalization of abnormal message content | |
24 | + */ | |
16 | 25 | package org.thingsboard.server.service.entitiy.device.profile; |
17 | 26 | |
18 | 27 | import lombok.AllArgsConstructor; | ... | ... |
application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2022-10-20 | |
21 | + * Description of changes: Change default email suffix and password | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.install; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.node.ObjectNode; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-07-01 | |
21 | + * Description of changes: Restore 3.5.1 Edge Migration Events | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.install.update; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.JsonNode; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: Failed to load mail_ config_templates.json in the environment where the project is running with a jar package | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.mail; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.JsonNode; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + /** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-04-25 | |
21 | + * Description of changes: When JsScript is changed, the broadcast entity is changed to transport | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.queue; |
17 | 24 | |
18 | 25 | import com.google.protobuf.ByteString; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: add edge log | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.queue; |
17 | 24 | |
18 | 25 | import com.google.common.util.concurrent.ListenableFuture; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: Throwing an exception | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.security; |
17 | 24 | |
18 | 25 | import com.google.common.base.Function; |
... | ... | @@ -84,7 +91,6 @@ import org.thingsboard.server.service.security.permission.Resource; |
84 | 91 | import javax.annotation.Nullable; |
85 | 92 | import javax.annotation.PostConstruct; |
86 | 93 | import javax.annotation.PreDestroy; |
87 | -import java.io.IOException; | |
88 | 94 | import java.util.concurrent.ExecutorService; |
89 | 95 | import java.util.concurrent.Executors; |
90 | 96 | import java.util.function.BiConsumer; |
... | ... | @@ -584,6 +590,6 @@ public class AccessValidator { |
584 | 590 | } |
585 | 591 | |
586 | 592 | public interface ThreeConsumer<A, B, C> { |
587 | - void accept(A a, B b, C c) throws IOException; | |
593 | + void accept(A a, B b, C c); | |
588 | 594 | } |
589 | 595 | } | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-09-09 | |
21 | + * Description of changes: Add i18n internationalization interceptor | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.security.auth.jwt; |
17 | 24 | |
18 | 25 | import org.springframework.beans.factory.annotation.Autowired; | ... | ... |
... | ... | @@ -13,6 +13,16 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2021-12-06 | |
21 | + * Description of changes: | |
22 | + * 1、You can log in without an email | |
23 | + * 2、Users who have an account on Thingskit but do not have an account on Thingsboard can also log in to the platform | |
24 | + * 3、Login through SMS verification code | |
25 | + */ | |
16 | 26 | package org.thingsboard.server.service.security.auth.jwt; |
17 | 27 | |
18 | 28 | import lombok.RequiredArgsConstructor; | ... | ... |
... | ... | @@ -13,6 +13,16 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2021-12-06 | |
21 | + * Description of changes: | |
22 | + * 1、You can log in without an email | |
23 | + * 2、Users who have an account on Thingskit but do not have an account on Thingsboard can also log in to the platform | |
24 | + * 3、Login through SMS verification code | |
25 | + */ | |
16 | 26 | package org.thingsboard.server.service.security.auth.rest; |
17 | 27 | |
18 | 28 | import lombok.extern.slf4j.Slf4j; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2021-12-06 | |
21 | + * Description of changes: User credential information required to add thingskit | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.security.model; |
17 | 24 | |
18 | 25 | import lombok.Getter; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2021-12-06 | |
21 | + * Description of changes: Add enum SMS_CODE | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.security.model; |
17 | 24 | |
18 | 25 | import java.io.Serializable; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2021-12-06 | |
21 | + * Description of changes: User credential information required to add thingskit | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.security.model.token; |
17 | 24 | |
18 | 25 | import io.jsonwebtoken.Claims; | ... | ... |
... | ... | @@ -13,6 +13,15 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2022-09-20 | |
21 | + * Description of changes: | |
22 | + * 1、Translate the prompt content into Chinese | |
23 | + * 2、Add open API user permissions | |
24 | + */ | |
16 | 25 | package org.thingsboard.server.service.security.permission; |
17 | 26 | |
18 | 27 | import lombok.extern.slf4j.Slf4j; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2022-09-20 | |
21 | + * Description of changes:Add device upper and lower limit log records | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.state; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.node.ObjectNode; | ... | ... |
... | ... | @@ -193,7 +193,7 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene |
193 | 193 | } |
194 | 194 | }); |
195 | 195 | } else { |
196 | - log.debug("[{}] No time-series subscriptions for entity.", entityId); | |
196 | + log.trace("[{}] No time-series subscriptions for entity.", entityId); | |
197 | 197 | } |
198 | 198 | } |
199 | 199 | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes:Batch import adds thingskit parameters | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.sync.ie.importing.csv; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.databind.node.ObjectNode; | ... | ... |
... | ... | @@ -197,7 +197,6 @@ public class DefaultSystemInfoService extends TbApplicationEventListener<Partiti |
197 | 197 | getTotalDiscSpace().ifPresent(v -> tsList.add(new BasicTsKvEntry(ts, new LongDataEntry("totalDiscSpace", v)))); |
198 | 198 | |
199 | 199 | doSave(tsList); |
200 | - | |
201 | 200 | } |
202 | 201 | |
203 | 202 | private void doSave(List<TsKvEntry> telemetry) { | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2023-02-21 | |
21 | + * Description of changes: Add event reporting logic | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.telemetry; |
17 | 24 | |
18 | 25 | import com.google.common.util.concurrent.FutureCallback; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2023-02-21 | |
21 | + * Description of changes: Add event reporting logic | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.telemetry; |
17 | 24 | |
18 | 25 | import com.google.common.util.concurrent.FutureCallback; | ... | ... |
... | ... | @@ -13,6 +13,16 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2022-07-18 | |
21 | + * Description of changes: | |
22 | + * 1、Add logic for GBT28181, Modbus RTU, and TCP non-standard protocol authentication | |
23 | + * 2、The logic of TCP non-standard protocol uplink script | |
24 | + * 3、When automatically creating gateway sub devices, use default device configuration | |
25 | + */ | |
16 | 26 | package org.thingsboard.server.service.transport; |
17 | 27 | |
18 | 28 | import com.fasterxml.jackson.core.JsonProcessingException; | ... | ... |
... | ... | @@ -14,6 +14,18 @@ |
14 | 14 | # limitations under the License. |
15 | 15 | # |
16 | 16 | |
17 | +# | |
18 | +# This file has been modified from its original version. | |
19 | +# Source: ThingsBoard Community Edition | |
20 | +# Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
21 | +# Modification date: 2021-12-07 | |
22 | +# Description of changes: | |
23 | +# Add ThingsKit cache configuration | |
24 | +# Add GBT28181、TCP protocol configuration | |
25 | +# Add file storage configuration | |
26 | +# Add thingskit email suffix configuration | |
27 | +# Add ThingsKit and other related configurations | |
28 | + | |
17 | 29 | # Server common parameters |
18 | 30 | server: |
19 | 31 | # Server bind-address | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: Add unit testing | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.script; |
17 | 24 | |
18 | 25 | import com.google.common.util.concurrent.Futures; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2022-03-04 | |
21 | + * Description of changes: Modify input parameters for unit testing | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.security.auth; |
17 | 24 | |
18 | 25 | import org.junit.Before; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2022-03-04 | |
21 | + * Description of changes: Modify input parameters for unit testing | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.service.state; |
17 | 24 | |
18 | 25 | import org.junit.jupiter.api.BeforeEach; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: extend deviceprofile create method. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.cluster; |
17 | 24 | |
18 | 25 | import org.thingsboard.server.common.data.ApiUsageState; |
... | ... | @@ -100,6 +107,8 @@ public interface TbClusterService extends TbQueueClusterService { |
100 | 107 | |
101 | 108 | void sendNotificationMsgToEdge(TenantId tenantId, EdgeId edgeId, EntityId entityId, String body, EdgeEventType type, EdgeEventActionType action, EdgeId sourceEdgeId); |
102 | 109 | |
103 | - //Thingskit function | |
110 | + //Source: ThingsBoard Community Edition | |
111 | + //The code has been modified | |
112 | + //Modification date: 2014-06-05 by Chengdu Yunteng Wuzhou Technology Co., Ltd: extend deviceprofile create method. | |
104 | 113 | void onJsScriptChange(TkDeviceScriptDTO script, TbQueueCallback callback); |
105 | 114 | } | ... | ... |
... | ... | @@ -13,6 +13,15 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: | |
22 | + * 1.extend deviceprofile create method. | |
23 | + * 2.dd function for tcp transport. | |
24 | + */ | |
16 | 25 | package org.thingsboard.server.dao.device; |
17 | 26 | |
18 | 27 | import com.google.common.util.concurrent.ListenableFuture; |
... | ... | @@ -57,9 +66,15 @@ public interface DeviceProfileService extends EntityDaoService { |
57 | 66 | |
58 | 67 | DeviceProfile createDefaultDeviceProfile(TenantId tenantId); |
59 | 68 | |
60 | - //thingskit | |
69 | + //Source: ThingsBoard Community Edition | |
70 | + //The code has been modified | |
71 | + //Modification date: 2014-06-05 by Chengdu Yunteng Wuzhou Technology Co., Ltd: extend deviceprofile create method. | |
61 | 72 | DeviceProfile createDeviceProfile(TenantId tenantId, String name, DeviceTypeEnum deviceType, RuleChainId ruleChainId); |
62 | 73 | |
74 | + | |
75 | + //Source: ThingsBoard Community Edition | |
76 | + //The code has been modified | |
77 | + //Modification date: 2014-06-05 by Chengdu Yunteng Wuzhou Technology Co., Ltd: add function for tcp transport. | |
63 | 78 | ListenableFuture<List<DeviceProfile>> findByDataCombinationIsTrue(); |
64 | 79 | |
65 | 80 | DeviceProfile findDefaultDeviceProfile(TenantId tenantId); | ... | ... |
... | ... | @@ -15,6 +15,14 @@ |
15 | 15 | limitations under the License. |
16 | 16 | |
17 | 17 | --> |
18 | + | |
19 | +<!-- | |
20 | + This file has been modified from its original version. | |
21 | + Source: ThingsBoard Community Edition | |
22 | + Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
23 | + Modification date: 2021-12-06 | |
24 | + Description of changes: Add SMS, Excel SDK and other configurations | |
25 | +--> | |
18 | 26 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
19 | 27 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
20 | 28 | <modelVersion>4.0.0</modelVersion> | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: extend action type . | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.data.audit; |
17 | 24 | |
18 | 25 | import lombok.Getter; |
... | ... | @@ -57,8 +64,14 @@ public enum ActionType { |
57 | 64 | ADDED_COMMENT(false, TbMsgType.COMMENT_CREATED), |
58 | 65 | UPDATED_COMMENT(false, TbMsgType.COMMENT_UPDATED), |
59 | 66 | DELETED_COMMENT(false, null), |
60 | - //Thingskit function | |
67 | + //Source: ThingsBoard Community Edition | |
68 | + //The code has been modified | |
69 | + //Modification date: 2014-06-05 by Chengdu Yunteng Wuzhou Technology Co., Ltd: extend action type for SMS . | |
61 | 70 | LOG_EXCEPTION(false,null), |
71 | + | |
72 | + //Source: ThingsBoard Community Edition | |
73 | + //The code has been modified | |
74 | + //Modification date: 2014-06-05 by Chengdu Yunteng Wuzhou Technology Co., Ltd: extend action type for exception. | |
62 | 75 | SMS_SENT(false, null); |
63 | 76 | |
64 | 77 | @Getter | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: extend transport protocol for TCP and GBT28181. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.data.device.data; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.annotation.JsonIgnore; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2023-12-05 | |
21 | + * Description of changes: extend alarm condition type DEVICE_EVENT. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.data.device.profile; |
17 | 24 | |
18 | 25 | public enum AlarmConditionKeyType { |
... | ... | @@ -20,6 +27,8 @@ public enum AlarmConditionKeyType { |
20 | 27 | TIME_SERIES, |
21 | 28 | ENTITY_FIELD, |
22 | 29 | CONSTANT, |
23 | - //thingskit | |
30 | + //Source: ThingsBoard Community Edition | |
31 | + //The code has been modified | |
32 | + //Modification date: 2014-06-05 by Chengdu Yunteng Wuzhou Technology Co., Ltd: extend alarm condition type DEVICE_EVENT. | |
24 | 33 | DEVICE_EVENT |
25 | 34 | } | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: extend method for thingsmods. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.data.device.profile; |
17 | 24 | |
18 | 25 | import io.swagger.annotations.ApiModel; |
... | ... | @@ -41,7 +48,9 @@ public class DeviceProfileData implements Serializable { |
41 | 48 | @ApiModelProperty(position = 4, value = "JSON array of alarm rules configuration per device profile") |
42 | 49 | private List<DeviceProfileAlarm> alarms; |
43 | 50 | |
44 | - //Thingskit function | |
51 | + //Source: ThingsBoard Community Edition | |
52 | + //The code has been modified | |
53 | + //Modification date: 2014-06-05 by Chengdu Yunteng Wuzhou Technology Co., Ltd: extend method for thingsmods. | |
45 | 54 | @Valid |
46 | 55 | @ApiModelProperty(position = 5, value = "JSON object of has published things model configuration") |
47 | 56 | private List<TkThingsModel> thingsModel; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-02-07 | |
21 | + * Description of changes: extend transport protocol for TCP and GBT28181. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.data.device.profile; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.annotation.JsonIgnore; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2023-02-19 | |
21 | + * Description of changes: mqtt topic for device publish event. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.data.device.profile; |
17 | 24 | |
18 | 25 | /** | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: extend more EdgeEventType for business. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.data.edge; |
17 | 24 | |
18 | 25 | import lombok.Getter; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: add filed active for edge status. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.data.edge; |
17 | 24 | |
18 | 25 | import lombok.Data; |
... | ... | @@ -39,4 +46,4 @@ public class EdgeInfo extends Edge { |
39 | 46 | this.customerTitle = customerTitle; |
40 | 47 | this.customerIsPublic = customerIsPublic; |
41 | 48 | } |
42 | -} | |
\ No newline at end of file | ||
49 | +} | ... | ... |
... | ... | @@ -13,6 +13,15 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: | |
22 | + * 1.extend entity type for SCENE_ACT. | |
23 | + * 2.cache uuid | |
24 | + */ | |
16 | 25 | package org.thingsboard.server.common.data.id; |
17 | 26 | |
18 | 27 | import lombok.extern.slf4j.Slf4j; |
... | ... | @@ -115,7 +124,7 @@ public class EntityIdFactory { |
115 | 124 | return new NotificationTemplateId(uuid); |
116 | 125 | case NOTIFICATION: |
117 | 126 | return new NotificationId(uuid); |
118 | - //thingskit | |
127 | + //thingskit | |
119 | 128 | case SCENE_ACT: |
120 | 129 | return new SceneId(uuid); |
121 | 130 | } | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: fix id null exception. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.data.id; |
17 | 24 | |
18 | 25 | import com.fasterxml.jackson.core.JsonGenerator; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2023-12-05 | |
21 | + * Description of changes: function device event. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.data.msg; |
17 | 24 | |
18 | 25 | import lombok.Getter; | ... | ... |
... | ... | @@ -13,6 +13,20 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-09-05 | |
21 | + * Description of changes: add filed needSaveRuleNode. | |
22 | + */ | |
23 | +/** | |
24 | + * This file has been modified from its original version. | |
25 | + * Source: ThingsBoard Community Edition | |
26 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
27 | + * Modification date: 2024-09-27 | |
28 | + * Description of changes: refact connectionInfo. | |
29 | + */ | |
16 | 30 | package org.thingsboard.server.common.data.rule; |
17 | 31 | |
18 | 32 | import io.swagger.annotations.ApiModel; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: extend account role:PLATFORM_USER、COMMON_TENANT、OPENAPI_USER. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.data.security; |
17 | 24 | |
18 | 25 | public enum Authority { | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: add device info TkDeviceMapping. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.data.sync.ie.importing.csv; |
17 | 24 | |
18 | 25 | import lombok.Data; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-08-19 | |
21 | + * Description of changes: message for TkUpdateMsg and TkRpcCallMsg. | |
22 | + */ | |
16 | 23 | syntax = "proto3"; |
17 | 24 | |
18 | 25 | option java_package = "org.thingsboard.server.gen.edge.v1"; | ... | ... |
... | ... | @@ -20,6 +20,13 @@ package org.thingsboard.server.common.msg.session; |
20 | 20 | * Note: This enum was originally part of the public API but is now specific to CoAP transport only. |
21 | 21 | * Please use {@link org.thingsboard.server.transport.coap.CoapSessionMsgType} instead. |
22 | 22 | */ |
23 | +/** | |
24 | + * This file has been modified from its original version. | |
25 | + * Source: ThingsBoard Community Edition | |
26 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
27 | + * Modification date: 2023-02-19 | |
28 | + * Description of changes: extent request POST_EVENT_REQUEST. | |
29 | + */ | |
23 | 30 | @Deprecated(since="3.6.0", forRemoval = true) |
24 | 31 | public enum SessionMsgType { |
25 | 32 | //thingskit | ... | ... |
... | ... | @@ -15,6 +15,13 @@ |
15 | 15 | limitations under the License. |
16 | 16 | |
17 | 17 | --> |
18 | +<!-- | |
19 | + This file has been modified from its original version. | |
20 | + Source: ThingsBoard Community Edition | |
21 | + Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
22 | + Modification date: 2024-08-19 | |
23 | + Description of changes: Add spring-boot-maven-plugin plugin | |
24 | +--> | |
18 | 25 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
19 | 26 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
20 | 27 | <modelVersion>4.0.0</modelVersion> | ... | ... |
... | ... | @@ -13,6 +13,20 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2022-03-09 | |
21 | + * Description of changes: function for rpc. | |
22 | + */ | |
23 | +/** | |
24 | + * This file has been modified from its original version. | |
25 | + * Source: ThingsBoard Community Edition | |
26 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
27 | + * Modification date: 2023-02-21 | |
28 | + * Description of changes: new function for device event. | |
29 | + */ | |
16 | 30 | package org.thingsboard.server.common.adaptor; |
17 | 31 | |
18 | 32 | import com.google.gson.Gson; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2023-07-11 | |
21 | + * Description of changes: save rpc inform. | |
22 | + */ | |
16 | 23 | package org.thingsboard.server.common.util; |
17 | 24 | |
18 | 25 | import org.thingsboard.server.common.data.EntityType; | ... | ... |
... | ... | @@ -13,6 +13,13 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | +/** | |
17 | + * This file has been modified from its original version. | |
18 | + * Source: ThingsBoard Community Edition | |
19 | + * Modifications made by: Chengdu Yunteng Wuzhou Technology Co., Ltd | |
20 | + * Modification date: 2024-06-05 | |
21 | + * Description of changes: refact javascript method eval. | |
22 | + */ | |
16 | 23 | package org.thingsboard.script.api; |
17 | 24 | |
18 | 25 | import com.google.common.util.concurrent.FutureCallback; | ... | ... |