From c745c1ce02b0885dd0931f7ddd093cde097ce4c8 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 8 Mar 2017 11:20:13 +0200 Subject: [PATCH] Add package type information to system properties --- application/build.gradle | 20 +++++++++++++++++++ application/src/main/conf/thingsboard.conf | 2 +- .../server/controller/AdminController.java | 13 ++++++++++++ .../src/main/scripts/windows/service.xml | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/application/build.gradle b/application/build.gradle index 75a0e52f69..ae65abdbd5 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -13,6 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +import org.apache.tools.ant.filters.ReplaceTokens + buildscript { ext { osPackageVersion = "3.8.0" @@ -56,6 +59,7 @@ ospackage { // Copy the config files from("target/conf") { + exclude "${pkgName}.conf" fileType CONFIG | NOREPLACE fileMode 0754 into "conf" @@ -99,6 +103,14 @@ buildRpm { into "/usr/lib/systemd/system" } + from("target/conf") { + include "${pkgName}.conf" + filter(ReplaceTokens, tokens: ['pkg.platform': 'rpm']) + fileType CONFIG | NOREPLACE + fileMode 0754 + into "conf" + } + directory(pkgLogFolder, 0755) link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml") link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") @@ -126,6 +138,14 @@ buildDeb { user pkgName permissionGroup pkgName + from("target/conf") { + include "${pkgName}.conf" + filter(ReplaceTokens, tokens: ['pkg.platform': 'deb']) + fileType CONFIG | NOREPLACE + fileMode 0754 + into "conf" + } + directory(pkgLogFolder, 0755) link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/bin/${pkgName}.jar") link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml") diff --git a/application/src/main/conf/thingsboard.conf b/application/src/main/conf/thingsboard.conf index 328054fe20..ef977eea46 100644 --- a/application/src/main/conf/thingsboard.conf +++ b/application/src/main/conf/thingsboard.conf @@ -14,6 +14,6 @@ # limitations under the License. # -export JAVA_OPTS="$JAVA_OPTS" +export JAVA_OPTS="$JAVA_OPTS -Dplatform=@pkg.platform@" export LOG_FILENAME=${pkg.name}.out export LOADER_PATH=${pkg.installFolder}/conf,${pkg.installFolder}/extensions diff --git a/application/src/main/java/org/thingsboard/server/controller/AdminController.java b/application/src/main/java/org/thingsboard/server/controller/AdminController.java index b17c394f76..58f64af5af 100644 --- a/application/src/main/java/org/thingsboard/server/controller/AdminController.java +++ b/application/src/main/java/org/thingsboard/server/controller/AdminController.java @@ -72,4 +72,17 @@ public class AdminController extends BaseController { throw handleException(e); } } + + @PreAuthorize("hasAuthority('SYS_ADMIN')") + @RequestMapping(value = "/updates", method = RequestMethod.GET) + @ResponseBody + public String checkUpdates() throws ThingsboardException { + try { + return "
New update Thingsboard version 1.2 is available.
" + + "Download package
"; + } catch (Exception e) { + throw handleException(e); + } + } + } diff --git a/application/src/main/scripts/windows/service.xml b/application/src/main/scripts/windows/service.xml index b2acc45a8a..becbcdc9bd 100644 --- a/application/src/main/scripts/windows/service.xml +++ b/application/src/main/scripts/windows/service.xml @@ -7,6 +7,7 @@ rotate java + -Dplatform=windows -jar %BASE%\lib\${pkg.name}.jar