diff --git a/build.gradle b/build.gradle
index 63feef4..dc1f1e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,4 @@
 plugins {
-    id 'war'
     id 'org.springframework.boot'
     id 'org.jetbrains.kotlin.jvm'
     id 'org.jetbrains.kotlin.plugin.jpa'
@@ -7,7 +6,6 @@
 }
 
 apply plugin: 'io.spring.dependency-management'
-
 group = 'com.supwisdom'
 version = waterManagerVersion
 sourceCompatibility = jdkVersion
@@ -16,13 +14,28 @@
     mavenCentral()
 }
 
-war {
-    manifest {
-        attributes('WaterManager-Version': rootProject.version)
-        writeTo(project.buildDir.toString() + "/classes/MATE-INF.MF")
-    }
+def startClass = 'com.supwisdom.dlpay.WaterManagerApplicationKt'
+
+println("Build version: $version")
+repositories {
+    mavenCentral()
 }
 
+springBoot {
+    mainClassName = startClass
+}
+
+
+bootJar {
+    launchScript()
+    mainClassName = startClass
+}
+
+jar {
+    manifest {
+        attributes('Payapi-Version': rootProject.version)
+    }
+}
 dependencies {
     compile(
             'net.sf.json-lib:json-lib:2.4:jdk15'
@@ -40,7 +53,6 @@
     implementation 'org.jetbrains.kotlin:kotlin-reflect'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 
-    implementation 'org.springframework.cloud:spring-cloud-starter-feign:1.4.7.RELEASE'
 
     implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
     implementation 'org.postgresql:postgresql:42.2.5'
@@ -59,7 +71,7 @@
 
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
 
-    providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
+//    providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured:3.3.0'
     testImplementation 'io.rest-assured:spring-mock-mvc:3.3.0'
diff --git a/gradle.properties b/gradle.properties
index 9d1aa55..2300c96 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-springbootVersion = 2.1.3.RELEASE
+springbootVersion = 2.1.6.RELEASE
 kotlinVersion = 1.3.31
 waterManagerVersion = 1.0
 jdkVersion = 1.8
\ No newline at end of file
diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/ShortURLUtil.java b/src/main/java/com/supwisdom/dlpay/framework/util/ShortURLUtil.java
index 74177f5..ad25aee 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/util/ShortURLUtil.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/util/ShortURLUtil.java
@@ -1,13 +1,12 @@
 package com.supwisdom.dlpay.framework.util;
 
-import com.sun.deploy.net.URLEncoder;
-import com.supwisdom.dlpay.framework.util.MD5;
 import net.sf.json.JSONObject;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLEncoder;
 
 public class ShortURLUtil {