From 33c3d1daf431e3ced775b7ab198305ef053e1a60 Mon Sep 17 00:00:00 2001 From: jacklicn Date: Wed, 16 May 2018 11:56:52 +0800 Subject: [PATCH 1/4] Add missed import statements! --- ui/src/app/widget/widget-editor.controller.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/src/app/widget/widget-editor.controller.js b/ui/src/app/widget/widget-editor.controller.js index 301fc5ae28..6f0ad8761e 100644 --- a/ui/src/app/widget/widget-editor.controller.js +++ b/ui/src/app/widget/widget-editor.controller.js @@ -20,6 +20,7 @@ import 'brace/mode/javascript'; import 'brace/mode/html'; import 'brace/mode/css'; import 'brace/mode/json'; +import 'ace-builds/src-min-noconflict/ace'; import 'ace-builds/src-min-noconflict/snippets/javascript'; import 'ace-builds/src-min-noconflict/snippets/text'; import 'ace-builds/src-min-noconflict/snippets/html'; @@ -662,4 +663,4 @@ export default function WidgetEditorController(widgetService, userService, types } -/* eslint-enable angular/angularelement */ \ No newline at end of file +/* eslint-enable angular/angularelement */ From b9a988f33a2927860f742a967195778d9b22cc23 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 16 May 2018 18:12:31 +0300 Subject: [PATCH 2/4] Fix for correct install if env var changed --- docker/tb/run-application.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/docker/tb/run-application.sh b/docker/tb/run-application.sh index e297335fe2..a2a1e2beba 100755 --- a/docker/tb/run-application.sh +++ b/docker/tb/run-application.sh @@ -18,6 +18,11 @@ dpkg -i /thingsboard.deb +# Copying env variables into conf files +printenv | awk -F "=" '{print "export " $1 "='\''" $2 "'\''"}' >> /usr/share/thingsboard/conf/thingsboard.conf + +cat /usr/share/thingsboard/conf/thingsboard.conf + if [ "$DATABASE_TYPE" == "cassandra" ]; then until nmap $CASSANDRA_HOST -p $CASSANDRA_PORT | grep "$CASSANDRA_PORT/tcp open\|filtered" do @@ -46,12 +51,6 @@ if [ "$ADD_SCHEMA_AND_SYSTEM_DATA" == "true" ]; then fi fi - -# Copying env variables into conf files -printenv | awk -F "=" '{print "export " $1 "='\''" $2 "'\''"}' >> /usr/share/thingsboard/conf/thingsboard.conf - -cat /usr/share/thingsboard/conf/thingsboard.conf - echo "Starting 'Thingsboard' service..." service thingsboard start From 96a77fc2ead25ac3502e415fd6788f37897a7f56 Mon Sep 17 00:00:00 2001 From: liuyuan <405653510@qq.com> Date: Thu, 17 May 2018 18:27:26 +0800 Subject: [PATCH 3/4] MqttTransportService NioEventLoopGroup shutdown order error --- .../thingsboard/server/transport/mqtt/MqttTransportService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java index f0129e1b6c..cbe3ba6a13 100644 --- a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java +++ b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java @@ -119,8 +119,8 @@ public class MqttTransportService { try { serverChannel.close().sync(); } finally { - bossGroup.shutdownGracefully(); workerGroup.shutdownGracefully(); + bossGroup.shutdownGracefully(); } log.info("MQTT transport stopped!"); } From 4591d168445a61e1e86023beabb41a07516a7280 Mon Sep 17 00:00:00 2001 From: jacklicn Date: Mon, 21 May 2018 12:42:36 +0800 Subject: [PATCH 4/4] Add Chinese translation for audit-log. --- ui/src/app/locale/locale.constant-zh.js | 32 +++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/ui/src/app/locale/locale.constant-zh.js b/ui/src/app/locale/locale.constant-zh.js index d94141cb04..c25291adc0 100644 --- a/ui/src/app/locale/locale.constant-zh.js +++ b/ui/src/app/locale/locale.constant-zh.js @@ -280,6 +280,38 @@ export default function addLocaleChinese(locales) { "selected-attributes": "{ count, select, 1 {1 属性} other {# 属性} } 被选中", "selected-telemetry": "{ count, select, 1 {1 遥测} other {# 遥测} } 被选中" }, + "audit-log": { + "audit": "审计", + "audit-logs": "审计日志", + "timestamp": "时间戳", + "entity-type": "实体类型", + "entity-name": "实体名称", + "user": "用户", + "type": "类型", + "status": "状态", + "details": "详情", + "type-added": "添加", + "type-deleted": "删除", + "type-updated": "更新", + "type-attributes-updated": "更新属性", + "type-attributes-deleted": "删除属性", + "type-rpc-call": "RPC调用", + "type-credentials-updated": "更新凭证", + "type-assigned-to-customer": "分配给客户", + "type-unassigned-from-customer": "未分配给客户", + "type-activated": "激活", + "type-suspended": "暂停", + "type-credentials-read": "读取凭证", + "type-attributes-read": "读取属性", + "status-success": "成功", + "status-failure": "失败", + "audit-log-details": "审计日志详情", + "no-audit-logs-prompt": "找不到日志", + "action-data": "活动数据", + "failure-details": "失败详情", + "search": "查找审计日志", + "clear-search": "清空查找" + }, "confirm-on-exit": { "message": "您有未保存的更改。确定要离开此页吗？", "html-message": "您有未保存的更改。
确定要离开此页面吗？",